diff options
| author | ptessier | 2015-04-09 08:48:30 +0000 |
|---|---|---|
| committer | ptessier | 2015-04-17 06:59:48 +0000 |
| commit | 2b2849fb2e843937dfe705e9a8b5bd547d18a6de (patch) | |
| tree | 47e4bfefeef48429a4d8242be0dd969b5c38ec33 /plugins/customization | |
| parent | 2e1b77941b550ada44eb34a005aab451eec08e4f (diff) | |
| download | org.eclipse.papyrus-2b2849fb2e843937dfe705e9a8b5bd547d18a6de.tar.gz org.eclipse.papyrus-2b2849fb2e843937dfe705e9a8b5bd547d18a6de.tar.xz org.eclipse.papyrus-2b2849fb2e843937dfe705e9a8b5bd547d18a6de.zip | |
Bug 463290 - Papyrus diagram shall be expanded with new visual graphical
notation
create the first version of interpretors
Change-Id: I206b42116762524eef531fe09b18dd7fae2bbed6
Diffstat (limited to 'plugins/customization')
35 files changed, 837 insertions, 678 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF index 9d35edd3f54..d9709047b89 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin$Implementation
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -12,5 +12,6 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.gmfdiag.common;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_Compartment.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_Compartment.gif Binary files differnew file mode 100644 index 00000000000..561bc08cff3 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_Compartment.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_InducedRepresentation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_InducedRepresentation.gif Binary files differnew file mode 100644 index 00000000000..8fec2342fa9 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateCompartmentLibrary_compartments_InducedRepresentation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representationkinds_RepresentationKind.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representationkinds_RepresentationKind.gif Binary files differnew file mode 100644 index 00000000000..09963007a57 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representationkinds_RepresentationKind.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_GMFT_Based_Representation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_GMFT_Based_Representation.gif Binary files differnew file mode 100644 index 00000000000..55993902052 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_GMFT_Based_Representation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_InducedRepresentation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_InducedRepresentation.gif Binary files differnew file mode 100644 index 00000000000..c2b3c0fe329 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_InducedRepresentation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_Representation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_Representation.gif Binary files differnew file mode 100644 index 00000000000..c05a4184968 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateLibrary_representations_Representation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateRepresentationLibrary_representations_GMFT_Based_Representation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateRepresentationLibrary_representations_GMFT_Based_Representation.gif Binary files differnew file mode 100644 index 00000000000..b29986ed49f --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateRepresentationLibrary_representations_GMFT_Based_Representation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateUseContext_GmftRepresentations_GMFT_Based_Representation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateUseContext_GmftRepresentations_GMFT_Based_Representation.gif Binary files differnew file mode 100644 index 00000000000..5ef0e324111 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/ctool16/CreateUseContext_GmftRepresentations_GMFT_Based_Representation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/Compartment.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/Compartment.gif Binary files differnew file mode 100644 index 00000000000..33854e98c25 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/Compartment.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/CompartmentKind.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/CompartmentKind.gif Binary files differnew file mode 100644 index 00000000000..338fb8d9a72 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/CompartmentKind.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/GMFT_Based_Representation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/GMFT_Based_Representation.gif Binary files differnew file mode 100644 index 00000000000..7bac4fd3808 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/GMFT_Based_Representation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/InducedRepresentation.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/InducedRepresentation.gif Binary files differnew file mode 100644 index 00000000000..c8d381f0b32 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/InducedRepresentation.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/RepresentationKind.gif b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/RepresentationKind.gif Binary files differnew file mode 100644 index 00000000000..94c953e013b --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/icons/full/obj16/RepresentationKind.gif diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties index 3a321500c7e..937a1ea3911 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties @@ -56,3 +56,38 @@ _UI_GmftBasedRepresentation_type = Gmft Based Representation _UI_UseContext_gmftRepresentations_feature = Gmft Representations
_UI_GmftBasedRepresentation_reusedId_feature = Reused Id
_UI_Representation_viewFactory_feature = View Factory
+_UI_GMFT_Based_Representation_type = GMFT Based Representation
+_UI_UseContext_DiagramType_feature = Diagram Type
+_UI_UseContext_GmftRepresentations_feature = Gmft Representations
+_UI_GMFT_Based_Representation_reusedID_feature = Reused ID
+_UI_RepresentationKind_Shape_literal = Shape
+_UI_RepresentationKind_Label_literal = Label
+_UI_RepresentationKind_Link_literal = Link
+_UI_RepresentationKind_BorderItem_literal = BorderItem
+_UI_RepresentationKind_BorderItemLabel_literal = BorderItemLabel
+_UI_RepresentationKind_Custom_literal = Custom
+_UI_CompartmentKind_XY_literal = XY
+_UI_RepresentationKind_type = Representation Kind
+_UI_Compartment_type = Compartment
+_UI_CompartmentKind_type = Compartment Kind
+_UI_RepresentationKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Compartment_hint_feature = Hint
+_UI_Compartment_children_feature = Children
+_UI_Compartment_kind_feature = Kind
+_UI_Compartment_name_feature = Name
+_UI_Compartment_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_CompartmentKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Library_representationkinds_feature = Representationkinds
+_UI_RepresentationKind_name_feature = Name
+_UI_Representation_subRepresentations_feature = Sub Representations
+_UI_AbstractRepresentation_type = Abstract Representation
+_UI_InducedRepresentation_type = Induced Representation
+_UI_AbstractRepresentation_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_AbstractRepresentation_kind_feature = Kind
+_UI_AbstractRepresentation_name_feature = Name
+_UI_InducedRepresentation_hint_feature = Hint
+_UI_InducedRepresentation_children_feature = Children
+_UI_Representation_inducedRepresentations_feature = Induced Representations
+_UI_AbstractRepresentation_viewFactory_feature = View Factory
+_UI_RepresentationKind_viewFactory_feature = View Factory
+_UI_Library_representations_feature = Representations
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml index 0aa7763b046..39819444af6 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml @@ -6,11 +6,12 @@ <plugin>
+
<extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <!-- @generated expansionModel -->
+ <!-- @generated ExpandModel -->
<factory
uri="http:///expansionmodel.ecore"
- class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider.ExpansionModelItemProviderAdapterFactory"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider.ExpansionmodelItemProviderAdapterFactory"
supportedTypes=
"org.eclipse.emf.edit.provider.IEditingDomainItemProvider
org.eclipse.emf.edit.provider.IStructuredItemContentProvider
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/CompartmentsItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/AbstractRepresentationItemProvider.java index 63a9c3860b5..bae57d17ab1 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/CompartmentsItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/AbstractRepresentationItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -22,18 +32,18 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Compartments;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.AbstractRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Compartments} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.AbstractRepresentation} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class CompartmentsItemProvider
+public class AbstractRepresentationItemProvider
extends ItemProviderAdapter
implements
IEditingDomainItemProvider,
@@ -47,7 +57,7 @@ public class CompartmentsItemProvider * <!-- end-user-doc -->
* @generated
*/
- public CompartmentsItemProvider(AdapterFactory adapterFactory) {
+ public AbstractRepresentationItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -62,29 +72,28 @@ public class CompartmentsItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addHintPropertyDescriptor(object);
- addChildrenPropertyDescriptor(object);
+ addEditPartQualifiedNamePropertyDescriptor(object);
addKindPropertyDescriptor(object);
addNamePropertyDescriptor(object);
- addEditPartQualifiedNamePropertyDescriptor(object);
+ addViewFactoryPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Hint feature.
+ * This adds a property descriptor for the Edit Part Qualified Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addHintPropertyDescriptor(Object object) {
+ protected void addEditPartQualifiedNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Compartments_hint_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Compartments_hint_feature", "_UI_Compartments_type"),
- ExpansionModelPackage.Literals.COMPARTMENTS__HINT,
+ getString("_UI_AbstractRepresentation_editPartQualifiedName_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractRepresentation_editPartQualifiedName_feature", "_UI_AbstractRepresentation_type"),
+ ExpansionmodelPackage.Literals.ABSTRACT_REPRESENTATION__EDIT_PART_QUALIFIED_NAME,
true,
false,
false,
@@ -94,28 +103,6 @@ public class CompartmentsItemProvider }
/**
- * This adds a property descriptor for the Children feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addChildrenPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Compartments_children_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Compartments_children_feature", "_UI_Compartments_type"),
- ExpansionModelPackage.Literals.COMPARTMENTS__CHILDREN,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Kind feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -126,13 +113,13 @@ public class CompartmentsItemProvider (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Compartments_kind_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Compartments_kind_feature", "_UI_Compartments_type"),
- ExpansionModelPackage.Literals.COMPARTMENTS__KIND,
+ getString("_UI_AbstractRepresentation_kind_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractRepresentation_kind_feature", "_UI_AbstractRepresentation_type"),
+ ExpansionmodelPackage.Literals.ABSTRACT_REPRESENTATION__KIND,
true,
false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ true,
+ null,
null,
null));
}
@@ -148,9 +135,9 @@ public class CompartmentsItemProvider (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Compartments_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Compartments_name_feature", "_UI_Compartments_type"),
- ExpansionModelPackage.Literals.COMPARTMENTS__NAME,
+ getString("_UI_AbstractRepresentation_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractRepresentation_name_feature", "_UI_AbstractRepresentation_type"),
+ ExpansionmodelPackage.Literals.ABSTRACT_REPRESENTATION__NAME,
true,
false,
false,
@@ -160,19 +147,19 @@ public class CompartmentsItemProvider }
/**
- * This adds a property descriptor for the Edit Part Qualified Name feature.
+ * This adds a property descriptor for the View Factory feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addEditPartQualifiedNamePropertyDescriptor(Object object) {
+ protected void addViewFactoryPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Compartments_editPartQualifiedName_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Compartments_editPartQualifiedName_feature", "_UI_Compartments_type"),
- ExpansionModelPackage.Literals.COMPARTMENTS__EDIT_PART_QUALIFIED_NAME,
+ getString("_UI_AbstractRepresentation_viewFactory_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractRepresentation_viewFactory_feature", "_UI_AbstractRepresentation_type"),
+ ExpansionmodelPackage.Literals.ABSTRACT_REPRESENTATION__VIEW_FACTORY,
true,
false,
false,
@@ -182,17 +169,6 @@ public class CompartmentsItemProvider }
/**
- * This returns Compartments.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Compartments"));
- }
-
- /**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -200,10 +176,10 @@ public class CompartmentsItemProvider */
@Override
public String getText(Object object) {
- String label = ((Compartments)object).getName();
+ String label = ((AbstractRepresentation)object).getName();
return label == null || label.length() == 0 ?
- getString("_UI_Compartments_type") :
- getString("_UI_Compartments_type") + " " + label;
+ getString("_UI_AbstractRepresentation_type") :
+ getString("_UI_AbstractRepresentation_type") + " " + label;
}
@@ -218,11 +194,10 @@ public class CompartmentsItemProvider public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Compartments.class)) {
- case ExpansionModelPackage.COMPARTMENTS__HINT:
- case ExpansionModelPackage.COMPARTMENTS__KIND:
- case ExpansionModelPackage.COMPARTMENTS__NAME:
- case ExpansionModelPackage.COMPARTMENTS__EDIT_PART_QUALIFIED_NAME:
+ switch (notification.getFeatureID(AbstractRepresentation.class)) {
+ case ExpansionmodelPackage.ABSTRACT_REPRESENTATION__EDIT_PART_QUALIFIED_NAME:
+ case ExpansionmodelPackage.ABSTRACT_REPRESENTATION__NAME:
+ case ExpansionmodelPackage.ABSTRACT_REPRESENTATION__VIEW_FACTORY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
@@ -249,7 +224,7 @@ public class CompartmentsItemProvider */
@Override
public ResourceLocator getResourceLocator() {
- return ExpansionModelEditPlugin.INSTANCE;
+ return ExpandModelEditPlugin.INSTANCE;
}
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/CompartmentLibraryItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/CompartmentLibraryItemProvider.java deleted file mode 100644 index a23876dd3c4..00000000000 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/CompartmentLibraryItemProvider.java +++ /dev/null @@ -1,145 +0,0 @@ -/**
- */
-package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.CompartmentLibrary;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.CompartmentLibrary} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompartmentLibraryItemProvider extends LibraryItemProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CompartmentLibraryItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * 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) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@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) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ExpansionModelPackage.Literals.COMPARTMENT_LIBRARY__COMPARTMENTS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- 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);
- }
-
- /**
- * This returns CompartmentLibrary.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/CompartmentLibrary"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((CompartmentLibrary)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_CompartmentLibrary_type") :
- getString("_UI_CompartmentLibrary_type") + " " + label;
- }
-
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * 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(CompartmentLibrary.class)) {
- case ExpansionModelPackage.COMPARTMENT_LIBRARY__COMPARTMENTS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * 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
- (ExpansionModelPackage.Literals.COMPARTMENT_LIBRARY__COMPARTMENTS,
- ExpansionModelFactory.eINSTANCE.createCompartments()));
- }
-
-}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/DiagramExpansionItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/DiagramExpansionItemProvider.java index 9540df65c20..37a14042aa6 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/DiagramExpansionItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/DiagramExpansionItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -23,10 +33,10 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion} object.
@@ -79,8 +89,8 @@ public class DiagramExpansionItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(ExpansionModelPackage.Literals.DIAGRAM_EXPANSION__USAGES);
- childrenFeatures.add(ExpansionModelPackage.Literals.DIAGRAM_EXPANSION__LIBRARIES);
+ childrenFeatures.add(ExpansionmodelPackage.Literals.DIAGRAM_EXPANSION__USAGES);
+ childrenFeatures.add(ExpansionmodelPackage.Literals.DIAGRAM_EXPANSION__LIBRARIES);
}
return childrenFeatures;
}
@@ -133,8 +143,8 @@ public class DiagramExpansionItemProvider updateChildren(notification);
switch (notification.getFeatureID(DiagramExpansion.class)) {
- case ExpansionModelPackage.DIAGRAM_EXPANSION__USAGES:
- case ExpansionModelPackage.DIAGRAM_EXPANSION__LIBRARIES:
+ case ExpansionmodelPackage.DIAGRAM_EXPANSION__USAGES:
+ case ExpansionmodelPackage.DIAGRAM_EXPANSION__LIBRARIES:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -154,18 +164,13 @@ public class DiagramExpansionItemProvider newChildDescriptors.add
(createChildParameter
- (ExpansionModelPackage.Literals.DIAGRAM_EXPANSION__USAGES,
- ExpansionModelFactory.eINSTANCE.createUseContext()));
+ (ExpansionmodelPackage.Literals.DIAGRAM_EXPANSION__USAGES,
+ ExpansionmodelFactory.eINSTANCE.createUseContext()));
newChildDescriptors.add
(createChildParameter
- (ExpansionModelPackage.Literals.DIAGRAM_EXPANSION__LIBRARIES,
- ExpansionModelFactory.eINSTANCE.createRepresentationLibrary()));
-
- newChildDescriptors.add
- (createChildParameter
- (ExpansionModelPackage.Literals.DIAGRAM_EXPANSION__LIBRARIES,
- ExpansionModelFactory.eINSTANCE.createCompartmentLibrary()));
+ (ExpansionmodelPackage.Literals.DIAGRAM_EXPANSION__LIBRARIES,
+ ExpansionmodelFactory.eINSTANCE.createLibrary()));
}
/**
@@ -176,7 +181,7 @@ public class DiagramExpansionItemProvider */
@Override
public ResourceLocator getResourceLocator() {
- return ExpansionModelEditPlugin.INSTANCE;
+ return ExpandModelEditPlugin.INSTANCE;
}
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/ExpansionModelItemProviderAdapterFactory.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/ExpansionmodelItemProviderAdapterFactory.java index ee260d74187..224d6612d98 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/ExpansionModelItemProviderAdapterFactory.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/ExpansionmodelItemProviderAdapterFactory.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -21,7 +31,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util.ExpansionModelAdapterFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util.ExpansionmodelAdapterFactory;
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -32,7 +42,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util.ExpansionMod * <!-- end-user-doc -->
* @generated
*/
-public class ExpansionModelItemProviderAdapterFactory extends ExpansionModelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class ExpansionmodelItemProviderAdapterFactory extends ExpansionmodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
@@ -63,7 +73,7 @@ public class ExpansionModelItemProviderAdapterFactory extends ExpansionModelAdap * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelItemProviderAdapterFactory() {
+ public ExpansionmodelItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class);
@@ -95,72 +105,72 @@ public class ExpansionModelItemProviderAdapterFactory extends ExpansionModelAdap }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Compartments} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationKind} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected CompartmentsItemProvider compartmentsItemProvider;
+ protected RepresentationKindItemProvider representationKindItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Compartments}.
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationKind}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Adapter createCompartmentsAdapter() {
- if (compartmentsItemProvider == null) {
- compartmentsItemProvider = new CompartmentsItemProvider(this);
+ public Adapter createRepresentationKindAdapter() {
+ if (representationKindItemProvider == null) {
+ representationKindItemProvider = new RepresentationKindItemProvider(this);
}
- return compartmentsItemProvider;
+ return representationKindItemProvider;
}
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationLibrary} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.InducedRepresentation} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected RepresentationLibraryItemProvider representationLibraryItemProvider;
+ protected InducedRepresentationItemProvider inducedRepresentationItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationLibrary}.
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.InducedRepresentation}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Adapter createRepresentationLibraryAdapter() {
- if (representationLibraryItemProvider == null) {
- representationLibraryItemProvider = new RepresentationLibraryItemProvider(this);
+ public Adapter createInducedRepresentationAdapter() {
+ if (inducedRepresentationItemProvider == null) {
+ inducedRepresentationItemProvider = new InducedRepresentationItemProvider(this);
}
- return representationLibraryItemProvider;
+ return inducedRepresentationItemProvider;
}
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.CompartmentLibrary} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Library} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected CompartmentLibraryItemProvider compartmentLibraryItemProvider;
+ protected LibraryItemProvider libraryItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.CompartmentLibrary}.
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Library}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Adapter createCompartmentLibraryAdapter() {
- if (compartmentLibraryItemProvider == null) {
- compartmentLibraryItemProvider = new CompartmentLibraryItemProvider(this);
+ public Adapter createLibraryAdapter() {
+ if (libraryItemProvider == null) {
+ libraryItemProvider = new LibraryItemProvider(this);
}
- return compartmentLibraryItemProvider;
+ return libraryItemProvider;
}
/**
@@ -187,26 +197,26 @@ public class ExpansionModelItemProviderAdapterFactory extends ExpansionModelAdap }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GmftBasedRepresentation} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GMFT_Based_Representation} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected GmftBasedRepresentationItemProvider gmftBasedRepresentationItemProvider;
+ protected GMFT_Based_RepresentationItemProvider gmfT_Based_RepresentationItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GmftBasedRepresentation}.
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GMFT_Based_Representation}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Adapter createGmftBasedRepresentationAdapter() {
- if (gmftBasedRepresentationItemProvider == null) {
- gmftBasedRepresentationItemProvider = new GmftBasedRepresentationItemProvider(this);
+ public Adapter createGMFT_Based_RepresentationAdapter() {
+ if (gmfT_Based_RepresentationItemProvider == null) {
+ gmfT_Based_RepresentationItemProvider = new GMFT_Based_RepresentationItemProvider(this);
}
- return gmftBasedRepresentationItemProvider;
+ return gmfT_Based_RepresentationItemProvider;
}
/**
@@ -332,11 +342,11 @@ public class ExpansionModelItemProviderAdapterFactory extends ExpansionModelAdap */
public void dispose() {
if (representationItemProvider != null) representationItemProvider.dispose();
- if (compartmentsItemProvider != null) compartmentsItemProvider.dispose();
- if (representationLibraryItemProvider != null) representationLibraryItemProvider.dispose();
- if (compartmentLibraryItemProvider != null) compartmentLibraryItemProvider.dispose();
+ if (representationKindItemProvider != null) representationKindItemProvider.dispose();
+ if (inducedRepresentationItemProvider != null) inducedRepresentationItemProvider.dispose();
+ if (libraryItemProvider != null) libraryItemProvider.dispose();
if (useContextItemProvider != null) useContextItemProvider.dispose();
- if (gmftBasedRepresentationItemProvider != null) gmftBasedRepresentationItemProvider.dispose();
+ if (gmfT_Based_RepresentationItemProvider != null) gmfT_Based_RepresentationItemProvider.dispose();
if (diagramExpansionItemProvider != null) diagramExpansionItemProvider.dispose();
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/GmftBasedRepresentationItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/GMFT_Based_RepresentationItemProvider.java index 8ce58db0b95..c763699da33 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/GmftBasedRepresentationItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/GMFT_Based_RepresentationItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -14,23 +24,23 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GmftBasedRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GMFT_Based_Representation;
/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GmftBasedRepresentation} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.GMFT_Based_Representation} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class GmftBasedRepresentationItemProvider extends RepresentationItemProvider {
+public class GMFT_Based_RepresentationItemProvider extends RepresentationItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public GmftBasedRepresentationItemProvider(AdapterFactory adapterFactory) {
+ public GMFT_Based_RepresentationItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -45,25 +55,25 @@ public class GmftBasedRepresentationItemProvider extends RepresentationItemProvi if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addReusedIdPropertyDescriptor(object);
+ addReusedIDPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Reused Id feature.
+ * This adds a property descriptor for the Reused ID feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addReusedIdPropertyDescriptor(Object object) {
+ protected void addReusedIDPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_GmftBasedRepresentation_reusedId_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GmftBasedRepresentation_reusedId_feature", "_UI_GmftBasedRepresentation_type"),
- ExpansionModelPackage.Literals.GMFT_BASED_REPRESENTATION__REUSED_ID,
+ getString("_UI_GMFT_Based_Representation_reusedID_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_GMFT_Based_Representation_reusedID_feature", "_UI_GMFT_Based_Representation_type"),
+ ExpansionmodelPackage.Literals.GMFT_BASED_REPRESENTATION__REUSED_ID,
true,
false,
false,
@@ -73,14 +83,14 @@ public class GmftBasedRepresentationItemProvider extends RepresentationItemProvi }
/**
- * This returns GmftBasedRepresentation.gif.
+ * This returns GMFT_Based_Representation.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/GmftBasedRepresentation"));
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/GMFT_Based_Representation"));
}
/**
@@ -91,10 +101,10 @@ public class GmftBasedRepresentationItemProvider extends RepresentationItemProvi */
@Override
public String getText(Object object) {
- String label = ((GmftBasedRepresentation)object).getName();
+ String label = ((GMFT_Based_Representation)object).getName();
return label == null || label.length() == 0 ?
- getString("_UI_GmftBasedRepresentation_type") :
- getString("_UI_GmftBasedRepresentation_type") + " " + label;
+ getString("_UI_GMFT_Based_Representation_type") :
+ getString("_UI_GMFT_Based_Representation_type") + " " + label;
}
@@ -109,8 +119,8 @@ public class GmftBasedRepresentationItemProvider extends RepresentationItemProvi public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(GmftBasedRepresentation.class)) {
- case ExpansionModelPackage.GMFT_BASED_REPRESENTATION__REUSED_ID:
+ switch (notification.getFeatureID(GMFT_Based_Representation.class)) {
+ case ExpansionmodelPackage.GMFT_BASED_REPRESENTATION__REUSED_ID:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/InducedRepresentationItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/InducedRepresentationItemProvider.java new file mode 100644 index 00000000000..62cc0447134 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/InducedRepresentationItemProvider.java @@ -0,0 +1,165 @@ +/**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.InducedRepresentation;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.InducedRepresentation} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class InducedRepresentationItemProvider extends AbstractRepresentationItemProvider {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public InducedRepresentationItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * 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) {
+ super.getPropertyDescriptors(object);
+
+ addHintPropertyDescriptor(object);
+ addChildrenPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Hint feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addHintPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_InducedRepresentation_hint_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_InducedRepresentation_hint_feature", "_UI_InducedRepresentation_type"),
+ ExpansionmodelPackage.Literals.INDUCED_REPRESENTATION__HINT,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Children feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addChildrenPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_InducedRepresentation_children_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_InducedRepresentation_children_feature", "_UI_InducedRepresentation_type"),
+ ExpansionmodelPackage.Literals.INDUCED_REPRESENTATION__CHILDREN,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns InducedRepresentation.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/InducedRepresentation"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((InducedRepresentation)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_InducedRepresentation_type") :
+ getString("_UI_InducedRepresentation_type") + " " + label;
+ }
+
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * 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(InducedRepresentation.class)) {
+ case ExpansionmodelPackage.INDUCED_REPRESENTATION__HINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * 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/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/LibraryItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/LibraryItemProvider.java index 20baa8c4410..151b143da54 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/LibraryItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/LibraryItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -11,6 +21,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -22,10 +34,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Library;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Library} object.
@@ -80,7 +93,7 @@ public class LibraryItemProvider getResourceLocator(),
getString("_UI_Library_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Library_name_feature", "_UI_Library_type"),
- ExpansionModelPackage.Literals.LIBRARY__NAME,
+ ExpansionmodelPackage.Literals.LIBRARY__NAME,
true,
false,
false,
@@ -90,14 +103,34 @@ public class LibraryItemProvider }
/**
- * This returns Library.gif.
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Library"));
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONKINDS);
+ childrenFeatures.add(ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONS);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- 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);
}
/**
@@ -127,9 +160,13 @@ public class LibraryItemProvider updateChildren(notification);
switch (notification.getFeatureID(Library.class)) {
- case ExpansionModelPackage.LIBRARY__NAME:
+ case ExpansionmodelPackage.LIBRARY__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
+ case ExpansionmodelPackage.LIBRARY__REPRESENTATIONKINDS:
+ case ExpansionmodelPackage.LIBRARY__REPRESENTATIONS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -144,6 +181,26 @@ public class LibraryItemProvider @Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONKINDS,
+ ExpansionmodelFactory.eINSTANCE.createRepresentationKind()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONS,
+ ExpansionmodelFactory.eINSTANCE.createRepresentation()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONS,
+ ExpansionmodelFactory.eINSTANCE.createInducedRepresentation()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpansionmodelPackage.Literals.LIBRARY__REPRESENTATIONS,
+ ExpansionmodelFactory.eINSTANCE.createGMFT_Based_Representation()));
}
/**
@@ -154,7 +211,7 @@ public class LibraryItemProvider */
@Override
public ResourceLocator getResourceLocator() {
- return ExpansionModelEditPlugin.INSTANCE;
+ return ExpandModelEditPlugin.INSTANCE;
}
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationItemProvider.java index 903862ef585..d28bb5b6b47 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -9,38 +19,21 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Representation;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
-
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.Representation} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class RepresentationItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+public class RepresentationItemProvider extends AbstractRepresentationItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -62,61 +55,14 @@ public class RepresentationItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addEditPartQualifiedNamePropertyDescriptor(object);
- addKindPropertyDescriptor(object);
addGraphicalElementTypePropertyDescriptor(object);
- addCompartmentsPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- addViewFactoryPropertyDescriptor(object);
+ addInducedRepresentationsPropertyDescriptor(object);
+ addSubRepresentationsPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Edit Part Qualified Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addEditPartQualifiedNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Representation_editPartQualifiedName_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Representation_editPartQualifiedName_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__EDIT_PART_QUALIFIED_NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * 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_Representation_kind_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Representation_kind_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__KIND,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Graphical Element Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -129,7 +75,7 @@ public class RepresentationItemProvider getResourceLocator(),
getString("_UI_Representation_graphicalElementType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Representation_graphicalElementType_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__GRAPHICAL_ELEMENT_TYPE,
+ ExpansionmodelPackage.Literals.REPRESENTATION__GRAPHICAL_ELEMENT_TYPE,
true,
false,
false,
@@ -139,19 +85,19 @@ public class RepresentationItemProvider }
/**
- * This adds a property descriptor for the Compartments feature.
+ * This adds a property descriptor for the Induced Representations feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addCompartmentsPropertyDescriptor(Object object) {
+ protected void addInducedRepresentationsPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Representation_compartments_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Representation_compartments_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__COMPARTMENTS,
+ getString("_UI_Representation_inducedRepresentations_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Representation_inducedRepresentations_feature", "_UI_Representation_type"),
+ ExpansionmodelPackage.Literals.REPRESENTATION__INDUCED_REPRESENTATIONS,
true,
false,
true,
@@ -161,45 +107,23 @@ public class RepresentationItemProvider }
/**
- * This adds a property descriptor for the Name feature.
+ * This adds a property descriptor for the Sub Representations feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addNamePropertyDescriptor(Object object) {
+ protected void addSubRepresentationsPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Representation_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Representation_name_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__NAME,
+ getString("_UI_Representation_subRepresentations_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Representation_subRepresentations_feature", "_UI_Representation_type"),
+ ExpansionmodelPackage.Literals.REPRESENTATION__SUB_REPRESENTATIONS,
true,
false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the View Factory feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addViewFactoryPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Representation_viewFactory_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Representation_viewFactory_feature", "_UI_Representation_type"),
- ExpansionModelPackage.Literals.REPRESENTATION__VIEW_FACTORY,
true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
null,
null));
}
@@ -242,11 +166,7 @@ public class RepresentationItemProvider updateChildren(notification);
switch (notification.getFeatureID(Representation.class)) {
- case ExpansionModelPackage.REPRESENTATION__EDIT_PART_QUALIFIED_NAME:
- case ExpansionModelPackage.REPRESENTATION__KIND:
- case ExpansionModelPackage.REPRESENTATION__GRAPHICAL_ELEMENT_TYPE:
- case ExpansionModelPackage.REPRESENTATION__NAME:
- case ExpansionModelPackage.REPRESENTATION__VIEW_FACTORY:
+ case ExpansionmodelPackage.REPRESENTATION__GRAPHICAL_ELEMENT_TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
@@ -265,15 +185,4 @@ public class RepresentationItemProvider super.collectNewChildDescriptors(newChildDescriptors, object);
}
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return ExpansionModelEditPlugin.INSTANCE;
- }
-
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationKindItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationKindItemProvider.java new file mode 100644 index 00000000000..3360a4d1757 --- /dev/null +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationKindItemProvider.java @@ -0,0 +1,218 @@ +/**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationKind;
+
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationKind} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationKindItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public RepresentationKindItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * 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) {
+ super.getPropertyDescriptors(object);
+
+ addEditPartQualifiedNamePropertyDescriptor(object);
+ addNamePropertyDescriptor(object);
+ addViewFactoryPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Edit Part Qualified Name feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addEditPartQualifiedNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RepresentationKind_editPartQualifiedName_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_editPartQualifiedName_feature", "_UI_RepresentationKind_type"),
+ ExpansionmodelPackage.Literals.REPRESENTATION_KIND__EDIT_PART_QUALIFIED_NAME,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * 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_RepresentationKind_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_name_feature", "_UI_RepresentationKind_type"),
+ ExpansionmodelPackage.Literals.REPRESENTATION_KIND__NAME,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the View Factory feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addViewFactoryPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RepresentationKind_viewFactory_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_viewFactory_feature", "_UI_RepresentationKind_type"),
+ ExpansionmodelPackage.Literals.REPRESENTATION_KIND__VIEW_FACTORY,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This returns RepresentationKind.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/RepresentationKind"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ String label = ((RepresentationKind)object).getName();
+ return label == null || label.length() == 0 ?
+ getString("_UI_RepresentationKind_type") :
+ getString("_UI_RepresentationKind_type") + " " + label;
+ }
+
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * 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(RepresentationKind.class)) {
+ case ExpansionmodelPackage.REPRESENTATION_KIND__EDIT_PART_QUALIFIED_NAME:
+ case ExpansionmodelPackage.REPRESENTATION_KIND__NAME:
+ case ExpansionmodelPackage.REPRESENTATION_KIND__VIEW_FACTORY:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * 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);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ExpandModelEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationLibraryItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationLibraryItemProvider.java deleted file mode 100644 index fa155ca9270..00000000000 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/RepresentationLibraryItemProvider.java +++ /dev/null @@ -1,150 +0,0 @@ -/**
- */
-package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationLibrary;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.RepresentationLibrary} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RepresentationLibraryItemProvider extends LibraryItemProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public RepresentationLibraryItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * 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) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@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) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ExpansionModelPackage.Literals.REPRESENTATION_LIBRARY__REPRESENTATIONS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- 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);
- }
-
- /**
- * This returns RepresentationLibrary.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/RepresentationLibrary"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((RepresentationLibrary)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_RepresentationLibrary_type") :
- getString("_UI_RepresentationLibrary_type") + " " + label;
- }
-
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * 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(RepresentationLibrary.class)) {
- case ExpansionModelPackage.REPRESENTATION_LIBRARY__REPRESENTATIONS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * 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
- (ExpansionModelPackage.Literals.REPRESENTATION_LIBRARY__REPRESENTATIONS,
- ExpansionModelFactory.eINSTANCE.createRepresentation()));
-
- newChildDescriptors.add
- (createChildParameter
- (ExpansionModelPackage.Literals.REPRESENTATION_LIBRARY__REPRESENTATIONS,
- ExpansionModelFactory.eINSTANCE.createGmftBasedRepresentation()));
- }
-
-}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/UseContextItemProvider.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/UseContextItemProvider.java index 3cfc7536b5e..c455c475e92 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/UseContextItemProvider.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/provider/UseContextItemProvider.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider;
@@ -24,11 +34,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.UseContext;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.UseContext} object.
@@ -83,9 +93,9 @@ public class UseContextItemProvider (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_UseContext_diagramType_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_UseContext_diagramType_feature", "_UI_UseContext_type"),
- ExpansionModelPackage.Literals.USE_CONTEXT__DIAGRAM_TYPE,
+ getString("_UI_UseContext_DiagramType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_UseContext_DiagramType_feature", "_UI_UseContext_type"),
+ ExpansionmodelPackage.Literals.USE_CONTEXT__DIAGRAM_TYPE,
true,
false,
false,
@@ -107,7 +117,7 @@ public class UseContextItemProvider getResourceLocator(),
getString("_UI_UseContext_representations_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_UseContext_representations_feature", "_UI_UseContext_type"),
- ExpansionModelPackage.Literals.USE_CONTEXT__REPRESENTATIONS,
+ ExpansionmodelPackage.Literals.USE_CONTEXT__REPRESENTATIONS,
true,
false,
true,
@@ -129,7 +139,7 @@ public class UseContextItemProvider getResourceLocator(),
getString("_UI_UseContext_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_UseContext_name_feature", "_UI_UseContext_type"),
- ExpansionModelPackage.Literals.USE_CONTEXT__NAME,
+ ExpansionmodelPackage.Literals.USE_CONTEXT__NAME,
true,
false,
false,
@@ -150,7 +160,7 @@ public class UseContextItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(ExpansionModelPackage.Literals.USE_CONTEXT__GMFT_REPRESENTATIONS);
+ childrenFeatures.add(ExpansionmodelPackage.Literals.USE_CONTEXT__GMFT_REPRESENTATIONS);
}
return childrenFeatures;
}
@@ -206,11 +216,11 @@ public class UseContextItemProvider updateChildren(notification);
switch (notification.getFeatureID(UseContext.class)) {
- case ExpansionModelPackage.USE_CONTEXT__DIAGRAM_TYPE:
- case ExpansionModelPackage.USE_CONTEXT__NAME:
+ case ExpansionmodelPackage.USE_CONTEXT__DIAGRAM_TYPE:
+ case ExpansionmodelPackage.USE_CONTEXT__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case ExpansionModelPackage.USE_CONTEXT__GMFT_REPRESENTATIONS:
+ case ExpansionmodelPackage.USE_CONTEXT__GMFT_REPRESENTATIONS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -230,8 +240,8 @@ public class UseContextItemProvider newChildDescriptors.add
(createChildParameter
- (ExpansionModelPackage.Literals.USE_CONTEXT__GMFT_REPRESENTATIONS,
- ExpansionModelFactory.eINSTANCE.createGmftBasedRepresentation()));
+ (ExpansionmodelPackage.Literals.USE_CONTEXT__GMFT_REPRESENTATIONS,
+ ExpansionmodelFactory.eINSTANCE.createGMFT_Based_Representation()));
}
/**
@@ -242,7 +252,7 @@ public class UseContextItemProvider */
@Override
public ResourceLocator getResourceLocator() {
- return ExpansionModelEditPlugin.INSTANCE;
+ return ExpandModelEditPlugin.INSTANCE;
}
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/provider/ExpansionModelEditPlugin.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/provider/ExpandModelEditPlugin.java index f249aa6bf20..406a152dc77 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/provider/ExpansionModelEditPlugin.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/provider/ExpandModelEditPlugin.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider;
@@ -7,19 +17,19 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator;
/**
- * This is the central singleton for the ExpansionModel edit plugin.
+ * This is the central singleton for the ExpandModel edit plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public final class ExpansionModelEditPlugin extends EMFPlugin {
+public final class ExpandModelEditPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final ExpansionModelEditPlugin INSTANCE = new ExpansionModelEditPlugin();
+ public static final ExpandModelEditPlugin INSTANCE = new ExpandModelEditPlugin();
/**
* Keep track of the singleton.
@@ -35,7 +45,7 @@ public final class ExpansionModelEditPlugin extends EMFPlugin { * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelEditPlugin() {
+ public ExpandModelEditPlugin() {
super
(new ResourceLocator [] {
});
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF index ee4fb0501d5..683e9ba52f4 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorPlugin$Implementation
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -15,5 +15,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.gmfdiag.expansion.edit;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.common
Bundle-ActivationPolicy: lazy
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties index d7a03a8a9c2..fc0a4aa1148 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties @@ -51,3 +51,10 @@ _UI_Wizard_initial_object_description = Select a model object to create _UI_FileConflict_label = File Conflict
_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
+_UI_ExpansionmodelEditor_menu = &Expansionmodel Editor
+
_UI_ExpansionmodelModelWizard_label = Expansionmodel Model
+_UI_ExpansionmodelModelWizard_description = Create a new Expansionmodel model
+
_UI_ExpansionmodelEditor_label = Expansionmodel Model Editor
+
_UI_ExpansionmodelEditorFilenameDefaultBase = My
+_UI_ExpansionmodelEditorFilenameExtensions = expansionmodel
+
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml index ffc6bd2d80a..6e764065750 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml @@ -6,31 +6,32 @@ <plugin>
+
<extension point="org.eclipse.ui.newWizards">
- <!-- @generated expansionModel -->
+ <!-- @generated ExpandModel -->
<category
id="org.eclipse.emf.ecore.Wizard.category.ID"
name="%_UI_Wizard_category"/>
<wizard
- id="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionModelModelWizardID"
- name="%_UI_ExpansionModelModelWizard_label"
- class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionModelModelWizard"
+ id="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionmodelModelWizardID"
+ name="%_UI_ExpansionmodelModelWizard_label"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionmodelModelWizard"
category="org.eclipse.emf.ecore.Wizard.category.ID"
- icon="icons/full/obj16/ExpansionModelModelFile.gif">
- <description>%_UI_ExpansionModelModelWizard_description</description>
+ icon="icons/full/obj16/ExpansionmodelModelFile.gif">
+ <description>%_UI_ExpansionmodelModelWizard_description</description>
<selection class="org.eclipse.core.resources.IResource"/>
</wizard>
</extension>
<extension point="org.eclipse.ui.editors">
- <!-- @generated expansionModel -->
+ <!-- @generated ExpandModel -->
<editor
- id="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionModelEditorID"
- name="%_UI_ExpansionModelEditor_label"
- icon="icons/full/obj16/ExpansionModelModelFile.gif"
+ id="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionmodelEditorID"
+ name="%_UI_ExpansionmodelEditor_label"
+ icon="icons/full/obj16/ExpansionmodelModelFile.gif"
extensions="expansionmodel"
- class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionModelEditor"
- contributorClass="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionModelActionBarContributor">
+ class="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionmodelEditor"
+ contributorClass="org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation.ExpansionmodelActionBarContributor">
</editor>
</extension>
</plugin>
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelActionBarContributor.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelActionBarContributor.java index 0da9d0c468b..be9c872430a 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelActionBarContributor.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelActionBarContributor.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation;
@@ -36,18 +46,18 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
/**
- * This is the action bar contributor for the ExpansionModel model editor.
+ * This is the action bar contributor for the Expansionmodel model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class ExpansionModelActionBarContributor
+public class ExpansionmodelActionBarContributor
extends EditingDomainActionBarContributor
implements ISelectionChangedListener {
/**
@@ -73,14 +83,14 @@ public class ExpansionModelActionBarContributor * @generated
*/
protected IAction showPropertiesViewAction =
- new Action(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+ new Action(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
@Override
public void run() {
try {
getPage().showView("org.eclipse.ui.views.PropertySheet");
}
catch (PartInitException exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
}
};
@@ -93,7 +103,7 @@ public class ExpansionModelActionBarContributor * @generated
*/
protected IAction refreshViewerAction =
- new Action(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+ new Action(ExpandModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
@Override
public boolean isEnabled() {
return activeEditorPart instanceof IViewerProvider;
@@ -150,7 +160,7 @@ public class ExpansionModelActionBarContributor * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelActionBarContributor() {
+ public ExpansionmodelActionBarContributor() {
super(ADDITIONS_LAST_STYLE);
loadResourceAction = new LoadResourceAction();
validateAction = new ValidateAction();
@@ -180,7 +190,7 @@ public class ExpansionModelActionBarContributor public void contributeToMenu(IMenuManager menuManager) {
super.contributeToMenu(menuManager);
- IMenuManager submenuManager = new MenuManager(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelEditor_menu"), "org.eclipse.papyrus.infra.gmfdiag.common.expansionmodelMenuID");
+ IMenuManager submenuManager = new MenuManager(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelEditor_menu"), "org.eclipse.papyrus.infra.gmfdiag.common.expansionmodelMenuID");
menuManager.insertAfter("additions", submenuManager);
submenuManager.add(new Separator("settings"));
submenuManager.add(new Separator("actions"));
@@ -189,12 +199,12 @@ public class ExpansionModelActionBarContributor // Prepare for CreateChild item addition or removal.
//
- createChildMenuManager = new MenuManager(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ createChildMenuManager = new MenuManager(ExpandModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
submenuManager.insertBefore("additions", createChildMenuManager);
// Prepare for CreateSibling item addition or removal.
//
- createSiblingMenuManager = new MenuManager(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ createSiblingMenuManager = new MenuManager(ExpandModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
submenuManager.insertBefore("additions", createSiblingMenuManager);
// Force an update because Eclipse hides empty menus now.
@@ -385,11 +395,11 @@ public class ExpansionModelActionBarContributor super.menuAboutToShow(menuManager);
MenuManager submenuManager = null;
- submenuManager = new MenuManager(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ submenuManager = new MenuManager(ExpandModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
populateManager(submenuManager, createChildActions, null);
menuManager.insertBefore("edit", submenuManager);
- submenuManager = new MenuManager(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ submenuManager = new MenuManager(ExpandModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
populateManager(submenuManager, createSiblingActions, null);
menuManager.insertBefore("edit", submenuManager);
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelEditor.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelEditor.java index ded0f879321..5da47bc3bcc 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelEditor.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelEditor.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation;
@@ -154,20 +164,20 @@ import org.eclipse.emf.edit.ui.util.EditUIUtil; import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider.ExpansionModelItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider.ExpansionmodelItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
/**
- * This is an example of a ExpansionModel model editor.
+ * This is an example of a Expansionmodel model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class ExpansionModelEditor
+public class ExpansionmodelEditor
extends MultiPageEditorPart
implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
/**
@@ -329,18 +339,18 @@ public class ExpansionModelEditor public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
- getActionBarContributor().setActiveEditor(ExpansionModelEditor.this);
+ getActionBarContributor().setActiveEditor(ExpansionmodelEditor.this);
setCurrentViewer(contentOutlineViewer);
}
}
else if (p instanceof PropertySheet) {
if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
- getActionBarContributor().setActiveEditor(ExpansionModelEditor.this);
+ getActionBarContributor().setActiveEditor(ExpansionmodelEditor.this);
handleActivate();
}
}
- else if (p == ExpansionModelEditor.this) {
+ else if (p == ExpansionmodelEditor.this) {
handleActivate();
}
}
@@ -513,7 +523,7 @@ public class ExpansionModelEditor public void run() {
removedResources.addAll(visitor.getRemovedResources());
if (!isDirty()) {
- getSite().getPage().closeEditor(ExpansionModelEditor.this, false);
+ getSite().getPage().closeEditor(ExpansionmodelEditor.this, false);
}
}
});
@@ -524,7 +534,7 @@ public class ExpansionModelEditor (new Runnable() {
public void run() {
changedResources.addAll(visitor.getChangedResources());
- if (getSite().getPage().getActiveEditor() == ExpansionModelEditor.this) {
+ if (getSite().getPage().getActiveEditor() == ExpansionmodelEditor.this) {
handleActivate();
}
}
@@ -532,7 +542,7 @@ public class ExpansionModelEditor }
}
catch (CoreException exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
}
};
@@ -556,7 +566,7 @@ public class ExpansionModelEditor if (!removedResources.isEmpty()) {
if (handleDirtyConflict()) {
- getSite().getPage().closeEditor(ExpansionModelEditor.this, false);
+ getSite().getPage().closeEditor(ExpansionmodelEditor.this, false);
}
else {
removedResources.clear();
@@ -648,7 +658,7 @@ public class ExpansionModelEditor showTabs();
}
catch (PartInitException exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
}
@@ -659,7 +669,7 @@ public class ExpansionModelEditor markerHelper.createMarkers(diagnostic);
}
catch (CoreException exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
}
}
@@ -686,7 +696,7 @@ public class ExpansionModelEditor * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelEditor() {
+ public ExpansionmodelEditor() {
super();
initializeEditingDomain();
}
@@ -703,7 +713,7 @@ public class ExpansionModelEditor adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new ExpansionModelItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ExpansionmodelItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.
@@ -1023,7 +1033,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
Tree tree = new Tree(composite, SWT.MULTI);
@@ -1057,7 +1067,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
Tree tree = new Tree(composite, SWT.MULTI);
@@ -1086,7 +1096,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
return new ListViewer(composite);
@@ -1111,7 +1121,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
return new TreeViewer(composite);
@@ -1138,7 +1148,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
return new TableViewer(composite);
@@ -1181,7 +1191,7 @@ public class ExpansionModelEditor //
{
ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ExpansionModelEditor.this) {
+ new ViewerPane(getSite().getPage(), ExpansionmodelEditor.this) {
@Override
public Viewer createViewer(Composite composite) {
return new TreeViewer(composite);
@@ -1401,8 +1411,8 @@ public class ExpansionModelEditor new ExtendedPropertySheetPage(editingDomain) {
@Override
public void setSelectionToViewer(List<?> selection) {
- ExpansionModelEditor.this.setSelectionToViewer(selection);
- ExpansionModelEditor.this.setFocus();
+ ExpansionmodelEditor.this.setSelectionToViewer(selection);
+ ExpansionmodelEditor.this.setFocus();
}
@Override
@@ -1524,7 +1534,7 @@ public class ExpansionModelEditor catch (Exception exception) {
// Something went wrong that shouldn't.
//
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
updateProblemIndication = true;
updateProblemIndication();
@@ -1728,7 +1738,7 @@ public class ExpansionModelEditor * @generated
*/
private static String getString(String key) {
- return ExpansionModelEditorPlugin.INSTANCE.getString(key);
+ return ExpandModelEditorPlugin.INSTANCE.getString(key);
}
/**
@@ -1738,7 +1748,7 @@ public class ExpansionModelEditor * @generated
*/
private static String getString(String key, Object s1) {
- return ExpansionModelEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+ return ExpandModelEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
}
/**
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelModelWizard.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelModelWizard.java index eb39a7d2997..a070a89ced6 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionModelModelWizard.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/presentation/ExpansionmodelModelWizard.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation;
@@ -69,9 +79,9 @@ import org.eclipse.ui.dialogs.WizardNewFileCreationPage; import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionModelPackage;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelEditPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin;
import org.eclipse.core.runtime.Path;
@@ -79,7 +89,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorPlugin;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
@@ -93,7 +103,7 @@ import org.eclipse.ui.PartInitException; * <!-- end-user-doc -->
* @generated
*/
-public class ExpansionModelModelWizard extends Wizard implements INewWizard {
+public class ExpansionmodelModelWizard extends Wizard implements INewWizard {
/**
* The supported extensions for created files.
* <!-- begin-user-doc -->
@@ -101,7 +111,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * @generated
*/
public static final List<String> FILE_EXTENSIONS =
- Collections.unmodifiableList(Arrays.asList(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelEditorFilenameExtensions").split("\\s*,\\s*")));
+ Collections.unmodifiableList(Arrays.asList(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelEditorFilenameExtensions").split("\\s*,\\s*")));
/**
* A formatted list of supported file extensions, suitable for display.
@@ -110,7 +120,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
- ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+ ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
/**
* This caches an instance of the model package.
@@ -118,7 +128,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- protected ExpansionModelPackage expansionModelPackage = ExpansionModelPackage.eINSTANCE;
+ protected ExpansionmodelPackage expansionmodelPackage = ExpansionmodelPackage.eINSTANCE;
/**
* This caches an instance of the model factory.
@@ -126,7 +136,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- protected ExpansionModelFactory expansionModelFactory = expansionModelPackage.getExpansionModelFactory();
+ protected ExpansionmodelFactory expansionmodelFactory = expansionmodelPackage.getExpansionmodelFactory();
/**
* This is the file creation page.
@@ -134,7 +144,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- protected ExpansionModelModelWizardNewFileCreationPage newFileCreationPage;
+ protected ExpansionmodelModelWizardNewFileCreationPage newFileCreationPage;
/**
* This is the initial object creation page.
@@ -142,7 +152,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- protected ExpansionModelModelWizardInitialObjectCreationPage initialObjectCreationPage;
+ protected ExpansionmodelModelWizardInitialObjectCreationPage initialObjectCreationPage;
/**
* Remember the selection during initialization for populating the default container.
@@ -177,8 +187,8 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workbench = workbench;
this.selection = selection;
- setWindowTitle(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
- setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExpansionModelEditorPlugin.INSTANCE.getImage("full/wizban/NewExpansionModel")));
+ setWindowTitle(ExpandModelEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+ setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExpandModelEditorPlugin.INSTANCE.getImage("full/wizban/NewExpansionmodel")));
}
/**
@@ -190,7 +200,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { protected Collection<String> getInitialObjectNames() {
if (initialObjectNames == null) {
initialObjectNames = new ArrayList<String>();
- for (EClassifier eClassifier : expansionModelPackage.getEClassifiers()) {
+ for (EClassifier eClassifier : expansionmodelPackage.getEClassifiers()) {
if (eClassifier instanceof EClass) {
EClass eClass = (EClass)eClassifier;
if (!eClass.isAbstract()) {
@@ -210,8 +220,8 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * @generated
*/
protected EObject createInitialModel() {
- EClass eClass = (EClass)expansionModelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
- EObject rootObject = expansionModelFactory.create(eClass);
+ EClass eClass = (EClass)expansionmodelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+ EObject rootObject = expansionmodelFactory.create(eClass);
return rootObject;
}
@@ -261,7 +271,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { resource.save(options);
}
catch (Exception exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
}
finally {
progressMonitor.done();
@@ -294,14 +304,14 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
}
catch (PartInitException exception) {
- MessageDialog.openError(workbenchWindow.getShell(), ExpansionModelEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+ MessageDialog.openError(workbenchWindow.getShell(), ExpandModelEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
return false;
}
return true;
}
catch (Exception exception) {
- ExpansionModelEditorPlugin.INSTANCE.log(exception);
+ ExpandModelEditorPlugin.INSTANCE.log(exception);
return false;
}
}
@@ -312,14 +322,14 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- public class ExpansionModelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+ public class ExpansionmodelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
/**
* Pass in the selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+ public ExpansionmodelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
super(pageId, selection);
}
@@ -335,7 +345,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { String extension = new Path(getFileName()).getFileExtension();
if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
- setErrorMessage(ExpansionModelEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+ setErrorMessage(ExpandModelEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
return false;
}
return true;
@@ -359,7 +369,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- public class ExpansionModelModelWizardInitialObjectCreationPage extends WizardPage {
+ public class ExpansionmodelModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -387,7 +397,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelModelWizardInitialObjectCreationPage(String pageId) {
+ public ExpansionmodelModelWizardInitialObjectCreationPage(String pageId) {
super(pageId);
}
@@ -397,8 +407,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { * @generated
*/
public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- {
+ Composite composite = new Composite(parent, SWT.NONE); {
GridLayout layout = new GridLayout();
layout.numColumns = 1;
layout.verticalSpacing = 12;
@@ -413,7 +422,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { Label containerLabel = new Label(composite, SWT.LEFT);
{
- containerLabel.setText(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+ containerLabel.setText(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
GridData data = new GridData();
data.horizontalAlignment = GridData.FILL;
@@ -439,7 +448,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { Label encodingLabel = new Label(composite, SWT.LEFT);
{
- encodingLabel.setText(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+ encodingLabel.setText(ExpandModelEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
GridData data = new GridData();
data.horizontalAlignment = GridData.FILL;
@@ -538,10 +547,10 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { */
protected String getLabel(String typeName) {
try {
- return ExpansionModelEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+ return ExpandModelEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
}
catch(MissingResourceException mre) {
- ExpansionModelEditorPlugin.INSTANCE.log(mre);
+ ExpandModelEditorPlugin.INSTANCE.log(mre);
}
return typeName;
}
@@ -554,7 +563,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { protected Collection<String> getEncodings() {
if (encodings == null) {
encodings = new ArrayList<String>();
- for (StringTokenizer stringTokenizer = new StringTokenizer(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+ for (StringTokenizer stringTokenizer = new StringTokenizer(ExpandModelEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
encodings.add(stringTokenizer.nextToken());
}
}
@@ -572,10 +581,10 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { public void addPages() {
// Create a page, set the title, and the initial model file name.
//
- newFileCreationPage = new ExpansionModelModelWizardNewFileCreationPage("Whatever", selection);
- newFileCreationPage.setTitle(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelModelWizard_label"));
- newFileCreationPage.setDescription(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelModelWizard_description"));
- newFileCreationPage.setFileName(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+ newFileCreationPage = new ExpansionmodelModelWizardNewFileCreationPage("Whatever", selection);
+ newFileCreationPage.setTitle(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelModelWizard_label"));
+ newFileCreationPage.setDescription(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelModelWizard_description"));
+ newFileCreationPage.setFileName(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
addPage(newFileCreationPage);
// Try and get the resource selection to determine a current directory for the file dialog.
@@ -601,7 +610,7 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { // Make up a unique new name here.
//
- String defaultModelBaseFilename = ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelEditorFilenameDefaultBase");
+ String defaultModelBaseFilename = ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelEditorFilenameDefaultBase");
String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
@@ -611,9 +620,9 @@ public class ExpansionModelModelWizard extends Wizard implements INewWizard { }
}
}
- initialObjectCreationPage = new ExpansionModelModelWizardInitialObjectCreationPage("Whatever2");
- initialObjectCreationPage.setTitle(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_ExpansionModelModelWizard_label"));
- initialObjectCreationPage.setDescription(ExpansionModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+ initialObjectCreationPage = new ExpansionmodelModelWizardInitialObjectCreationPage("Whatever2");
+ initialObjectCreationPage.setTitle(ExpandModelEditorPlugin.INSTANCE.getString("_UI_ExpansionmodelModelWizard_label"));
+ initialObjectCreationPage.setDescription(ExpandModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
addPage(initialObjectCreationPage);
}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/presentation/ExpansionModelEditorPlugin.java b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/presentation/ExpandModelEditorPlugin.java index e1eb56b31bb..8838f70541c 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/presentation/ExpansionModelEditorPlugin.java +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/presentation/ExpandModelEditorPlugin.java @@ -1,4 +1,14 @@ /**
+ * Copyright (c) 2015 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:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation;
@@ -9,19 +19,19 @@ import org.eclipse.emf.common.ui.EclipseUIPlugin; import org.eclipse.emf.common.util.ResourceLocator;
/**
- * This is the central singleton for the ExpansionModel editor plugin.
+ * This is the central singleton for the ExpandModel editor plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public final class ExpansionModelEditorPlugin extends EMFPlugin {
+public final class ExpandModelEditorPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final ExpansionModelEditorPlugin INSTANCE = new ExpansionModelEditorPlugin();
+ public static final ExpandModelEditorPlugin INSTANCE = new ExpandModelEditorPlugin();
/**
* Keep track of the singleton.
@@ -37,7 +47,7 @@ public final class ExpansionModelEditorPlugin extends EMFPlugin { * <!-- end-user-doc -->
* @generated
*/
- public ExpansionModelEditorPlugin() {
+ public ExpandModelEditorPlugin() {
super
(new ResourceLocator [] {
});
|
