diff options
| author | rschnekenbu | 2014-03-28 09:13:07 +0000 |
|---|---|---|
| committer | rschnekenbu | 2014-03-28 09:13:07 +0000 |
| commit | cd8f483d95a0c426f4dbf4f48e05333c0a64dbbb (patch) | |
| tree | 44ffec56d9f10ea5087c9ebc0044c5c04101e4c8 | |
| parent | abd51c56328931a1b0a3b212c04ac89f64d90c6e (diff) | |
| parent | 4f1af28df69e9ba9a6181f719367e8114cfface7 (diff) | |
| download | org.eclipse.papyrus-cd8f483d95a0c426f4dbf4f48e05333c0a64dbbb.tar.gz org.eclipse.papyrus-cd8f483d95a0c426f4dbf4f48e05333c0a64dbbb.tar.xz org.eclipse.papyrus-cd8f483d95a0c426f4dbf4f48e05333c0a64dbbb.zip | |
Merge branch 'master' into committers/rschnekenbu/master/extendedtypes
56 files changed, 2193 insertions, 432 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF index e8e1f3de508..41708bc08f7 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.osgi.profile;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.adl4eclipse.org.Activator
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF index 2cff5994b6b..ba58e8f3e28 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.adl4eclipsetool;bundle-version="1.0.0",
org.eclipse.pde.core
Bundle-Vendor: %providerName
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.adltool.assistant.Activator
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java index 6bc31b2c56f..283c0019c30 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java @@ -32,6 +32,7 @@ import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.ISelectionService;
@@ -128,17 +129,9 @@ public class AdvancePluginImport extends Wizard implements IImportWizard { Iterator selectedobjectIteractor = ((IStructuredSelection)selection).iterator();
while (selectedobjectIteractor.hasNext()) {
Object currentSelection = selectedobjectIteractor.next();
- if(currentSelection instanceof GraphicalEditPart) {
- Object graphicalElement = ((GraphicalEditPart)currentSelection).getModel();
- if((graphicalElement instanceof View) && ((View)graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {
- selectedSet.add( (org.eclipse.uml2.uml.Element)((View)graphicalElement).getElement());
- }
- }
- else if(currentSelection instanceof IAdaptable) {
- EObject selectedEObject = (EObject)((IAdaptable)currentSelection).getAdapter(EObject.class);
- if (selectedEObject instanceof org.eclipse.uml2.uml.Element){
- selectedSet.add((Element)selectedEObject);
- }
+ EObject selectedEObject = EMFHelper.getEObject(currentSelection);
+ if (selectedEObject instanceof org.eclipse.uml2.uml.Element){
+ selectedSet.add((Element)selectedEObject);
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java index 36ca3d8fc73..32aa67b058e 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java @@ -31,6 +31,7 @@ import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.ISelectionService;
@@ -127,21 +128,14 @@ public class SimplePluginImport extends Wizard implements IImportWizard { Iterator selectedobjectIteractor = ((IStructuredSelection)selection).iterator();
while (selectedobjectIteractor.hasNext()) {
Object currentSelection = selectedobjectIteractor.next();
- if(currentSelection instanceof GraphicalEditPart) {
- Object graphicalElement = ((GraphicalEditPart)currentSelection).getModel();
- if((graphicalElement instanceof View) && ((View)graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {
- selectedSet.add( (org.eclipse.uml2.uml.Element)((View)graphicalElement).getElement());
- }
- }
- else if(currentSelection instanceof IAdaptable) {
- EObject selectedEObject = (EObject)((IAdaptable)currentSelection).getAdapter(EObject.class);
+
+ EObject selectedEObject = EMFHelper.getEObject(currentSelection);
if (selectedEObject instanceof org.eclipse.uml2.uml.Element){
selectedSet.add((Element)selectedEObject);
}
}
}
- }
return selectedSet;
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF index 581e365a02e..17ec720f1a2 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.adltool, org.eclipse.papyrus.adltool.designer.wizard
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.adltool.Activator
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF index 1991034cd0e..a604b26841a 100644 --- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF +++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.osgi.profile.Activator
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml index 27a0f14f477..9f55afabaa6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml @@ -19,5 +19,190 @@ <extension point="org.eclipse.papyrus.emf.facet.widgets.celleditors.compositeEditorFactories">
<compositeEditorFactory class="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.widgets.celleditors.composite.ImageCompositeFactory"/>
</extension>
-
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ defaultHandler="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler.CreateEClassCustomizationHandler"
+ id="org.eclipse.papyrus.emf.facet.custom.sdk.ui.CreateEClassCustomization"
+ name="%command.custo.name">
+ </command>
+ <command
+ defaultHandler="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler.CreateFacetCustomizationHandler"
+ id="org.eclipse.papyrus.emf.facet.custom.sdk.ui.CreateFacetCustomization"
+ name="%command.custo.name.1">
+ </command>
+ <command
+ defaultHandler="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler.AddCustomizationPropertyInEClassHandler"
+ id="org.eclipse.papyrus.emf.facet.custom.sdk.ui.AddCustomization"
+ name="%command.custo.name.2">
+ </command>
+ <command
+ defaultHandler="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler.AddCaseQueryHandler"
+ id="org.eclipse.papyrus.emf.facet.custom.sdk.ui.AddCaseQuery"
+ name="%command.custo.name.3">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="true"
+ locationURI="popup:org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.CustomEditorID?before=edit">
+ <menu
+ label="%menu.custo.label">
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.custom.sdk.ui.CreateEClassCustomization"
+ icon="icons/full/obj16/CustomModelFile.gif"
+ label="%command.custo.name"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.custom.sdk.ui.CreateFacetCustomization"
+ icon="icons/full/obj16/CustomModelFile.gif"
+ label="%command.custo.name.1"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.custom.sdk.ui.AddCustomization"
+ icon="icons/full/obj16/CustomModelFile.gif"
+ label="%command.custo.name.2"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.custom.sdk.ui.AddCaseQuery"
+ icon="icons/querySet.gif"
+ label="%command.custo.name.3"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ </menu>
+ <menu
+ label="%menu.label">
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetSetInFacetSet"
+ icon="icons/FacetSet.gif"
+ label="%command.name"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetInFacetSet"
+ icon="icons/facet.gif"
+ label="%command.name.0"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addAttributeInFacet"
+ icon="icons/FacetAttribute.gif"
+ label="%command.name.1"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addOperationInFacet"
+ icon="icons/FacetOperation.gif"
+ label="%command.name.2"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addReferenceInFacet"
+ icon="icons/FacetReference.gif"
+ label="%command.name.4"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addParameterInOperation"
+ icon="icons/ParameterValue.gif"
+ label="%command.name.3"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetSet"
+ icon="icons/FacetSet.gif"
+ label="%command.name.5"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacet"
+ icon="icons/facet.gif"
+ label="%command.name.6"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetAttribute"
+ icon="icons/FacetAttribute.gif"
+ label="%command.name.7"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperation"
+ icon="icons/FacetOperation.gif"
+ label="%command.name.8"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperationParameter"
+ icon="icons/ParameterValue.gif"
+ label="%command.name.9"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetReference"
+ icon="icons/FacetReference.gif"
+ label="%command.name.10"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ </menu>
+ </menuContribution>
+ </extension>
+ <extension
+ point="org.eclipse.ui.startup">
+ <startup
+ class="org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Startup"></startup>
+ </extension>
</plugin>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java index 232c67c5999..5c9a88c06d8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2011, 2012 Mia-Software.
+ * Copyright (c) 2011, 2014 Mia-Software, CEA, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,6 +11,7 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider
* Gregoire Dupe (Mia-Software) - Bug 424122 - [Table] Images, fonts and colors are not shared between the instances of table
+ * Christian W. Damus (CEA) - bug 410346
*/
package org.eclipse.papyrus.emf.facet.custom.ui.internal.query;
@@ -19,10 +20,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.ETypedElement;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator;
import org.eclipse.papyrus.emf.facet.custom.ui.internal.ImageProvider;
import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper;
import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
@@ -31,9 +30,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribu import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
-import org.eclipse.papyrus.emf.facet.util.swt.imageprovider.IImageProvider;
-import org.eclipse.papyrus.emf.facet.util.swt.imageprovider.IImageProviderFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
import org.eclipse.swt.graphics.Image;
@@ -61,21 +57,25 @@ public class ImageQuery implements IJavaQuery2<EObject, IImage> { IImage result = null;
final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory
- .adapt(source, IItemLabelProvider.class);
- if (itemLabelProvider != null) {
- Object imageObject = itemLabelProvider.getImage(source);
- Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);
- result = new ImageWrapper(image);
-//// final ImageDescriptor imgDescriptor = ExtendedImageRegistry
-//// .getInstance().getImageDescriptor(source);
-// final IImageProvider imgProvider = IImageProviderFactory.DEFAULT
-// .createIImageProvider(Activator.getDefault());
-// if (imgDescriptor != null) {
-// final Image image = imgProvider.getImage(imgDescriptor);
-// result = new ImageWrapper(image);
-// }
+
+ try {
+ final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);
+ if(itemLabelProvider != null) {
+ Object imageObject = itemLabelProvider.getImage(source);
+ Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);
+ result = new ImageWrapper(image);
+//// final ImageDescriptor imgDescriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(source);
+// final IImageProvider imgProvider = IImageProviderFactory.DEFAULT.createIImageProvider(Activator.getDefault());
+// if(imgDescriptor != null) {
+// final Image image = imgProvider.getImage(imgDescriptor);
+// result = new ImageWrapper(image);
+// }
+ }
+ } finally {
+ // Dispose the adapter factory because it added an adapter that would leak, as it will never be reused
+ adapterFactory.dispose();
}
+
return result;
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java index 0d0d0130c20..8e5e5b7d05a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2011 Mia-Software.
+ * Copyright (c) 2011, 2014 Mia-Software, CEA, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
* Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)
* Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider
+ * Christian W. Damus (CEA) - bug 410346
*/
package org.eclipse.papyrus.emf.facet.custom.ui.internal.query;
@@ -47,16 +48,21 @@ public class LabelQuery implements IJavaQuery2<EObject, String> { if (sfParam == null) {
final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory
- .adapt(source, IItemLabelProvider.class);
- // We don't want to use a ReflectiveItemProvider because it provides
- // a string prefixed with the eObject's meta-class name.
- if (itemLabelProvider instanceof ReflectiveItemProvider) {
- result = LabelQuery.getDefaultName(source);
- } else if (itemLabelProvider == null) {
- result = ModelUtils.getDefaultName(source);
- } else {
- result = itemLabelProvider.getText(source);
+
+ try {
+ final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);
+ // We don't want to use a ReflectiveItemProvider because it provides
+ // a string prefixed with the eObject's meta-class name.
+ if(itemLabelProvider instanceof ReflectiveItemProvider) {
+ result = LabelQuery.getDefaultName(source);
+ } else if(itemLabelProvider == null) {
+ result = ModelUtils.getDefaultName(source);
+ } else {
+ result = itemLabelProvider.getText(source);
+ }
+ } finally {
+ // Dispose the adapter factory because it added an adapter that would leak, as nobody else will ever use it
+ adapterFactory.dispose();
}
} else {
try {
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/plugin.xml index 6b3480cce13..cff58e6e921 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/plugin.xml @@ -13,5 +13,191 @@ --> <plugin> <extension-point id="queryFactoryDialogRegistration" name="%extension-point.name" schema="schema/queryFactoryDialogRegistration.exsd"/> - + <extension + point="org.eclipse.ui.menus"> + <menuContribution + allPopups="true" + locationURI="popup:org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.presentation.EFacetEditorID?before=edit"> + <menu + label="%menu.label"> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetSetInFacetSet" + icon="icons/FacetSet.gif" + label="%command.name" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetInFacetSet" + icon="icons/facet.gif" + label="%command.name.0" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addAttributeInFacet" + icon="icons/FacetAttribute.gif" + label="%command.name.1" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addOperationInFacet" + icon="icons/FacetOperation.gif" + label="%command.name.2" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addReferenceInFacet" + icon="icons/FacetReference.gif" + label="%command.name.4" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addParameterInOperation" + icon="icons/ParameterValue.gif" + label="%command.name.3" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetSet" + icon="icons/FacetSet.gif" + label="%command.name.5" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacet" + icon="icons/facet.gif" + label="%command.name.6" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetAttribute" + icon="icons/FacetAttribute.gif" + label="%command.name.7" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperation" + icon="icons/FacetOperation.gif" + label="%command.name.8" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperationParameter" + icon="icons/ParameterValue.gif" + label="%command.name.9" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetReference" + icon="icons/FacetReference.gif" + label="%command.name.10" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + </menu> + </menuContribution> + </extension> + <extension + point="org.eclipse.ui.commands"> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.CreateFacetSetInFacetSetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetSetInFacetSet" + name="%command.name"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.CreateFacetInFacetSetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.createFacetInFacetSet" + name="%command.name.0"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.AddAttributeInFacetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addAttributeInFacet" + name="%command.name.1"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.AddOperationInFacetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addOperationInFacet" + name="%command.name.2"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.AddReferenceInFacetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addReferenceInFacet" + name="%command.name.4"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation.AddParameterInOperationHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.addParameterInOperation" + name="%command.name.3"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetSetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetSet" + name="%command.name.5"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacet" + name="%command.name.6"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetAttributeHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetAttribute" + name="%command.name.7"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetOperationHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperation" + name="%command.name.8"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetOperationParameterHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetOperationParameter" + name="%command.name.9"> + </command> + <command + defaultHandler="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.edition.EditFacetReferenceHandler" + id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.editFacetReference" + name="%command.name.10"> + </command> + </extension> + <extension + point="org.eclipse.ui.startup"> + <startup + class="org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.Startup"> + </startup> + </extension> </plugin> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java index 51087d4e391..023da74e765 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2009, 2010, 2012 Mia-Software.
+ * Copyright (c) 2009, 2014 Mia-Software, CEA, and others.
* 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
@@ -12,6 +12,8 @@ * Gregoire Dupe (Mia-Software) - Bug 371367 - Hierarchical FacetSets
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 387470 - [EFacet][Custom] Editors
+ * Christian W. Damus (CEA) - bug 410346
+ *
*******************************************************************************/
package org.eclipse.papyrus.emf.facet.util.emf.core;
@@ -162,11 +164,18 @@ public final class ModelUtils { */
//Copied from org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils.getName(EObject)
public static String getName(final EObject eObject) {
- IItemLabelProvider itemLabelProvider = (IItemLabelProvider) new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE).adapt(eObject, IItemLabelProvider.class);
- if (itemLabelProvider != null) {
- return itemLabelProvider.getText(eObject);
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ try {
+ IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);
+ if(itemLabelProvider != null) {
+ return itemLabelProvider.getText(eObject);
+ }
+ } finally {
+ // Dispose the adapter factory because it added an adapter that would leak, as it will never be reused
+ adapterFactory.dispose();
}
+
return ModelUtils.getDefaultName(eObject);
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java index 77b942396af..edd2ff8f2cf 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2010 Mia-Software.
+ * Copyright (c) 2010, 2014 Mia-Software, CEA, and others.
* 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
@@ -9,6 +9,8 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.papyrus.emf.facet.widgets API Cleaning
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
+ * Christian W. Damus (CEA) - bug 410346
+ *
*******************************************************************************/
package org.eclipse.papyrus.emf.facet.widgets.internal;
@@ -49,6 +51,18 @@ public class CustomizableLabelProvider extends LabelProvider { }
@Override
+ public void dispose() {
+ try {
+ // Because we created this adapter factory, ourselves, we must dispose it, as it may have created
+ // adapters that are redundant with other adapters still attached to the model and nobody else will
+ // be using our adapters (they are only recognized by the factory that created them)
+ adapterFactoryWithRegistry.dispose();
+ } finally {
+ super.dispose();
+ }
+ }
+
+ @Override
public String getText(final Object element) {
if (element instanceof EReference) {
EReference eReference = (EReference) element;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java index e1d193baa2a..6f07621e710 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2008, 2013 CEA LIST.
+ * Copyright (c) 2008, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -10,6 +10,7 @@ * Contributors:
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
* Christian W. Damus (CEA) - manage models by URI, not IFile (CDO)
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
@@ -28,6 +29,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.ui.URIEditorInput;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -65,6 +67,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceStartKind; import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.services.internal.EditorLifecycleManagerImpl;
import org.eclipse.papyrus.infra.core.services.internal.InternalEditorLifecycleManager;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorActionBarContributor;
@@ -529,8 +532,22 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen // register a basic label provider
// adapter factory used by EMF objects
- AdapterFactory factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ AdapterFactory factory = null;
+ try {
+ EditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);
+ if(domain instanceof AdapterFactoryEditingDomain) {
+ // Use the adapter factory already provided by this editing domain
+ factory = ((AdapterFactoryEditingDomain)domain).getAdapterFactory();
+ }
+ } catch (ServiceException e) {
+ // OK, there's no editing domain. That's fine
+ }
+ if(factory == null) {
+ // Must create a new adapter factory
+ factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ }
+
/** label provider for EMF objects */
ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory) {
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java index c875500d8fd..ced8e99148f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2014 CEA LIST and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@ *
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.providers.strategy;
@@ -23,8 +25,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IDisposable;
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
-import org.eclipse.papyrus.emf.facet.custom.core.internal.CustomizationManager;
import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
import org.eclipse.papyrus.infra.emf.Activator;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
@@ -90,6 +92,18 @@ public class SemanticEMFContentProvider extends CustomizedTreeContentProvider im public SemanticEMFContentProvider(EObject editedEObject, EStructuralFeature feature, ResourceSet root) {
this(editedEObject, feature, getRoots(root));
}
+
+ @Override
+ public void dispose() {
+ try {
+ // Because we created this adapter factory, we must dispose it
+ if(factory instanceof IDisposable) {
+ ((IDisposable)factory).dispose();
+ }
+ } finally {
+ super.dispose();
+ }
+ }
protected static EObject[] getRoots(ResourceSet root) {
List<EObject> roots = new LinkedList<EObject>();
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java index 901717f2adb..a14cb2dfdbf 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2012, 2014 CEA LIST and others.
- *
+ *
* 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
@@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus (CEA) - bug 429422
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css.engine;
@@ -30,11 +30,11 @@ import org.w3c.dom.Element; /**
* An extended CSS Engine for an EMF Resource (A Model). This engine
* is a child of the WorkspaceCSSEngine.
- *
+ *
* It should not be used directly.
- *
+ *
* @author Camille Letavernier
- *
+ *
* @see DiagramCSSEngine
*/
@SuppressWarnings("restriction")
@@ -44,19 +44,23 @@ public class ModelCSSEngine extends ExtendedCSSEngineImpl { /**
* Creates a ModelCSSEngine for the requested resource.
- *
+ *
* @param model
*/
public ModelCSSEngine(Resource model) {
- super(getProjectCSSEngine(model));
+ super(getParentCSSEngine(model));
this.model = model;
}
- private static ExtendedCSSEngine getProjectCSSEngine(Resource resource) {
+ private static ExtendedCSSEngine getParentCSSEngine(Resource resource) {
+ ExtendedCSSEngine result;
if(resource instanceof CSSNotationResource) {
- return ((CSSNotationResource)resource).getProjectEngine();
+ result = ((CSSNotationResource)resource).getProjectEngine();
+ } else {
+ result = ProjectCSSEngine.createEngine(resource);
}
- return ProjectCSSEngine.createEngine(resource);
+
+ return result == null ? WorkspaceCSSEngine.instance : result;
}
@Override
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java index 704da4abc99..eccccb2e6c4 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java @@ -17,6 +17,7 @@ import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusC import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
import org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.StringHelper;
import org.w3c.dom.Element;
import org.w3c.dom.css.CSSValue;
@@ -55,11 +56,12 @@ public class CSSCustomStyleDelegate implements CustomStyle { * The CSS engine used to handle the custom properties
*/
public CSSCustomStyleDelegate(View view, ExtendedCSSEngine engine) {
- this.view = view;
+ this.view = CSSDOMSemanticElementHelper.findPrimaryView(view);
this.engine = engine;
this.element = engine.getElement(this.view);
}
+ @Override
public boolean showElementIcon() {
EAnnotation displayNameLabelIcon = view.getEAnnotation(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);
if(displayNameLabelIcon != null) {
@@ -73,6 +75,7 @@ public class CSSCustomStyleDelegate implements CustomStyle { return (Boolean)engine.convert(cssValue, Boolean.class, null);
}
+ @Override
public int getQualifiedNameDepth() {
EAnnotation qualifiedNameAnnotation = view.getEAnnotation(VisualInformationPapyrusConstants.QUALIFIED_NAME);
if(qualifiedNameAnnotation != null) {
@@ -103,6 +106,7 @@ public class CSSCustomStyleDelegate implements CustomStyle { }
}
+ @Override
public boolean showShadow() {
EAnnotation shadowAnnotation = view.getEAnnotation(VisualInformationPapyrusConstants.SHADOWFIGURE);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom index 6d0807de1a6..776714a0ea2 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom @@ -19,11 +19,17 @@ <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>
</facetOperations>
</eClassifiers>
- <eClassifiers xsi:type="custom:EClassCustomization" name="EObject" documentation="representation around EObject displayed in model explorer">
+ <eClassifiers xsi:type="efacet:Facet" name="DiagramContainer" documentation="this element represent a container of diagram" conformanceTypedElement="//DiagramContainer/isDiagramContainer">
<extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <facetOperations name="isDiagramContainer" documentation="test if the element references diagrams">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.IsDiagramContainer"/>
+ </facetOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="custom:FacetCustomization" name="DiagramContainer" documentation="Representation of a diagram container">
<facetElements xsi:type="efacet:FacetReference" name="diagrams" upperBound="-1" defaultValueLiteral="" derived="true">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
- <query xsi:type="query:OperationCallQuery" operation="//EObject/DiagramsRefContent"/>
+ <query xsi:type="query:OperationCallQuery" operation="//DiagramContainer.1/DiagramsRefContent"/>
</facetElements>
<facetOperations name="DiagramsRefVisibility" documentation="Return true if the element contains diagrams">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -45,5 +51,7 @@ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.DiagramsRefCollapseQuery"/>
<override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/collapseLink"/>
</facetOperations>
+ <extendedFacets href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>
+ <customizedFacet href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>
</eClassifiers>
</custom:Customization>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java new file mode 100644 index 00000000000..814c6cf53c5 --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java @@ -0,0 +1,59 @@ +/**
+ * Copyright (c) 2011 Atos.
+ *
+ * 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:
+ * Atos - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
+import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
+
+public class DisplayDiagramRef extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
+
+ /**
+ * Return true if the element is a Diagram Container and the Ereference is diagrams
+ */
+
+ public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
+ ParameterValue parameterValue= (ParameterValue)parameterValues.getParameterValueByName("eStructuralFeature");
+ EStructuralFeature eStructuralFeature=(EStructuralFeature)parameterValue.getValue();
+ if((eStructuralFeature instanceof FacetReference)&&("diagrams".equals((eStructuralFeature).getName()))){
+
+ Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
+ if(roots == null) {
+ return false;
+ }
+
+ while(roots.hasNext()) {
+ EObject root = roots.next();
+ if(root instanceof Diagram) {
+ if (EcoreUtil.equals(DiagramUtils.getOwner((Diagram) root), source)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java index 348eff81323..026a7992aca 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java @@ -31,14 +31,10 @@ import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQu public class IsDiagramContainer extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
/**
- * Return true if the element is a Diagram Container
+ * Return true if the element is a Diagram Container
*/
public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- ParameterValue parameterValue= (ParameterValue)parameterValues.getParameterValueByName("eStructuralFeature");
- EStructuralFeature eStructuralFeature=(EStructuralFeature)parameterValue.getValue();
- if((eStructuralFeature instanceof FacetReference)&&("diagrams".equals((eStructuralFeature).getName()))){
-
Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
if(roots == null) {
return false;
@@ -53,7 +49,5 @@ public class IsDiagramContainer extends AbstractEditorContainerQuery implements }
}
return false;
- }
- return true;
}
}
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java index 437e8de24d1..ffdb29e723f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java @@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2007, 2008, 2009 Anyware Technologies, Obeo. + * Copyright (c) 2007, 2014 Anyware Technologies, Obeo, CEA, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +9,7 @@ * Contributors: * Anyware Technologies - initial API and implementation * Obeo + * Christian W. Damus (CEA) - bug 410346 * **********************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.outline; @@ -20,6 +21,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.IDisposable; import org.eclipse.emf.edit.provider.IViewerNotification; import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; @@ -155,7 +157,17 @@ public class DiagramNavigator extends Composite { * Set the tree providers for the outline */ protected void initProviders() { - AdapterFactoryContentProvider adapterContentProvider = new NavigatorAdapterFactoryContentProvider(getAdapterFactory()); + final AdapterFactory adapterFactory = getAdapterFactory(); + AdapterFactoryContentProvider adapterContentProvider = new NavigatorAdapterFactoryContentProvider(adapterFactory) { + @Override + public void dispose() { + // Dispose the adapter factory because we created it + if(adapterFactory instanceof IDisposable) { + ((IDisposable)adapterFactory).dispose(); + } + super.dispose(); + } + }; adapterContentProvider.inputChanged(viewer, null, null); viewer.setContentProvider(new DiagramOrientedContentProvider(adapterContentProvider)); try { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom index 591f2c9a5c1..ce3b78ed3e2 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom @@ -19,18 +19,24 @@ <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>
</facetOperations>
</eClassifiers>
- <eClassifiers xsi:type="custom:EClassCustomization" name="EObject" documentation="representation around EObject displayed in model explorer">
+ <eClassifiers xsi:type="efacet:Facet" name="TableContainer" documentation="this is a container of table" conformanceTypedElement="//TableContainer/isTableContainer">
<extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <facetOperations name="isTableContainer" documentation="test if it references table">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>
+ </facetOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="custom:FacetCustomization" name="TableContainer" documentation="representation of a container of table" extendedFacets="//TableContainer">
<facetElements xsi:type="efacet:FacetReference" name="tables" upperBound="-1" defaultValueLiteral="" derived="true">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
- <query xsi:type="query:OperationCallQuery" operation="//EObject/TablesRefContent"/>
+ <query xsi:type="query:OperationCallQuery" operation="//TableContainer.1/TablesRefContent"/>
</facetElements>
<facetOperations name="TablesRefVisibility" documentation="Return true if the element contains tables">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eParameters name="eStructuralFeature">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
</eParameters>
- <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>
+ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.DisplayTablesRef"/>
<override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>
</facetOperations>
<facetOperations name="TablesRefContent" upperBound="-1" documentation="Get the collection of all contained tables">
@@ -45,5 +51,6 @@ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.TablesRefCollapseQuery"/>
<override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/collapseLink"/>
</facetOperations>
+ <customizedFacet href="../../../plugin/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom#//TableContainer"/>
</eClassifiers>
</custom:Customization>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java new file mode 100644 index 00000000000..40c3c19cad3 --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java @@ -0,0 +1,58 @@ +/**
+ * Copyright (c) 2011 Atos.
+ *
+ * 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:
+ * Atos - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
+import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
+
+public class DisplayTablesRef extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
+
+ /**
+ * Return true if the element is a Table Container and the the Ereference is diagrams
+ */
+
+ public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
+ ParameterValue parameterValue = (ParameterValue) parameterValues.getParameterValueByName("eStructuralFeature");
+ EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();
+ if ((eStructuralFeature instanceof FacetReference) && ("tables".equals((eStructuralFeature).getName()))) {
+
+ Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
+ if (roots == null) {
+ return false;
+ }
+
+ while (roots.hasNext()) {
+ EObject root = roots.next();
+ if (root instanceof Table) {
+ if (EcoreUtil.equals(((Table) root).getOwner(), source)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java index f878ddf7ba4..f9a39dbedf9 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java @@ -34,9 +34,6 @@ public class IsTableContainer extends AbstractEditorContainerQuery implements IJ */
public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- ParameterValue parameterValue = (ParameterValue) parameterValues.getParameterValueByName("eStructuralFeature");
- EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();
- if ((eStructuralFeature instanceof FacetReference) && ("diagrams".equals((eStructuralFeature).getName()))) {
Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
if (roots == null) {
@@ -51,8 +48,6 @@ public class IsTableContainer extends AbstractEditorContainerQuery implements IJ }
}
}
- return false;
- }
- return true;
+ return false;
}
}
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/TablesRefCollapseQuery.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/TablesRefCollapseQuery.java index 6560c8c3a64..785437fc257 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/TablesRefCollapseQuery.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/TablesRefCollapseQuery.java @@ -27,7 +27,7 @@ public class TablesRefCollapseQuery implements IJavaQuery2<EObject, Boolean> { throws DerivedTypedElementException { ParameterValue parameterValue= (ParameterValue)parameterValues.getParameterValueByName("eStructuralFeature"); EStructuralFeature eStructuralFeature=(EStructuralFeature)parameterValue.getValue(); - if((eStructuralFeature instanceof FacetReference)&&("diagrams".equals((eStructuralFeature).getName()))){ + if((eStructuralFeature instanceof FacetReference)&&("tables".equals((eStructuralFeature).getName()))){ return true; } return false; diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java index 32fe14d66de..7bd85f8a708 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java +++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java @@ -1,14 +1,15 @@ /*******************************************************************************
- * Copyright (c) 2007 Anyware Technologies. 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
+ * Copyright (c) 2007, 2014 Anyware Technologies, CEA, and others.
+ * 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: Jacques Lescot (Anyware Technologies) - initial API and
- * implementation
+ * Contributors: Jacques Lescot (Anyware Technologies) - initial API and implementation
* Thibault Landre (Atos Origin) - refactor to extract the exportAllDiagram from ExportAllDiagramsAction
* Alexia Allanic (Atos Origin) - Add margin to not truncate images
* Anass Radouani (AtoS) - add use GMF exporting tool and remove manual extraction
+ * Christian W. Damus (CEA) - bug 431411
+ * Christian W. Damus (CEA) - bug 410346
*
******************************************************************************/
package org.eclipse.papyrus.infra.export;
@@ -24,6 +25,7 @@ import java.util.Map; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -51,8 +53,6 @@ import org.eclipse.emf.transaction.RollbackException; import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomain.Factory;
-import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
@@ -63,6 +63,8 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.export.internal.Activator;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
import org.eclipse.swt.SWTError;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchWindow;
@@ -162,70 +164,93 @@ public class ExportAllDiagrams { newMonitor.subTask(Messages.ExportAllDiagrams_2);
if(file != null) {
final ResourceSetImpl resourceSet = new ResourceSetImpl();
- resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);
- resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);
- resourceSet.getResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true), true);
-
- // create transactional editing domain
-
- TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(resourceSet);
- if(editingDomain == null) {
- Factory factory = TransactionalEditingDomain.Factory.INSTANCE;
- editingDomain = factory.createEditingDomain(resourceSet);
- }
-
- AbstractTransactionalCommand com = new AbstractTransactionalCommand(editingDomain, "Resolve", Collections.emptyList()) {
-
- @Override
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- EcoreUtil.resolveAll(resourceSet);
- return null;
+ TransactionalEditingDomain editingDomain = null;
+ try {
+ resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);
+ resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);
+
+ // Since the *.di file is empty as of Luna, we cannot rely on it to find all diagrams by resolving cross-references
+ IPapyrusFile logical = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(file);
+ if(logical != null) {
+ for(IResource component : logical.getAssociatedResources()) {
+ if(component.getType() == IResource.FILE) {
+ resourceSet.getResource(URI.createPlatformResourceURI(component.getFullPath().toString(), true), true);
+ }
+ }
}
- };
-
- // bypass all the transaction/validate/notification mechanisms, it is a lot faster and it has no impact
- // since we do not modify the model
- CommandStack commandStack = editingDomain.getCommandStack();
- if(commandStack instanceof TransactionalCommandStack) {
- TransactionalCommandStack stack = (TransactionalCommandStack)commandStack;
- Map<Object, Object> options = new HashMap<Object, Object>();
- options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
- options.put(Transaction.OPTION_NO_UNDO, Boolean.TRUE);
- options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
- options.put(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION, Boolean.FALSE);
- options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
- options.put(Transaction.OPTION_VALIDATE_EDIT, Boolean.FALSE);
- options.put(Transaction.OPTION_VALIDATE_EDIT_CONTEXT, Boolean.FALSE);
- try {
- stack.execute(new GMFtoEMFCommandWrapper(com), options);
- } catch (InterruptedException e) {
- } catch (RollbackException e) {
+
+ // create transactional editing domain
+ editingDomain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
+
+ AbstractTransactionalCommand com = new AbstractTransactionalCommand(editingDomain, "Resolve", Collections.emptyList()) {
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ EcoreUtil.resolveAll(resourceSet);
+ return null;
+ }
+ };
+
+ // bypass all the transaction/validate/notification mechanisms, it is a lot faster and it has no impact
+ // since we do not modify the model
+ CommandStack commandStack = editingDomain.getCommandStack();
+ if(commandStack instanceof TransactionalCommandStack) {
+ TransactionalCommandStack stack = (TransactionalCommandStack)commandStack;
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
+ options.put(Transaction.OPTION_NO_UNDO, Boolean.TRUE);
+ options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
+ options.put(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION, Boolean.FALSE);
+ options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
+ options.put(Transaction.OPTION_VALIDATE_EDIT, Boolean.FALSE);
+ options.put(Transaction.OPTION_VALIDATE_EDIT_CONTEXT, Boolean.FALSE);
+ try {
+ stack.execute(new GMFtoEMFCommandWrapper(com), options);
+ } catch (InterruptedException e) {
+ } catch (RollbackException e) {
+ }
+ } else {
+ Activator.log.warn("no transactional editing domain found");
}
- } else {
- Activator.log.warn("no transactional editing domain found");
- }
-
- List<Diagram> diagrams = new ArrayList<Diagram>();
- if(newMonitor.isCanceled()) {
- return;
- }
- for(Iterator<Notifier> i = resourceSet.getAllContents(); i.hasNext();) {
- Notifier n = i.next();
- if(n instanceof Diagram) {
- diagrams.add((Diagram)n);
+
+ List<Diagram> diagrams = new ArrayList<Diagram>();
+ if(newMonitor.isCanceled()) {
+ return;
+ }
+ for(Iterator<Notifier> i = resourceSet.getAllContents(); i.hasNext();) {
+ Notifier n = i.next();
+ if(n instanceof Diagram) {
+ diagrams.add((Diagram)n);
+ }
+ }
+ if(newMonitor.isCanceled()) {
+ return;
+ }
+ newMonitor.worked(1);
+ export(new SubProgressMonitor(newMonitor, 9), diagrams);
+ } finally {
+ // Unload the resource set so that we don't leak loads of UML content in the CacheAdapter
+ unload(resourceSet);
+ if(editingDomain != null) {
+ editingDomain.dispose();
}
}
- if(newMonitor.isCanceled()) {
- return;
- }
- newMonitor.worked(1);
- export(new SubProgressMonitor(newMonitor, 9), diagrams);
} else {
Activator.log.warn(Messages.ExportAllDiagrams_3);
}
}
+ private void unload(ResourceSet resourceSet) {
+ for (Resource next : resourceSet.getResources()) {
+ next.unload();
+ next.eAdapters().clear();
+ }
+
+ resourceSet.getResources().clear();
+ resourceSet.eAdapters().clear();
+ }
+
/**
* export all the diagrams in image
*
@@ -305,8 +330,14 @@ public class ExportAllDiagrams { if(qualifiedName) {
ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
composedAdapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
- IItemLabelProvider itemLabelFactory = (IItemLabelProvider)composedAdapterFactory.adapt(diagram.getElement(), IItemLabelProvider.class);
- label = itemLabelFactory.getText(diagram.getElement()).replace(Messages.ExportAllDiagrams_16, "") + "_"; //$NON-NLS-1$//$NON-NLS-2$
+
+ try {
+ IItemLabelProvider itemLabelFactory = (IItemLabelProvider)composedAdapterFactory.adapt(diagram.getElement(), IItemLabelProvider.class);
+ label = itemLabelFactory.getText(diagram.getElement()).replace(Messages.ExportAllDiagrams_16, "") + "_"; //$NON-NLS-1$//$NON-NLS-2$
+ } finally {
+ // Don't leak the adapters created by this factory
+ composedAdapterFactory.dispose();
+ }
}
String uniqueFileName = encodeFileName(label + diagram.getName());
if(uniqueFileName.length() > 150) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java index a5dd2ebf566..184e6a23a7c 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java +++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
+ * Copyright (c) 2011, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 431397
*
*****************************************************************************/
package org.eclipse.papyrus.infra.hyperlink.ui;
@@ -26,8 +27,8 @@ import org.eclipse.papyrus.infra.hyperlink.helper.EditorHyperLinkHelper; import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkEditor;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Display;
/**
@@ -89,9 +90,9 @@ public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShe getTooltipInputText().setText(getObjectLabeltext().getText());
}
// add listener "use default button"
- getUseDefaultCheckBox().addMouseListener(new MouseListener() {
-
- public void mouseUp(MouseEvent e) {
+ getUseDefaultCheckBox().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
usedefaultTooltip = getUseDefaultCheckBox().getSelection();
if(usedefaultTooltip) {
getTooltipInputText().setEditable(false);
@@ -100,21 +101,12 @@ public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShe getTooltipInputText().setEditable(true);
}
}
-
- public void mouseDown(MouseEvent e) {
- }
-
- public void mouseDoubleClick(MouseEvent e) {
- }
});
// launch a new editor to choose or create diagrams
- getChooseDiagramButton().addMouseListener(new MouseListener() {
-
- public void mouseUp(MouseEvent e) {
- }
-
- public void mouseDown(MouseEvent e) {
+ getChooseDiagramButton().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
EditorLookForEditorShell editorLookForDiagram = new EditorLookForEditorShell(editorRegistry, amodel);
editorLookForDiagram.open();
Object selection = editorLookForDiagram.getSelectedEditor();
@@ -141,33 +133,20 @@ public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShe }
}
}
-
- public void mouseDoubleClick(MouseEvent e) {
- }
});
// listener to cancel
- this.getCancelButton().addMouseListener(new MouseListener() {
-
- public void mouseUp(MouseEvent e) {
- }
-
- public void mouseDown(MouseEvent e) {
+ this.getCancelButton().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
hyperLinkEditor = null;
getEditHyperlinkShell().close();
}
-
- public void mouseDoubleClick(MouseEvent e) {
- }
});
// listener to click on OK
- this.getOkButton().addMouseListener(new MouseListener() {
-
- public void mouseUp(MouseEvent e) {
- }
-
- public void mouseDown(MouseEvent e) {
-
+ this.getOkButton().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
if(hyperLinkEditor != null) {
hyperLinkEditor.setTooltipText(getTooltipInputText().getText().trim());
// if diagram is null, maybe bad selection or other it
@@ -178,9 +157,6 @@ public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShe }
getEditHyperlinkShell().close();
}
-
- public void mouseDoubleClick(MouseEvent e) {
- }
});
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java index 79aa3d7ed94..69616e81bbe 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java +++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
+ * Copyright (c) 2011, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,19 +9,24 @@ *
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
+ * Christian W. Damus (CEA) - bug 431397
*
*****************************************************************************/
package org.eclipse.papyrus.infra.hyperlink.ui;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IDisposable;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -45,6 +50,8 @@ import org.eclipse.papyrus.infra.hyperlink.Activator; import org.eclipse.papyrus.infra.hyperlink.util.EditorListContentProvider;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -234,7 +241,7 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell { // SemanticEMFContentProvider(amodel)); //This content provider will
// only display the selected element, instead of the root element
// FIXME: Use a standard, non-deprecated content
- treeViewer.setContentProvider(new SemanticEMFContentProvider() {
+ treeViewer.setContentProvider(new SemanticEMFContentProvider(null, null, new EObject[] {EcoreUtil.getRootContainer(amodel)}) {
@Override
public boolean hasChildren(Object element) {
@@ -252,12 +259,12 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell { //TODO the best correction we be able to manage applied facet, because if we get diagram twice it is probably because there are 2 facets with the same behavior applied
@Override
public Object[] getChildren(Object parentElement) {
- List<Object> alreadyVisited = new ArrayList<Object>();
+ Set<Object> alreadyVisited = new HashSet<Object>();
List<Object> returnedChildren = new ArrayList<Object>();
Object[] children = super.getChildren(parentElement);
for(Object current : children) {
- if(current instanceof IAdaptable) {
- EObject el = EMFHelper.getEObject(current);
+ EObject el = EMFHelper.getEObject(current);
+ if(el != null) {
if(!alreadyVisited.contains(el)) {
returnedChildren.add(current);
alreadyVisited.add(el);
@@ -384,6 +391,17 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell { }
});
+ // dispose the adapter factory when the shell is closed
+ getLookforShell().addDisposeListener(new DisposeListener() {
+
+ public void widgetDisposed(DisposeEvent e) {
+ // we created the adapter factory, so we should dispose it
+ if(adapterFactory instanceof IDisposable) {
+ ((IDisposable)adapterFactory).dispose();
+ }
+ }
+ });
+
}
/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx Binary files differindex c0b87219f18..cb988b7e337 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx +++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di index 1980c8e603f..a378e62dca1 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di +++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di @@ -44,6 +44,15 @@ <children>
<emfPageIdentifier href="papyrusNewChild.notation#_Fo2BgFXeEeOW-JPqZK_EZg"/>
</children>
+ <children>
+ <emfPageIdentifier href="papyrusNewChild.notation#_v4laILXYEeOcibS9c7ohwg"/>
+ </children>
+ <children>
+ <emfPageIdentifier href="papyrusNewChild.notation#_tJT7ALXZEeOcibS9c7ohwg"/>
+ </children>
+ <children>
+ <emfPageIdentifier href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>
+ </children>
</children>
</windows>
</sashModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation index e30ab615d61..b7d0b683126 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation +++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
- <notation:Diagram xmi:id="_Py2DcFOFEeOuspyO4PzXCg" type="Package" name="PackageDiagram" measurementUnit="Pixel">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ADL4Eclipse="http:///schemas/ADL4Eclipse/_jDF0YNT6EeKj0Lzrn2trlQ/2" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_jDF0YNT6EeKj0Lzrn2trlQ/2 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_jDF0YdT6EeKj0Lzrn2trlQ http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+ <notation:Diagram xmi:id="_Py2DcFOFEeOuspyO4PzXCg" type="PapyrusUMLClassDiagram" name="PackageDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_QS7RsFOFEeOuspyO4PzXCg" type="2007" fontName="Segoe UI" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QS-VAFOFEeOuspyO4PzXCg" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QS-8EFOFEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>
@@ -90,6 +90,9 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RZtTkVOFEeOuspyO4PzXCg" x="255" y="415"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_Py2DcVOFEeOuspyO4PzXCg"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_XdKJ4LXUEeOXiJT1xTrETA">
+ <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#//@viewpoints.0/@modelKinds.1"/>
+ </styles>
<element xmi:type="uml:Model" href="papyrusNewChild.uml#_a0QCwFOCEeOE6bh9v5dYKg"/>
<edges xmi:type="notation:Connector" xmi:id="_T6YgkFOFEeOuspyO4PzXCg" type="4006" source="_Qoi8YFOFEeOuspyO4PzXCg" target="_QS7RsFOFEeOuspyO4PzXCg" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_T6aVwFOFEeOuspyO4PzXCg" type="6014">
@@ -137,7 +140,7 @@ </axis>
<axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_hb3vo1OFEeOuspyO4PzXCg">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</axis>
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_hb3vpFOFEeOuspyO4PzXCg" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
@@ -403,7 +406,7 @@ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uB23AVW6EeOhVe6k7yzS3A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
<axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_DtL7DlW7EeOhVe6k7yzS3A">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</axis>
</columnAxisProvidersHistory>
<rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uB23AlW6EeOhVe6k7yzS3A" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
@@ -988,11 +991,11 @@ <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JXz5sFOFEeOuspyO4PzXCg"/>
<edges xmi:type="notation:Connector" xmi:id="_MEiRMFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__KF0AFgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ME-9IFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9IVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9IlgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9I1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9JFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9JVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiWQULXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiW3YLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiYFgLXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_MErbIlgQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_MErbI1gQEeOKQOyOw2l5lw" y="40"/>
@@ -1006,11 +1009,11 @@ </edges>
<edges xmi:type="notation:Connector" xmi:id="_NJ26gFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__KYu8FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NKArgVgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArglgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArg1gQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhFgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhVgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhlgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YieMILXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YifaQLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YigBULXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_NJ26g1gQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_NJ26hFgQEeOKQOyOw2l5lw" y="40"/>
@@ -1025,11 +1028,11 @@ </edges>
<edges xmi:type="notation:Connector" xmi:id="_OCZsEVgQEeOKQOyOw2l5lw" type="4006" source="_2XR6kFgPEeOKQOyOw2l5lw" target="__Kif9lgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OCsnAFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnAVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnAlgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnA1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnBFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnBVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi0xcLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1_kLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi2moLXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_OCZsFFgQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_OCZsFVgQEeOKQOyOw2l5lw" y="40"/>
@@ -1043,11 +1046,11 @@ </edges>
<edges xmi:type="notation:Connector" xmi:id="_PEmv8VgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__K_L5lgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PEv541gQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55FgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55VgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55lgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv551gQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv56FgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yilg4LXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimH8LXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvALXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvAbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YinWELXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_PEmv9FgQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PEmv9VgQEeOKQOyOw2l5lw" y="40"/>
@@ -1063,11 +1066,11 @@ </edges>
<edges xmi:type="notation:Connector" xmi:id="_RArbEFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__K1a4FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RA1MEVgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MElgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1ME1gQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFFgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFVgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFlgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YitcsLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YitcsbXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiuq0LXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_RArbE1gQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_RArbFFgQEeOKQOyOw2l5lw" y="40"/>
@@ -1082,11 +1085,11 @@ </edges>
<edges xmi:type="notation:Connector" xmi:id="_VQC-gVgQEeOKQOyOw2l5lw" type="4006" source="_3CIOYFgPEeOKQOyOw2l5lw" target="__KYu8FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VQV5cFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5cVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5clgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5c1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5dFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5dVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8GMLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi9UULXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi97YLXUEeOXiJT1xTrETA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_VQC-hFgQEeOKQOyOw2l5lw" visible="false" type="6014">
<layoutConstraint xmi:type="notation:Location" xmi:id="_VQC-hVgQEeOKQOyOw2l5lw" y="40"/>
@@ -1100,4 +1103,184 @@ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VQMIcFgQEeOKQOyOw2l5lw" id="(0.6896551724137931,0.7547169811320755)"/>
</edges>
</notation:Diagram>
+ <notation:Diagram xmi:id="_v4laILXYEeOcibS9c7ohwg" type="PapyrusUMLComponentDiagram" name="NewComponentDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_zRtSELXYEeOcibS9c7ohwg" type="2002" fillColor="8047085">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zRvHQLXYEeOcibS9c7ohwg" type="5004"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zRvHQbXYEeOcibS9c7ohwg" type="7001">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zRvHQrXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zRvHQ7XYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zSHhwLXYEeOcibS9c7ohwg" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zSHhwbXYEeOcibS9c7ohwg" showTitle="true"/>
+ <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_sNbXALXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zSHhwrXYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zSII0LXYEeOcibS9c7ohwg" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zSII0bXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zSII0rXYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BCdFILXZEeOcibS9c7ohwg" type="3069">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BCdsMLXZEeOcibS9c7ohwg" type="5006">
+ <styles xmi:type="notation:StringListValueStyle" xmi:id="_PQ79ELXZEeOcibS9c7ohwg" name="maskLabel">
+ <stringListValue>name</stringListValue>
+ </styles>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BCdsMbXZEeOcibS9c7ohwg" x="-220" y="7"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_BCdsMrXZEeOcibS9c7ohwg" type="5007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BCeTQLXZEeOcibS9c7ohwg" x="25" y="-10"/>
+ </children>
+ <element xmi:type="uml:Port" href="papyrusNewChild.uml#_sfMccLXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BCdFIbXZEeOcibS9c7ohwg" x="-10" y="62"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Bm7EILXZEeOcibS9c7ohwg" type="3069">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Bm7EIrXZEeOcibS9c7ohwg" type="5006">
+ <styles xmi:type="notation:StringListValueStyle" xmi:id="_Nv1WsLXZEeOcibS9c7ohwg" name="maskLabel">
+ <stringListValue>name</stringListValue>
+ <stringListValue>conjugated</stringListValue>
+ </styles>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Bm7EI7XZEeOcibS9c7ohwg" x="-236" y="5"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Bm7rMLXZEeOcibS9c7ohwg" type="5007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Bm7rMbXZEeOcibS9c7ohwg" x="25" y="-10"/>
+ </children>
+ <element xmi:type="uml:Port" href="papyrusNewChild.uml#_sfKAMLXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bm7EIbXZEeOcibS9c7ohwg" x="-10"/>
+ </children>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_zRtSEbXYEeOcibS9c7ohwg"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_zRtSErXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Component" href="papyrusNewChild.uml#_sNQ-8LXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zRtSE7XYEeOcibS9c7ohwg" x="260" y="360" width="221" height="101"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_z2WQMLXYEeOcibS9c7ohwg" type="2002" fillColor="8047085">
+ <children xmi:type="notation:DecorationNode" xmi:id="_z2WQNLXYEeOcibS9c7ohwg" type="5004"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z2W3QLXYEeOcibS9c7ohwg" type="7001">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z2W3QbXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z2W3QrXYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z2bIsLXYEeOcibS9c7ohwg" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z2bIsbXYEeOcibS9c7ohwg" showTitle="true"/>
+ <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_sfPfwLXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z2bIsrXYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z2bIs7XYEeOcibS9c7ohwg" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z2bItLXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z2bItbXYEeOcibS9c7ohwg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3TH5ELXYEeOcibS9c7ohwg" type="3069">
+ <children xmi:type="notation:DecorationNode" xmi:id="_3TIgILXYEeOcibS9c7ohwg" type="5006">
+ <styles xmi:type="notation:StringListValueStyle" xmi:id="_MAYLQLXZEeOcibS9c7ohwg" name="maskLabel">
+ <stringListValue>name</stringListValue>
+ <stringListValue>derived</stringListValue>
+ <stringListValue>conjugated</stringListValue>
+ </styles>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3TIgIbXYEeOcibS9c7ohwg" x="29" y="-14"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_3TIgIrXYEeOcibS9c7ohwg" type="5007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3TJHMLXYEeOcibS9c7ohwg" x="25" y="-10"/>
+ </children>
+ <element xmi:type="uml:Port" href="papyrusNewChild.uml#_shil0LXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3TH5EbXYEeOcibS9c7ohwg" x="274" y="14"/>
+ </children>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_z2WQMbXYEeOcibS9c7ohwg"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_z2WQMrXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Component" href="papyrusNewChild.uml#_sfORoLXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z2WQM7XYEeOcibS9c7ohwg" x="580" y="360" width="341" height="101"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_38u2wLXYEeOcibS9c7ohwg" type="3204" fillColor="10011046">
+ <children xmi:type="notation:DecorationNode" xmi:id="_38vd0LXYEeOcibS9c7ohwg" type="5265"/>
+ <element xmi:type="uml:Port" href="papyrusNewChild.uml#_shjM4LXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_38u2wbXYEeOcibS9c7ohwg" x="1120" y="360"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_-iV40LXYEeOcibS9c7ohwg" type="2002" fillColor="10011046">
+ <children xmi:type="notation:DecorationNode" xmi:id="_-iWf4LXYEeOcibS9c7ohwg" type="5004"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_-iWf4bXYEeOcibS9c7ohwg" type="7001">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_-iWf4rXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iWf47XYEeOcibS9c7ohwg"/>
+ </children>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_-iV40bXYEeOcibS9c7ohwg"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_-iV40rXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Component" href="papyrusNewChild.uml#_sc59cbXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iV407XYEeOcibS9c7ohwg" x="300" y="120" width="281" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_C9o_cLXZEeOcibS9c7ohwg" type="2002" fillColor="10011046">
+ <children xmi:type="notation:DecorationNode" xmi:id="_C9pmgLXZEeOcibS9c7ohwg" type="5004"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_C9pmgbXZEeOcibS9c7ohwg" type="7001">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_C9pmgrXZEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C9pmg7XZEeOcibS9c7ohwg"/>
+ </children>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_C9o_cbXZEeOcibS9c7ohwg"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_C9o_crXZEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Component" href="papyrusNewChild.uml#_sSjuobXYEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C9o_c7XZEeOcibS9c7ohwg" x="100" y="120" width="161" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_TrqfILXdEeOcibS9c7ohwg" type="3201">
+ <children xmi:type="notation:DecorationNode" xmi:id="_TrsUULXdEeOcibS9c7ohwg" type="5255"/>
+ <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_MLB_QLXdEeOcibS9c7ohwg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TrqfIbXdEeOcibS9c7ohwg" x="700" y="-60"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_v4laIbXYEeOcibS9c7ohwg"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_v4laIrXYEeOcibS9c7ohwg">
+ <owner xmi:type="uml:Package" href="papyrusNewChild.uml#_JnbDAFOFEeOuspyO4PzXCg"/>
+ </styles>
+ <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JnbDAFOFEeOuspyO4PzXCg"/>
+ <edges xmi:type="notation:Connector" xmi:id="_1lwYULXYEeOcibS9c7ohwg" type="4010" source="_z2WQMLXYEeOcibS9c7ohwg" target="_zRtSELXYEeOcibS9c7ohwg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_1lw_YLXYEeOcibS9c7ohwg" visible="false" type="6009">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1lw_YbXYEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_1lxmcLXYEeOcibS9c7ohwg" visible="false" type="6023">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1lxmcbXYEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1lwYUbXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_shaqALXYEeOcibS9c7ohwg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1lwYUrXYEeOcibS9c7ohwg" points="[-142, -4, 401, 11]$[-443, -13, 100, 2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6iy6ELXYEeOcibS9c7ohwg" id="(0.0,0.5393258426966292)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6izhILXYEeOcibS9c7ohwg" id="(0.9049773755656109,0.594059405940594)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_39MJwLXYEeOcibS9c7ohwg" type="4010" source="_3TH5ELXYEeOcibS9c7ohwg" target="_38u2wLXYEeOcibS9c7ohwg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_39Mw0LXYEeOcibS9c7ohwg" visible="false" type="6009">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_39Mw0bXYEeOcibS9c7ohwg" x="29" y="27"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_39NX4LXYEeOcibS9c7ohwg" visible="false" type="6023">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_39NX4bXYEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_39MJwbXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_shjz8LXYEeOcibS9c7ohwg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_39MJwrXYEeOcibS9c7ohwg" points="[-10, -4, 1044, 384]$[-1054, -388, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4YHyQLXYEeOcibS9c7ohwg" id="(1.0,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4YHyQbXYEeOcibS9c7ohwg" id="(0.0,0.4)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_-id0oLXYEeOcibS9c7ohwg" type="4010" source="_zRtSELXYEeOcibS9c7ohwg" target="_-iV40LXYEeOcibS9c7ohwg" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_-id0o7XYEeOcibS9c7ohwg" visible="false" type="6009">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_-iebsLXYEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_-iebsbXYEeOcibS9c7ohwg" visible="false" type="6023">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_-iebsrXYEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_-id0obXYEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_sdZFoLXYEeOcibS9c7ohwg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-id0orXYEeOcibS9c7ohwg" points="[67, 0, 0, 179]$[67, -179, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-4wNsLXYEeOcibS9c7ohwg" id="(0.502262443438914,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-4wNsbXYEeOcibS9c7ohwg" id="(0.49122807017543857,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_C9wUMLXZEeOcibS9c7ohwg" type="4010" source="_zRtSELXYEeOcibS9c7ohwg" target="_C9o_cLXZEeOcibS9c7ohwg" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_C9w7QLXZEeOcibS9c7ohwg" visible="false" type="6009">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_C9w7QbXZEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_C9xiULXZEeOcibS9c7ohwg" visible="false" type="6023">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_C9xiUbXZEeOcibS9c7ohwg" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_C9wUMbXZEeOcibS9c7ohwg"/>
+ <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_sTm3gLXYEeOcibS9c7ohwg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C9wUMrXZEeOcibS9c7ohwg" points="[-33, -35, 349, 376]$[-382, -411, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DO68sLXZEeOcibS9c7ohwg" id="(0.2895927601809955,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DO68sbXZEeOcibS9c7ohwg" id="(0.7733333333333333,1.0)"/>
+ </edges>
+ </notation:Diagram>
+ <notation:Diagram xmi:id="_tJT7ALXZEeOcibS9c7ohwg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_tJT7AbXZEeOcibS9c7ohwg"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_tJT7ArXZEeOcibS9c7ohwg">
+ <owner xmi:type="uml:Package" href="papyrusNewChild.uml#_JnbDAFOFEeOuspyO4PzXCg"/>
+ </styles>
+ <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JnbDAFOFEeOuspyO4PzXCg"/>
+ </notation:Diagram>
</xmi:XMI>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml index 291c949fabb..f80d6c8f50b 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml +++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ADL4Eclipse="http:///schemas/ADL4Eclipse/_jDF0YNT6EeKj0Lzrn2trlQ/2" xmlns:ModuleLayer="http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_jDF0YNT6EeKj0Lzrn2trlQ/2 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_jDF0YdT6EeKj0Lzrn2trlQ http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3 pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">
<uml:Model xmi:id="_a0QCwFOCEeOE6bh9v5dYKg" name="PapyrusNewChild">
<packagedElement xmi:type="uml:Package" xmi:id="_IqDb0FOFEeOuspyO4PzXCg" name="Requirements">
<packagedElement xmi:type="uml:Class" xmi:id="_6Pfk0FOGEeOuspyO4PzXCg" name="AddNewChild"/>
@@ -8,16 +8,16 @@ <packagedElement xmi:type="uml:Class" xmi:id="_1sxP4FgNEeOKQOyOw2l5lw" name="newChildMenuDisplay"/>
<packagedElement xmi:type="uml:Class" xmi:id="_Dm5BYFgOEeOKQOyOw2l5lw" name="RoleAndElementCreation"/>
</packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_JXz5sFOFEeOuspyO4PzXCg" clientDependency="_T6P9sFOFEeOuspyO4PzXCg" name="UseCases">
+ <packagedElement xmi:type="uml:Package" xmi:id="_JXz5sFOFEeOuspyO4PzXCg" name="UseCases">
<packagedElement xmi:type="uml:Abstraction" xmi:id="_T6P9sFOFEeOuspyO4PzXCg" name="Abstraction1" client="_JXz5sFOFEeOuspyO4PzXCg" supplier="_IqDb0FOFEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Component" xmi:id="_uxF88FOIEeOuspyO4PzXCg" name="AddNewChild" useCase="_-bickFOIEeOuspyO4PzXCg _EPnUAFOJEeOuspyO4PzXCg _WZ_ZwFOJEeOuspyO4PzXCg _uSMlAFOJEeOuspyO4PzXCg _cXBM8FW6EeOhVe6k7yzS3A">
<ownedUseCase xmi:type="uml:UseCase" xmi:id="_-bickFOIEeOuspyO4PzXCg" name="UseCreateMenu" subject="_uxF88FOIEeOuspyO4PzXCg"/>
- <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EPnUAFOJEeOuspyO4PzXCg" clientDependency="_MEYgMFgQEeOKQOyOw2l5lw _NJtwkFgQEeOKQOyOw2l5lw _PEmv8FgQEeOKQOyOw2l5lw _RAhqEFgQEeOKQOyOw2l5lw" name="Create or modify ElementCreationModel" subject="_uxF88FOIEeOuspyO4PzXCg">
+ <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EPnUAFOJEeOuspyO4PzXCg" name="Create or modify ElementCreationModel" subject="_uxF88FOIEeOuspyO4PzXCg">
<extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_lYRLAVW6EeOhVe6k7yzS3A" name="point"/>
<include xmi:type="uml:Include" xmi:id="_aEB2oFW6EeOhVe6k7yzS3A" addition="_uSMlAFOJEeOuspyO4PzXCg"/>
</ownedUseCase>
- <ownedUseCase xmi:type="uml:UseCase" xmi:id="_WZ_ZwFOJEeOuspyO4PzXCg" clientDependency="_OCZsEFgQEeOKQOyOw2l5lw" name="Generate "ElementCreationModel" from a profile" subject="_uxF88FOIEeOuspyO4PzXCg"/>
- <ownedUseCase xmi:type="uml:UseCase" xmi:id="_uSMlAFOJEeOuspyO4PzXCg" clientDependency="_VQC-gFgQEeOKQOyOw2l5lw" name="Hide, change order or add submenus" subject="_uxF88FOIEeOuspyO4PzXCg"/>
+ <ownedUseCase xmi:type="uml:UseCase" xmi:id="_WZ_ZwFOJEeOuspyO4PzXCg" name="Generate "ElementCreationModel" from a profile" subject="_uxF88FOIEeOuspyO4PzXCg"/>
+ <ownedUseCase xmi:type="uml:UseCase" xmi:id="_uSMlAFOJEeOuspyO4PzXCg" name="Hide, change order or add submenus" subject="_uxF88FOIEeOuspyO4PzXCg"/>
<ownedUseCase xmi:type="uml:UseCase" xmi:id="_cXBM8FW6EeOhVe6k7yzS3A" name="Create or modify ElementCreationModel at runtime thanks to a GUI" subject="_uxF88FOIEeOuspyO4PzXCg">
<extend xmi:type="uml:Extend" xmi:id="_lX9pAFW6EeOhVe6k7yzS3A" extendedCase="_EPnUAFOJEeOuspyO4PzXCg" extensionLocation="_lYRLAVW6EeOhVe6k7yzS3A"/>
</ownedUseCase>
@@ -54,7 +54,6 @@ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmg4JlOJEeOuspyO4PzXCg" value="1"/>
</ownedEnd>
</packagedElement>
- <packagedElement xmi:type="uml:DataType" xmi:id="_kkQk4FgPEeOKQOyOw2l5lw" name="DataType"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_MEYgMFgQEeOKQOyOw2l5lw" name="Refine1" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_6Pfk0FOGEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_NJtwkFgQEeOKQOyOw2l5lw" name="Refine2" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_FQleQFOIEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_OCZsEFgQEeOKQOyOw2l5lw" name="Refine3" client="_WZ_ZwFOJEeOuspyO4PzXCg" supplier="_cj5MsFOIEeOuspyO4PzXCg"/>
@@ -62,24 +61,509 @@ <packagedElement xmi:type="uml:Abstraction" xmi:id="_RAhqEFgQEeOKQOyOw2l5lw" name="Refine5" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_1sxP4FgNEeOKQOyOw2l5lw"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_VQC-gFgQEeOKQOyOw2l5lw" name="Refine6" client="_uSMlAFOJEeOuspyO4PzXCg" supplier="_FQleQFOIEeOuspyO4PzXCg"/>
</packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_JnbDAFOFEeOuspyO4PzXCg" clientDependency="_UqVW0FOFEeOuspyO4PzXCg" name="Design">
+ <packagedElement xmi:type="uml:Package" xmi:id="_JnbDAFOFEeOuspyO4PzXCg" name="Design">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_MLB_QLXdEeOcibS9c7ohwg">
+ <body>The system is done by two plugins:
+• org.eclipse.papyrus.infra.newchild
+It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:
+o instantiate a CreationMenuFactory, 
+o ask to get all Root model and populate it
+CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);
+ ArrayList<Folder> folders= creationMenuRegistry.getRootFolder();
+ Iterator<Folder> iterFolder= folders.iterator();
+ while (iterFolder.hasNext()) {
+ Folder currentFolder= iterFolder.next();
+ creationMenuFactory.populateMenu(menu, currentFolder,eObject);
+}
+• org.eclipse.papyrus.views.modelexplorer.newchild
+It has in charge to add menu in the model explorer of papyrus.
+
+
+This the structure of EMF model for model
+• CreationMenu
+o It correspond to a menu
+o The ElemenTypeIDRef correspond a reference to the element Type.
+o The role can be filled in order to specify the role play by the element.
+o If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;
+• Folder
+o It is possible to add owns label an icon.
+</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_XUpYALXdEeOcibS9c7ohwg">
+ <body>example of model menu.
+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ElementCreationMenuModel="http://ElementCreationMenuModel"
+ xsi:schemaLocation="http://ElementCreationMenuModel ../../../org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore"
+ label="SimpleUMLTest">
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Package"
+ icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/O.gif"
+ elementTypeIdRef="org.eclipse.papyrus.uml.Package"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Class"
+ elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>
+ <menu xsi:type="ElementCreationMenuModel:Folder"
+ label="ElementWithFeature">
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="NestedClass"
+ icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/M.gif"
+ elementTypeIdRef="org.eclipse.papyrus.uml.Class"
+ role="nestedClassifier"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Integer"
+ elementTypeIdRef="org.eclipse.papyrus.uml.LiteralInteger"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="MyActivity"<!--display role-->
+ icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/O.gif"
+ elementTypeIdRef="org.eclipse.papyrus.uml.Activity"/>
+ </menu>
+</ElementCreationMenuModel:Folder>
+</body>
+ </ownedComment>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_UqVW0FOFEeOuspyO4PzXCg" name="Abstraction1" client="_JnbDAFOFEeOuspyO4PzXCg" supplier="_JXz5sFOFEeOuspyO4PzXCg"/>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sNQ-8LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild">
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_sfKAMLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.generated_package"/>
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_sfMccLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.extension_parser"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sR0HwLXYEeOcibS9c7ohwg" name="org.eclipse.ui" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sRhM0LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sSQzsLXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sR5AQLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sSe2ILXYEeOcibS9c7ohwg" name="org.eclipse.emf" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sSVsMLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sTm3gLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sSjuobXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_scqs4LXYEeOcibS9c7ohwg" name="org.eclipse.osgi" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sTrI8LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sc4IQLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xmi" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_scsiEbXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sdZFoLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sc59cbXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sdnvILXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sda60LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sd4N0LXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sdpkULXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_seQBQLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sd6qELXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_semmkLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_seSdgLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_se0pALXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_sNQ-8LXYEeOcibS9c7ohwg" supplier="_sepC0LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_se9y8LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_se_oILXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfBdULXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfDSgLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sfL1YLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.generated_package" client="_sfKAMLXYEeOcibS9c7ohwg" supplier="_sfLOULXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sfNqkLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.extension_parser" client="_sfMccLXYEeOcibS9c7ohwg" supplier="_sfNDgLXYEeOcibS9c7ohwg"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sRhM0LXYEeOcibS9c7ohwg" name="org.eclipse.ui">
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_shjM4LXYEeOcibS9c7ohwg" name="org.eclipse.ui.menus"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sRsL8LXYEeOcibS9c7ohwg" name="org.eclipse.ui.internal"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sR5AQLXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sSCKMLXYEeOcibS9c7ohwg" name="org.eclipse.core.internal.preferences.legacy"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sSHCsLXYEeOcibS9c7ohwg" name="org.eclipse.core.internal.runtime"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sSL7MLXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sSVsMLXYEeOcibS9c7ohwg" name="org.eclipse.emf"/>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sSjuobXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore">
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_sfLOULXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.generated_package"/>
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_sfNDgLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.extension_parser"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sSs4kLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sSxxELXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sS2CgLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.plugin"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sS6T8LXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.resource"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sS-lYLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.resource.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTC20LXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTHvULXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.namespace"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTMAwLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.namespace.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTQSMLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.namespace.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTVKsLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.type"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTZcILXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.type.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTdtkLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.type.internal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sTh_ALXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xml.type.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sTrI8LXYEeOcibS9c7ohwg" name="org.eclipse.osgi">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sT0S4LXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime.adaptor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sT4kULXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime.internal.adaptor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sT81wLXYEeOcibS9c7ohwg" name="org.eclipse.equinox.log"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUBHMLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.container"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUExkLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.container.builders"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUJDALXYEeOcibS9c7ohwg" name="org.eclipse.osgi.container.namespaces"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUNUcLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.framework.console"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sURl4LXYEeOcibS9c7ohwg" name="org.eclipse.osgi.framework.eventmgr"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUVQQLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.framework.internal.reliablefile"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUY6oLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.framework.log"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUfoULXYEeOcibS9c7ohwg" name="org.eclipse.osgi.framework.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUjSsLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.debug"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUm9ELXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.framework"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUrOgLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.hookregistry"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUuR0bXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.loader"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sUyjQLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.loader.buddy"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sU2NoLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.loader.classpath"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sU54ALXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.loader.sources"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sU9iYLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.location"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVBz0LXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.messages"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVFeMLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.provisional.service.security"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVJIkLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.provisional.verifier"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVML4bXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.service.security"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVP2QLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.serviceregistry"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVTgoLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.signedcontent"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVXLALXYEeOcibS9c7ohwg" name="org.eclipse.osgi.internal.url"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVbccLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.launch"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVfG0LXYEeOcibS9c7ohwg" name="org.eclipse.osgi.report.resolution"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVixMLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.datalocation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVnCoLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.debug"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVqtALXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.environment"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVuXYLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.localization"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sVyBwLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.pluginconversion"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sV2TMLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.resolver"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sV59kLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.runnable"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sV9n8LXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.security"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWB5YLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.service.urlconversion"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWFjwLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.signedcontent"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWInELXYEeOcibS9c7ohwg" name="org.eclipse.osgi.storage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWMRcLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.storage.bundlefile"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWP70LXYEeOcibS9c7ohwg" name="org.eclipse.osgi.storage.url.reference"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWTmMLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.storagemanager"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWX3oLXYEeOcibS9c7ohwg" name="org.eclipse.osgi.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWbiALXYEeOcibS9c7ohwg" name="org.osgi.dto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWfzcLXYEeOcibS9c7ohwg" name="org.osgi.framework"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWjd0LXYEeOcibS9c7ohwg" name="org.osgi.framework.dto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWnvQLXYEeOcibS9c7ohwg" name="org.osgi.framework.hooks.bundle"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWrZoLXYEeOcibS9c7ohwg" name="org.osgi.framework.hooks.resolver"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWwSILXYEeOcibS9c7ohwg" name="org.osgi.framework.hooks.service"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sWz8gLXYEeOcibS9c7ohwg" name="org.osgi.framework.hooks.weaving"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sW3m4LXYEeOcibS9c7ohwg" name="org.osgi.framework.launch"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sW74ULXYEeOcibS9c7ohwg" name="org.osgi.framework.namespace"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sW_isLXYEeOcibS9c7ohwg" name="org.osgi.framework.startlevel"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXDNELXYEeOcibS9c7ohwg" name="org.osgi.framework.startlevel.dto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXGQYLXYEeOcibS9c7ohwg" name="org.osgi.framework.wiring"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXJTsLXYEeOcibS9c7ohwg" name="org.osgi.framework.wiring.dto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXMXALXYEeOcibS9c7ohwg" name="org.osgi.resource"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXPaULXYEeOcibS9c7ohwg" name="org.osgi.resource.dto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXSdoLXYEeOcibS9c7ohwg" name="org.osgi.service.condpermadmin"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXWIALXYEeOcibS9c7ohwg" name="org.osgi.service.log"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXZyYLXYEeOcibS9c7ohwg" name="org.osgi.service.packageadmin"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXc1sLXYEeOcibS9c7ohwg" name="org.osgi.service.permissionadmin"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXhHILXYEeOcibS9c7ohwg" name="org.osgi.service.resolver"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXkxgLXYEeOcibS9c7ohwg" name="org.osgi.service.startlevel"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXob4LXYEeOcibS9c7ohwg" name="org.osgi.service.url"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXsGQLXYEeOcibS9c7ohwg" name="org.osgi.util.tracker"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXwXsLXYEeOcibS9c7ohwg" name="javax.accessibility"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sXzbALXYEeOcibS9c7ohwg" name="javax.activation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sX3FYLXYEeOcibS9c7ohwg" name="javax.activity"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sX6vwLXYEeOcibS9c7ohwg" name="javax.annotation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sX9zELXYEeOcibS9c7ohwg" name="javax.annotation.processing"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYBdcLXYEeOcibS9c7ohwg" name="javax.crypto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYEgwLXYEeOcibS9c7ohwg" name="javax.crypto.interfaces"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYHkEbXYEeOcibS9c7ohwg" name="javax.crypto.spec"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYLOcLXYEeOcibS9c7ohwg" name="javax.imageio"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYORwLXYEeOcibS9c7ohwg" name="javax.imageio.event"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYRVELXYEeOcibS9c7ohwg" name="javax.imageio.metadata"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYUYYLXYEeOcibS9c7ohwg" name="javax.imageio.plugins.bmp"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYXbsLXYEeOcibS9c7ohwg" name="javax.imageio.plugins.jpeg"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYZ38LXYEeOcibS9c7ohwg" name="javax.imageio.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYcUMbXYEeOcibS9c7ohwg" name="javax.imageio.stream"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYewcbXYEeOcibS9c7ohwg" name="javax.jws"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYhzwLXYEeOcibS9c7ohwg" name="javax.jws.soap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYkQALXYEeOcibS9c7ohwg" name="javax.lang.model"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYmsQLXYEeOcibS9c7ohwg" name="javax.lang.model.element"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYpIgbXYEeOcibS9c7ohwg" name="javax.lang.model.type"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYrkwLXYEeOcibS9c7ohwg" name="javax.lang.model.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYtZ8bXYEeOcibS9c7ohwg" name="javax.management"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYv2MLXYEeOcibS9c7ohwg" name="javax.management.loading"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sYxrYbXYEeOcibS9c7ohwg" name="javax.management.modelmbean"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY0HoLXYEeOcibS9c7ohwg" name="javax.management.monitor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY180bXYEeOcibS9c7ohwg" name="javax.management.openmbean"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY4ZELXYEeOcibS9c7ohwg" name="javax.management.relation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY6OQbXYEeOcibS9c7ohwg" name="javax.management.remote"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY8qgLXYEeOcibS9c7ohwg" name="javax.management.remote.rmi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sY-fsbXYEeOcibS9c7ohwg" name="javax.management.timer"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZA78LXYEeOcibS9c7ohwg" name="javax.naming"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZCxILXYEeOcibS9c7ohwg" name="javax.naming.directory"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZFNYLXYEeOcibS9c7ohwg" name="javax.naming.event"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZHpoLXYEeOcibS9c7ohwg" name="javax.naming.ldap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZJe0LXYEeOcibS9c7ohwg" name="javax.naming.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZL7ELXYEeOcibS9c7ohwg" name="javax.net"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZNwQbXYEeOcibS9c7ohwg" name="javax.net.ssl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZQMgLXYEeOcibS9c7ohwg" name="javax.print"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZSBsLXYEeOcibS9c7ohwg" name="javax.print.attribute"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZT24bXYEeOcibS9c7ohwg" name="javax.print.attribute.standard"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZWTILXYEeOcibS9c7ohwg" name="javax.print.event"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZYIULXYEeOcibS9c7ohwg" name="javax.rmi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZZ9gbXYEeOcibS9c7ohwg" name="javax.rmi.CORBA"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZcZwLXYEeOcibS9c7ohwg" name="javax.rmi.ssl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZeO8bXYEeOcibS9c7ohwg" name="javax.script"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZgrMLXYEeOcibS9c7ohwg" name="javax.security.auth"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZigYbXYEeOcibS9c7ohwg" name="javax.security.auth.callback"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZkVkbXYEeOcibS9c7ohwg" name="javax.security.auth.kerberos"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZmx0LXYEeOcibS9c7ohwg" name="javax.security.auth.login"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZonALXYEeOcibS9c7ohwg" name="javax.security.auth.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZqcMbXYEeOcibS9c7ohwg" name="javax.security.auth.x500"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZsRYbXYEeOcibS9c7ohwg" name="javax.security.cert"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZutoLXYEeOcibS9c7ohwg" name="javax.security.sasl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZwi0LXYEeOcibS9c7ohwg" name="javax.sound.midi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZyYALXYEeOcibS9c7ohwg" name="javax.sound.midi.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ0NMbXYEeOcibS9c7ohwg" name="javax.sound.sampled"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ2pcLXYEeOcibS9c7ohwg" name="javax.sound.sampled.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ4eoLXYEeOcibS9c7ohwg" name="javax.sql"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ6T0bXYEeOcibS9c7ohwg" name="javax.sql.rowset"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ8wELXYEeOcibS9c7ohwg" name="javax.sql.rowset.serial"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sZ-lQLXYEeOcibS9c7ohwg" name="javax.sql.rowset.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saAacbXYEeOcibS9c7ohwg" name="javax.swing"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saC2sLXYEeOcibS9c7ohwg" name="javax.swing.border"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saEr4LXYEeOcibS9c7ohwg" name="javax.swing.colorchooser"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saGhELXYEeOcibS9c7ohwg" name="javax.swing.event"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saIWQLXYEeOcibS9c7ohwg" name="javax.swing.filechooser"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saKLcbXYEeOcibS9c7ohwg" name="javax.swing.plaf"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saMAobXYEeOcibS9c7ohwg" name="javax.swing.plaf.basic"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saN10bXYEeOcibS9c7ohwg" name="javax.swing.plaf.metal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saQSELXYEeOcibS9c7ohwg" name="javax.swing.plaf.multi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saSHQLXYEeOcibS9c7ohwg" name="javax.swing.plaf.nimbus"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saT8cLXYEeOcibS9c7ohwg" name="javax.swing.plaf.synth"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saVxobXYEeOcibS9c7ohwg" name="javax.swing.table"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saYN4LXYEeOcibS9c7ohwg" name="javax.swing.text"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saaDELXYEeOcibS9c7ohwg" name="javax.swing.text.html"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sab4QLXYEeOcibS9c7ohwg" name="javax.swing.text.html.parser"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sadtcLXYEeOcibS9c7ohwg" name="javax.swing.text.rtf"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sae7kbXYEeOcibS9c7ohwg" name="javax.swing.tree"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sagwwbXYEeOcibS9c7ohwg" name="javax.swing.undo"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sail8LXYEeOcibS9c7ohwg" name="javax.tools"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sakbILXYEeOcibS9c7ohwg" name="javax.transaction"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_samQULXYEeOcibS9c7ohwg" name="javax.transaction.xa"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saoFgLXYEeOcibS9c7ohwg" name="javax.xml"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sap6sLXYEeOcibS9c7ohwg" name="javax.xml.bind"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sarI0bXYEeOcibS9c7ohwg" name="javax.xml.bind.annotation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sas-AbXYEeOcibS9c7ohwg" name="javax.xml.bind.annotation.adapters"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sauzMLXYEeOcibS9c7ohwg" name="javax.xml.bind.attachment"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sawoYLXYEeOcibS9c7ohwg" name="javax.xml.bind.helpers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_saydkLXYEeOcibS9c7ohwg" name="javax.xml.bind.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa0SwLXYEeOcibS9c7ohwg" name="javax.xml.crypto"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa2H8LXYEeOcibS9c7ohwg" name="javax.xml.crypto.dom"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa3WEbXYEeOcibS9c7ohwg" name="javax.xml.crypto.dsig"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa5LQbXYEeOcibS9c7ohwg" name="javax.xml.crypto.dsig.dom"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa7AcLXYEeOcibS9c7ohwg" name="javax.xml.crypto.dsig.keyinfo"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa81oLXYEeOcibS9c7ohwg" name="javax.xml.crypto.dsig.spec"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sa-q0LXYEeOcibS9c7ohwg" name="javax.xml.datatype"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbAgALXYEeOcibS9c7ohwg" name="javax.xml.namespace"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbCVMLXYEeOcibS9c7ohwg" name="javax.xml.parsers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbDjUbXYEeOcibS9c7ohwg" name="javax.xml.soap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbFYgLXYEeOcibS9c7ohwg" name="javax.xml.stream"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbHNsLXYEeOcibS9c7ohwg" name="javax.xml.stream.events"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbJC4LXYEeOcibS9c7ohwg" name="javax.xml.stream.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbK4ELXYEeOcibS9c7ohwg" name="javax.xml.transform"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbMtQLXYEeOcibS9c7ohwg" name="javax.xml.transform.dom"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbN7YbXYEeOcibS9c7ohwg" name="javax.xml.transform.sax"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbPwkLXYEeOcibS9c7ohwg" name="javax.xml.transform.stax"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbRlwLXYEeOcibS9c7ohwg" name="javax.xml.transform.stream"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbTa8LXYEeOcibS9c7ohwg" name="javax.xml.validation"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbUpEbXYEeOcibS9c7ohwg" name="javax.xml.ws"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbXFULXYEeOcibS9c7ohwg" name="javax.xml.ws.handler"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbYTcbXYEeOcibS9c7ohwg" name="javax.xml.ws.handler.soap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbaIoLXYEeOcibS9c7ohwg" name="javax.xml.ws.http"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbb90LXYEeOcibS9c7ohwg" name="javax.xml.ws.soap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbdzALXYEeOcibS9c7ohwg" name="javax.xml.ws.spi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbfBIbXYEeOcibS9c7ohwg" name="javax.xml.ws.spi.http"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbg2ULXYEeOcibS9c7ohwg" name="javax.xml.ws.wsaddressing"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbirgLXYEeOcibS9c7ohwg" name="javax.xml.xpath"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbj5obXYEeOcibS9c7ohwg" name="org.ietf.jgss"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sblu0LXYEeOcibS9c7ohwg" name="org.omg.CORBA"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbnkALXYEeOcibS9c7ohwg" name="org.omg.CORBA_2_3"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sboyIbXYEeOcibS9c7ohwg" name="org.omg.CORBA_2_3.portable"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbqnULXYEeOcibS9c7ohwg" name="org.omg.CORBA.DynAnyPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbscgLXYEeOcibS9c7ohwg" name="org.omg.CORBA.ORBPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbvf0LXYEeOcibS9c7ohwg" name="org.omg.CORBA.portable"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbwt8bXYEeOcibS9c7ohwg" name="org.omg.CORBA.TypeCodePackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sbyjILXYEeOcibS9c7ohwg" name="org.omg.CosNaming"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb0YULXYEeOcibS9c7ohwg" name="org.omg.CosNaming.NamingContextExtPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb1mcLXYEeOcibS9c7ohwg" name="org.omg.CosNaming.NamingContextPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb3boLXYEeOcibS9c7ohwg" name="org.omg.Dynamic"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb5Q0LXYEeOcibS9c7ohwg" name="org.omg.DynamicAny"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb6e8bXYEeOcibS9c7ohwg" name="org.omg.DynamicAny.DynAnyFactoryPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb8UILXYEeOcibS9c7ohwg" name="org.omg.DynamicAny.DynAnyPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb9iQbXYEeOcibS9c7ohwg" name="org.omg.IOP"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sb_XcLXYEeOcibS9c7ohwg" name="org.omg.IOP.CodecFactoryPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scAlkLXYEeOcibS9c7ohwg" name="org.omg.IOP.CodecPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scCawLXYEeOcibS9c7ohwg" name="org.omg.Messaging"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scDo4bXYEeOcibS9c7ohwg" name="org.omg.PortableInterceptor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scFeELXYEeOcibS9c7ohwg" name="org.omg.PortableInterceptor.ORBInitInfoPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scGsMbXYEeOcibS9c7ohwg" name="org.omg.PortableServer"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scIhYLXYEeOcibS9c7ohwg" name="org.omg.PortableServer.CurrentPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scJvgbXYEeOcibS9c7ohwg" name="org.omg.PortableServer.POAManagerPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scLksLXYEeOcibS9c7ohwg" name="org.omg.PortableServer.POAPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scMy0bXYEeOcibS9c7ohwg" name="org.omg.PortableServer.portable"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scOoALXYEeOcibS9c7ohwg" name="org.omg.PortableServer.ServantLocatorPackage"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scP2IbXYEeOcibS9c7ohwg" name="org.omg.SendingContext"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scRrULXYEeOcibS9c7ohwg" name="org.omg.stub.java.rmi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scTggLXYEeOcibS9c7ohwg" name="org.w3c.dom"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scUuobXYEeOcibS9c7ohwg" name="org.w3c.dom.bootstrap"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scWj0LXYEeOcibS9c7ohwg" name="org.w3c.dom.css"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scYZALXYEeOcibS9c7ohwg" name="org.w3c.dom.events"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scZnIbXYEeOcibS9c7ohwg" name="org.w3c.dom.html"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scbcULXYEeOcibS9c7ohwg" name="org.w3c.dom.ls"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scdRgLXYEeOcibS9c7ohwg" name="org.w3c.dom.ranges"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scefobXYEeOcibS9c7ohwg" name="org.w3c.dom.stylesheets"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scgU0LXYEeOcibS9c7ohwg" name="org.w3c.dom.traversal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sciKALXYEeOcibS9c7ohwg" name="org.w3c.dom.views"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scjYILXYEeOcibS9c7ohwg" name="org.w3c.dom.xpath"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sclNULXYEeOcibS9c7ohwg" name="org.xml.sax"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scmbcLXYEeOcibS9c7ohwg" name="org.xml.sax.ext"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_scoQoLXYEeOcibS9c7ohwg" name="org.xml.sax.helpers"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_scsiEbXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xmi">
+ <packagedElement xmi:type="uml:Package" xmi:id="_scyosLXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xmi"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sc0d4LXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xmi.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sc2TELXYEeOcibS9c7ohwg" name="org.eclipse.emf.ecore.xmi.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sc59cbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdAEELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdB5QLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.advices"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdDucLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.handler"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdE8kLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdGxwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdH_4bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdJ1ELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdLqQLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdM4YbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdOtkLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdQiwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.preferences"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdRw4bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.providers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdTmELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.semantic"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdVbQLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.types"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdWpYbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.extendedtypes.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sda60LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdgaYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdiPkbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdkEwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading.strategies"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdlS4bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.resourceloading.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sdpkULXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdvq8LXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdw5ELXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sdyuQLXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction.internal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sd0jcLXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction.internal.l10n"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sd2YoLXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sd6qELXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core">
+ <packagedElement xmi:type="uml:Package" xmi:id="_seAwsLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seDM8LXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.commands"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seFCILXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.edithelper"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seGQQbXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.internal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seIFcbXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.internal.descriptors"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seJ6oLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.internal.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seLv0bXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.internal.l10n"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seNlAbXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core.requests"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_seSdgLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit">
+ <packagedElement xmi:type="uml:Package" xmi:id="_seYkILXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seaZULXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.commands"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sebncLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.internal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sedcoLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.internal.context"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sefR0LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.internal.matcher"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sehHALXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.messages"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sei8MLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.service"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sekxYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit.utils"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sepC0LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.gmfdiag.commands">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sevJcLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.commands"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sew-oLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.commands.util"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_seyz0LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.commands.wrappers"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sfORoLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.views.modelexplorer.newchild">
+ <ownedAttribute xmi:type="uml:Port" xmi:id="_shil0LXYEeOcibS9c7ohwg" name="org.eclipse.ui.menus"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sfQG0LXYEeOcibS9c7ohwg" name="org.eclipse.ui" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sRhM0LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sfR8ALXYEeOcibS9c7ohwg" name="org.eclipse.core.runtime" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sR5AQLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sfTxMLXYEeOcibS9c7ohwg" name="org.eclipse.emf.transaction" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sdpkULXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sf9RcLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sfVmYLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sgTPsLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sf_tsLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sgom4LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sgVE4bXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_sgxJwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.log" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sgqcELXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shC2kLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sgy-8LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shErwLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.emf.type.core" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sd6qELXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shGg8LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.services.edit" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_seSdgLXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shW_oLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_shIWILXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shY00LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sepC0LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shaqALXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.newchild" client="_sfORoLXYEeOcibS9c7ohwg" supplier="_sNQ-8LXYEeOcibS9c7ohwg"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_shjz8LXYEeOcibS9c7ohwg" name="org.eclipse.ui.menus" client="_shil0LXYEeOcibS9c7ohwg" supplier="_shjM4LXYEeOcibS9c7ohwg"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sfVmYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfbtALXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfdiMLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.clipboard"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sffXYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.contentoutline"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfhMkLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.editor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfiasLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.editorsfactory"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfk28LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.extension"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfmsILXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.extension.commands"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfohUbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.extension.diagrameditor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfqWgLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.lifecycleevents"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfsLsLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.listenerservice"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfuA4LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.markers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfvPAbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.modelsetquery"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfxEMLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.modelsetquery.impl"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sfy5YLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sf0ukLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.resource"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sf2jwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.resource.additional"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sf4Y8LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.resource.sasheditor"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sf5nELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.services"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sf7cQLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.utils"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sf_tsLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgFNQLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgGbYbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.adapters"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgIQkLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.commands"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgJesbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.databinding"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgLT4LXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.dialog"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgMiAbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.providers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgOXMbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.providers.strategy"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgQMYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.resource"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgRagbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.emf.utils"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sgVE4bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgakcLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgcZoLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.command"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgdnwLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.element"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sge14bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.filter"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sggrELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.handlers"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgh5MbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.helper"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgjuYLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.helper.advice"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgk8gbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.menu"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgmxsLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.uml.service.types.utils"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sgqcELXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.log">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sgvUkLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.core.log"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_sgy-8LXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core">
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg4egLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.command"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg5sobXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.internal"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg7h0LXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.internal.command"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg8v8LXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.internal.l10n"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg9-EbXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.resources"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_sg_zQLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.service"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shBBYLXYEeOcibS9c7ohwg" name="org.eclipse.gmf.runtime.common.core.util"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Component" xmi:id="_shIWILXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools">
+ <packagedElement xmi:type="uml:Package" xmi:id="_shN1sLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.comparator"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shPD0bXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.converter"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shQ5ALXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.databinding"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shSHIbXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.preferences"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shT8ULXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.preferences.ui.dialog"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_shVKcLXYEeOcibS9c7ohwg" name="org.eclipse.papyrus.infra.tools.util"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sKh0ALXYEeOcibS9c7ohwg">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sMgxALXYEeOcibS9c7ohwg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_jDF0YdT6EeKj0Lzrn2trlQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
+ </profileApplication>
</packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_Nc3DgFOFEeOuspyO4PzXCg" clientDependency="_VkwXsFOFEeOuspyO4PzXCg" name="Tests">
+ <packagedElement xmi:type="uml:Package" xmi:id="_Nc3DgFOFEeOuspyO4PzXCg" name="Tests">
<packagedElement xmi:type="uml:Dependency" xmi:id="_VkwXsFOFEeOuspyO4PzXCg" name="Dependency1" client="_Nc3DgFOFEeOuspyO4PzXCg" supplier="_JXz5sFOFEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Package" xmi:id="_fMeMwFXeEeOW-JPqZK_EZg" name="Test AboutCreateModifyElementCreationModel">
- <packagedElement xmi:type="uml:UseCase" xmi:id="_HTgzkFXeEeOW-JPqZK_EZg" clientDependency="_VqMlQFXeEeOW-JPqZK_EZg" name="Create a model without nothing"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_KdZ8sFXeEeOW-JPqZK_EZg" clientDependency="_VIIaAFXeEeOW-JPqZK_EZg" name="createa model with only a root"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_M6gRQFXeEeOW-JPqZK_EZg" clientDependency="_TYirsFXeEeOW-JPqZK_EZg" name="create a model with elementType as String"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_HTgzkFXeEeOW-JPqZK_EZg" name="Create a model without nothing"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_KdZ8sFXeEeOW-JPqZK_EZg" name="createa model with only a root"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_M6gRQFXeEeOW-JPqZK_EZg" name="create a model with elementType as String"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_TYirsFXeEeOW-JPqZK_EZg" name="Usage4" client="_M6gRQFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_VIIaAFXeEeOW-JPqZK_EZg" name="Usage5" client="_KdZ8sFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_VqMlQFXeEeOW-JPqZK_EZg" name="Usage6" client="_HTgzkFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_lII58FXeEeOW-JPqZK_EZg" name="TestUseCreateMenu">
- <packagedElement xmi:type="uml:UseCase" xmi:id="_rxKR0FXdEeOW-JPqZK_EZg" clientDependency="_xpiacFXdEeOW-JPqZK_EZg" name="Use a menu from a model without ElementType model"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_rxKR0FXdEeOW-JPqZK_EZg" name="Use a menu from a model without ElementType model"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_xpiacFXdEeOW-JPqZK_EZg" name="Usage1" client="_rxKR0FXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_1vrJYFXdEeOW-JPqZK_EZg" clientDependency="_-0Vn0FXdEeOW-JPqZK_EZg" name="Use a menu with elementType model"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_4nRBkFXdEeOW-JPqZK_EZg" clientDependency="_9Yi_QFXdEeOW-JPqZK_EZg" name="Use a menu with stereotyped element"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_1vrJYFXdEeOW-JPqZK_EZg" name="Use a menu with elementType model"/>
+ <packagedElement xmi:type="uml:UseCase" xmi:id="_4nRBkFXdEeOW-JPqZK_EZg" name="Use a menu with stereotyped element"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_9Yi_QFXdEeOW-JPqZK_EZg" name="Usage2" client="_4nRBkFXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>
<packagedElement xmi:type="uml:Usage" xmi:id="_-0Vn0FXdEeOW-JPqZK_EZg" name="Usage3" client="_1vrJYFXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>
</packagedElement>
@@ -92,20 +576,427 @@ </profileApplication>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e5iVwFOFEeOuspyO4PzXCg">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e53s8FOFEeOuspyO4PzXCg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
</eAnnotations>
<appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
</profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-OWgLXWEeOnr8r0UtVlaQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L_ycwLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_jDF0YdT6EeKj0Lzrn2trlQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L_5xgLXWEeOnr8r0UtVlaQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MBnBsLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xHxUYDEEeKQG4TlBAn6bg"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_OKU8EHtxEeKcL-wrhM9ICg"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MBshQLXWEeOnr8r0UtVlaQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MDc0wLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>
+ </profileApplication>
</uml:Model>
<Requirements:Requirement xmi:id="_6Pfk0VOGEeOuspyO4PzXCg" text="Papyrus shall add in the menu new child for new customized elements by using extended type" id="newChild001" base_Class="_6Pfk0FOGEeOuspyO4PzXCg"/>
<Requirements:Requirement xmi:id="_FQleQVOIEeOuspyO4PzXCg" text="Papyrus shall not display all UML or SysML element creation" id="newChild002" base_Class="_FQleQFOIEeOuspyO4PzXCg"/>
<Requirements:Requirement xmi:id="_cj5MsVOIEeOuspyO4PzXCg" text="Papyrus shall add the creation of new element from a subset of profile" id="newChild003" base_Class="_cj5MsFOIEeOuspyO4PzXCg"/>
<Requirements:Requirement xmi:id="_1s7A4FgNEeOKQOyOw2l5lw" text="Papyrus shall be able to associated icons to folder or creation menu" id="newChild004" base_Class="_1sxP4FgNEeOKQOyOw2l5lw"/>
<Requirements:Requirement xmi:id="_Dm5BYVgOEeOKQOyOw2l5lw" text="When an element can created from several roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all role." id="newChild005" base_Class="_Dm5BYFgOEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_ME1MIFgQEeOKQOyOw2l5lw" base_Abstraction="_MEYgMFgQEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_NKArgFgQEeOKQOyOw2l5lw" base_Abstraction="_NJtwkFgQEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_OCi2AFgQEeOKQOyOw2l5lw" base_Abstraction="_OCZsEFgQEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_PEv54lgQEeOKQOyOw2l5lw" base_Abstraction="_PEmv8FgQEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_RA1MEFgQEeOKQOyOw2l5lw" base_Abstraction="_RAhqEFgQEeOKQOyOw2l5lw"/>
- <l2:Refine xmi:id="_VQMIcVgQEeOKQOyOw2l5lw" base_Abstraction="_VQC-gFgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_ME1MIFgQEeOKQOyOw2l5lw" base_Abstraction="_MEYgMFgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_NKArgFgQEeOKQOyOw2l5lw" base_Abstraction="_NJtwkFgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_OCi2AFgQEeOKQOyOw2l5lw" base_Abstraction="_OCZsEFgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_PEv54lgQEeOKQOyOw2l5lw" base_Abstraction="_PEmv8FgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_RA1MEFgQEeOKQOyOw2l5lw" base_Abstraction="_RAhqEFgQEeOKQOyOw2l5lw"/>
+ <standard:Refine xmi:id="_VQMIcVgQEeOKQOyOw2l5lw" base_Abstraction="_VQC-gFgQEeOKQOyOw2l5lw"/>
+ <ADL4Eclipse:Plugin xmi:id="_sNbXALXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.newchild.Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" exportPackage="_se_BELXYEeOcibS9c7ohwg _sfA2QLXYEeOcibS9c7ohwg _sfCrcLXYEeOcibS9c7ohwg _sfEgoLXYEeOcibS9c7ohwg" base_Component="_sNQ-8LXYEeOcibS9c7ohwg" name="Papyrus infra new child" isIncubation="true"/>
+ <ADL4Eclipse:Plugin xmi:id="_sRmFULXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.ui.internal.UIPlugin" classPath="." localization="plugin" requiredExecutionEnvironment="CDC-1.0/Foundation-1.0,J2SE-1.3" symbolicName="org.eclipse.ui" vendor="Eclipse.org" version="3.106.0.v20140303-1835" exportPackage="_sRwdYLXYEeOcibS9c7ohwg" base_Component="_sRhM0LXYEeOcibS9c7ohwg" name="Eclipse UI"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sRwdYLXYEeOcibS9c7ohwg" base_Package="_sRsL8LXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ModuleLayer:BundleReference xmi:id="_sR4ZMLXYEeOcibS9c7ohwg" base_Dependency="_sR0HwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sR9RsLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.core.internal.runtime.PlatformActivator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.core.runtime" vendor="Eclipse.org" version="3.10.0.v20140221-2027" exportPackage="_sSGboLXYEeOcibS9c7ohwg _sSLUILXYEeOcibS9c7ohwg _sSPlkLXYEeOcibS9c7ohwg" base_Component="_sR5AQLXYEeOcibS9c7ohwg" name="Core Runtime"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sSGboLXYEeOcibS9c7ohwg" base_Package="_sSCKMLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sSLUILXYEeOcibS9c7ohwg" base_Package="_sSHCsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sSPlkLXYEeOcibS9c7ohwg" atleast="3.4.0" base_Package="_sSL7MLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sSVFILXYEeOcibS9c7ohwg" base_Dependency="_sSQzsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sSZ9oLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" localization="plugin" symbolicName="org.eclipse.emf" vendor="Eclipse Modeling Project" version="2.6.0.v20140310-0546" base_Component="_sSVsMLXYEeOcibS9c7ohwg" name="EMF - Eclipse Modeling Framework Runtime and Tools" lazyStart="true"/>
+ <ModuleLayer:BundleReference xmi:id="_sSjuoLXYEeOcibS9c7ohwg" base_Dependency="_sSe2ILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sSoAELXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore" vendor="Eclipse Modeling Project" version="2.10.0.v20140303-1023" exportPackage="_sSxKALXYEeOcibS9c7ohwg _sS1bcLXYEeOcibS9c7ohwg _sS5s4LXYEeOcibS9c7ohwg _sS9-ULXYEeOcibS9c7ohwg _sTCPwLXYEeOcibS9c7ohwg _sTHIQLXYEeOcibS9c7ohwg _sTLZsLXYEeOcibS9c7ohwg _sTPrILXYEeOcibS9c7ohwg _sTUjoLXYEeOcibS9c7ohwg _sTY1ELXYEeOcibS9c7ohwg _sTdGgLXYEeOcibS9c7ohwg _sThX8LXYEeOcibS9c7ohwg _sTlpYLXYEeOcibS9c7ohwg" base_Component="_sSjuobXYEeOcibS9c7ohwg" name="EMF Ecore" lazyStart="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sSxKALXYEeOcibS9c7ohwg" base_Package="_sSs4kLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sS1bcLXYEeOcibS9c7ohwg" base_Package="_sSxxELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sS5s4LXYEeOcibS9c7ohwg" base_Package="_sS2CgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sS9-ULXYEeOcibS9c7ohwg" base_Package="_sS6T8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTCPwLXYEeOcibS9c7ohwg" base_Package="_sS-lYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTHIQLXYEeOcibS9c7ohwg" base_Package="_sTC20LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTLZsLXYEeOcibS9c7ohwg" base_Package="_sTHvULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTPrILXYEeOcibS9c7ohwg" base_Package="_sTMAwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTUjoLXYEeOcibS9c7ohwg" base_Package="_sTQSMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTY1ELXYEeOcibS9c7ohwg" base_Package="_sTVKsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTdGgLXYEeOcibS9c7ohwg" base_Package="_sTZcILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sThX8LXYEeOcibS9c7ohwg" base_Package="_sTdtkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sTlpYLXYEeOcibS9c7ohwg" base_Package="_sTh_ALXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sTqh4LXYEeOcibS9c7ohwg" base_Dependency="_sTm3gLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sTuzULXYEeOcibS9c7ohwg" activator="org.eclipse.osgi.internal.framework.SystemBundleActivator" copyright="Copyright (c) 2003, 2004 IBM Corporation and others. 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" description="OSGi System Bundle" docURL="http://www.eclipse.org" localization="systembundle" requiredExecutionEnvironment="JavaSE-1.6" symbolicName="org.eclipse.osgi" vendor="Eclipse.org - Equinox" version="3.10.0.v20140305-1523" exportPackage="_sT39QLXYEeOcibS9c7ohwg _sT8OsLXYEeOcibS9c7ohwg _sUAgILXYEeOcibS9c7ohwg _sUEKgLXYEeOcibS9c7ohwg _sUH04LXYEeOcibS9c7ohwg _sUMtYLXYEeOcibS9c7ohwg _sUQXwLXYEeOcibS9c7ohwg _sUUpMLXYEeOcibS9c7ohwg _sUYTkLXYEeOcibS9c7ohwg _sUfBQLXYEeOcibS9c7ohwg _sUiroLXYEeOcibS9c7ohwg _sUmWALXYEeOcibS9c7ohwg _sUqAYLXYEeOcibS9c7ohwg _sUuR0LXYEeOcibS9c7ohwg _sUxVILXYEeOcibS9c7ohwg _sU1mkLXYEeOcibS9c7ohwg _sU5Q8LXYEeOcibS9c7ohwg _sU87ULXYEeOcibS9c7ohwg _sVAlsLXYEeOcibS9c7ohwg _sVE3ILXYEeOcibS9c7ohwg _sVIhgLXYEeOcibS9c7ohwg _sVML4LXYEeOcibS9c7ohwg _sVPPMLXYEeOcibS9c7ohwg _sVS5kLXYEeOcibS9c7ohwg _sVWj8LXYEeOcibS9c7ohwg _sVa1YLXYEeOcibS9c7ohwg _sVefwLXYEeOcibS9c7ohwg _sViKILXYEeOcibS9c7ohwg _sVl0gLXYEeOcibS9c7ohwg _sVqF8LXYEeOcibS9c7ohwg _sVtwULXYEeOcibS9c7ohwg _sVxasLXYEeOcibS9c7ohwg _sV1FELXYEeOcibS9c7ohwg _sV5WgLXYEeOcibS9c7ohwg _sV9A4LXYEeOcibS9c7ohwg _sWBSULXYEeOcibS9c7ohwg _sWEVoLXYEeOcibS9c7ohwg _sWIAALXYEeOcibS9c7ohwg _sWLqYLXYEeOcibS9c7ohwg _sWPUwLXYEeOcibS9c7ohwg _sWS_ILXYEeOcibS9c7ohwg _sWWpgLXYEeOcibS9c7ohwg _sWa68LXYEeOcibS9c7ohwg _sWelULXYEeOcibS9c7ohwg _sWi2wLXYEeOcibS9c7ohwg _sWmhILXYEeOcibS9c7ohwg _sWqykLXYEeOcibS9c7ohwg _sWvrELXYEeOcibS9c7ohwg _sWzVcLXYEeOcibS9c7ohwg _sW2_0LXYEeOcibS9c7ohwg _sW6qMLXYEeOcibS9c7ohwg _sW-7oLXYEeOcibS9c7ohwg _sXB-8LXYEeOcibS9c7ohwg _sXFpULXYEeOcibS9c7ohwg _sXIsoLXYEeOcibS9c7ohwg _sXLv8LXYEeOcibS9c7ohwg _sXOzQLXYEeOcibS9c7ohwg _sXR2kLXYEeOcibS9c7ohwg _sXVg8LXYEeOcibS9c7ohwg _sXZLULXYEeOcibS9c7ohwg _sXcOoLXYEeOcibS9c7ohwg _sXggELXYEeOcibS9c7ohwg _sXkKcLXYEeOcibS9c7ohwg _sXn00LXYEeOcibS9c7ohwg _sXrfMLXYEeOcibS9c7ohwg _sXvJkLXYEeOcibS9c7ohwg _sXyz8LXYEeOcibS9c7ohwg _sX2eULXYEeOcibS9c7ohwg _sX6IsLXYEeOcibS9c7ohwg _sX9MALXYEeOcibS9c7ohwg _sYA2YLXYEeOcibS9c7ohwg _sYD5sLXYEeOcibS9c7ohwg _sYHkELXYEeOcibS9c7ohwg _sYKnYLXYEeOcibS9c7ohwg _sYNqsLXYEeOcibS9c7ohwg _sYQuALXYEeOcibS9c7ohwg _sYTxULXYEeOcibS9c7ohwg _sYW0oLXYEeOcibS9c7ohwg _sYZQ4LXYEeOcibS9c7ohwg _sYcUMLXYEeOcibS9c7ohwg _sYewcLXYEeOcibS9c7ohwg _sYhMsLXYEeOcibS9c7ohwg _sYjo8LXYEeOcibS9c7ohwg _sYmFMLXYEeOcibS9c7ohwg _sYpIgLXYEeOcibS9c7ohwg _sYq9sLXYEeOcibS9c7ohwg _sYtZ8LXYEeOcibS9c7ohwg _sYvPILXYEeOcibS9c7ohwg _sYxrYLXYEeOcibS9c7ohwg _sYzgkLXYEeOcibS9c7ohwg _sY180LXYEeOcibS9c7ohwg _sY3yALXYEeOcibS9c7ohwg _sY6OQLXYEeOcibS9c7ohwg _sY8DcLXYEeOcibS9c7ohwg _sY-fsLXYEeOcibS9c7ohwg _sZAU4LXYEeOcibS9c7ohwg _sZCKELXYEeOcibS9c7ohwg _sZEmULXYEeOcibS9c7ohwg _sZGbgLXYEeOcibS9c7ohwg _sZI3wLXYEeOcibS9c7ohwg _sZLUALXYEeOcibS9c7ohwg _sZNwQLXYEeOcibS9c7ohwg _sZPlcLXYEeOcibS9c7ohwg _sZRaoLXYEeOcibS9c7ohwg _sZT24LXYEeOcibS9c7ohwg _sZVsELXYEeOcibS9c7ohwg _sZXhQLXYEeOcibS9c7ohwg _sZZ9gLXYEeOcibS9c7ohwg _sZbysLXYEeOcibS9c7ohwg _sZeO8LXYEeOcibS9c7ohwg _sZgEILXYEeOcibS9c7ohwg _sZigYLXYEeOcibS9c7ohwg _sZkVkLXYEeOcibS9c7ohwg _sZmKwLXYEeOcibS9c7ohwg _sZn_8LXYEeOcibS9c7ohwg _sZqcMLXYEeOcibS9c7ohwg _sZsRYLXYEeOcibS9c7ohwg _sZuGkLXYEeOcibS9c7ohwg _sZv7wLXYEeOcibS9c7ohwg _sZxw8LXYEeOcibS9c7ohwg _sZ0NMLXYEeOcibS9c7ohwg _sZ2CYLXYEeOcibS9c7ohwg _sZ33kLXYEeOcibS9c7ohwg _sZ6T0LXYEeOcibS9c7ohwg _sZ8JALXYEeOcibS9c7ohwg _sZ9-MLXYEeOcibS9c7ohwg _saAacLXYEeOcibS9c7ohwg _saCPoLXYEeOcibS9c7ohwg _saEE0LXYEeOcibS9c7ohwg _saF6ALXYEeOcibS9c7ohwg _saHvMLXYEeOcibS9c7ohwg _saKLcLXYEeOcibS9c7ohwg _saMAoLXYEeOcibS9c7ohwg _saN10LXYEeOcibS9c7ohwg _saPrALXYEeOcibS9c7ohwg _saRgMLXYEeOcibS9c7ohwg _saTVYLXYEeOcibS9c7ohwg _saVxoLXYEeOcibS9c7ohwg _saXm0LXYEeOcibS9c7ohwg _saZcALXYEeOcibS9c7ohwg _sabRMLXYEeOcibS9c7ohwg _sadGYLXYEeOcibS9c7ohwg _sae7kLXYEeOcibS9c7ohwg _sagwwLXYEeOcibS9c7ohwg _sah-4LXYEeOcibS9c7ohwg _saj0ELXYEeOcibS9c7ohwg _salpQLXYEeOcibS9c7ohwg _sanecLXYEeOcibS9c7ohwg _sapToLXYEeOcibS9c7ohwg _sarI0LXYEeOcibS9c7ohwg _sas-ALXYEeOcibS9c7ohwg _sauMILXYEeOcibS9c7ohwg _sawBULXYEeOcibS9c7ohwg _sax2gLXYEeOcibS9c7ohwg _sazrsLXYEeOcibS9c7ohwg _sa1g4LXYEeOcibS9c7ohwg _sa3WELXYEeOcibS9c7ohwg _sa5LQLXYEeOcibS9c7ohwg _sa6ZYLXYEeOcibS9c7ohwg _sa8OkLXYEeOcibS9c7ohwg _sa-DwLXYEeOcibS9c7ohwg _sa_48LXYEeOcibS9c7ohwg _sbBuILXYEeOcibS9c7ohwg _sbDjULXYEeOcibS9c7ohwg _sbExcLXYEeOcibS9c7ohwg _sbGmoLXYEeOcibS9c7ohwg _sbIb0LXYEeOcibS9c7ohwg _sbKRALXYEeOcibS9c7ohwg _sbMGMLXYEeOcibS9c7ohwg _sbN7YLXYEeOcibS9c7ohwg _sbPJgLXYEeOcibS9c7ohwg _sbQ-sLXYEeOcibS9c7ohwg _sbSz4LXYEeOcibS9c7ohwg _sbUpELXYEeOcibS9c7ohwg _sbWeQLXYEeOcibS9c7ohwg _sbYTcLXYEeOcibS9c7ohwg _sbZhkLXYEeOcibS9c7ohwg _sbbWwLXYEeOcibS9c7ohwg _sbdL8LXYEeOcibS9c7ohwg _sbfBILXYEeOcibS9c7ohwg _sbgPQLXYEeOcibS9c7ohwg _sbiEcLXYEeOcibS9c7ohwg _sbj5oLXYEeOcibS9c7ohwg _sblHwLXYEeOcibS9c7ohwg _sbm88LXYEeOcibS9c7ohwg _sboyILXYEeOcibS9c7ohwg _sbqAQLXYEeOcibS9c7ohwg _sbr1cLXYEeOcibS9c7ohwg _sbu4wLXYEeOcibS9c7ohwg _sbwt8LXYEeOcibS9c7ohwg _sbx8ELXYEeOcibS9c7ohwg _sbzxQLXYEeOcibS9c7ohwg _sb0_YLXYEeOcibS9c7ohwg _sb20kLXYEeOcibS9c7ohwg _sb4pwLXYEeOcibS9c7ohwg _sb6e8LXYEeOcibS9c7ohwg _sb7tELXYEeOcibS9c7ohwg _sb9iQLXYEeOcibS9c7ohwg _sb-wYLXYEeOcibS9c7ohwg _sb_-gLXYEeOcibS9c7ohwg _scBzsLXYEeOcibS9c7ohwg _scDo4LXYEeOcibS9c7ohwg _scE3ALXYEeOcibS9c7ohwg _scGsMLXYEeOcibS9c7ohwg _scH6ULXYEeOcibS9c7ohwg _scJvgLXYEeOcibS9c7ohwg _scK9oLXYEeOcibS9c7ohwg _scMy0LXYEeOcibS9c7ohwg _scOA8LXYEeOcibS9c7ohwg _scP2ILXYEeOcibS9c7ohwg _scREQLXYEeOcibS9c7ohwg _scS5cLXYEeOcibS9c7ohwg _scUuoLXYEeOcibS9c7ohwg _scV8wLXYEeOcibS9c7ohwg _scXx8LXYEeOcibS9c7ohwg _scZnILXYEeOcibS9c7ohwg _sca1QLXYEeOcibS9c7ohwg _sccqcLXYEeOcibS9c7ohwg _scefoLXYEeOcibS9c7ohwg _scftwLXYEeOcibS9c7ohwg _schi8LXYEeOcibS9c7ohwg _scixELXYEeOcibS9c7ohwg _sckmQLXYEeOcibS9c7ohwg _scl0YLXYEeOcibS9c7ohwg _scnpkLXYEeOcibS9c7ohwg _scpewLXYEeOcibS9c7ohwg" base_Component="_sTrI8LXYEeOcibS9c7ohwg" name="OSGi System Bundle"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sT39QLXYEeOcibS9c7ohwg" base_Package="_sT0S4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sT8OsLXYEeOcibS9c7ohwg" base_Package="_sT4kULXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUAgILXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sT81wLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUEKgLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sUBHMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUH04LXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sUExkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUMtYLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sUJDALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUQXwLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sUNUcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUUpMLXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sURl4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUYTkLXYEeOcibS9c7ohwg" base_Package="_sUVQQLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUfBQLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sUY6oLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUiroLXYEeOcibS9c7ohwg" base_Package="_sUfoULXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUmWALXYEeOcibS9c7ohwg" base_Package="_sUjSsLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUqAYLXYEeOcibS9c7ohwg" base_Package="_sUm9ELXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUuR0LXYEeOcibS9c7ohwg" base_Package="_sUrOgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sUxVILXYEeOcibS9c7ohwg" base_Package="_sUuR0bXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sU1mkLXYEeOcibS9c7ohwg" base_Package="_sUyjQLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sU5Q8LXYEeOcibS9c7ohwg" base_Package="_sU2NoLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sU87ULXYEeOcibS9c7ohwg" base_Package="_sU54ALXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVAlsLXYEeOcibS9c7ohwg" base_Package="_sU9iYLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVE3ILXYEeOcibS9c7ohwg" base_Package="_sVBz0LXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVIhgLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sVFeMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVML4LXYEeOcibS9c7ohwg" base_Package="_sVJIkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVPPMLXYEeOcibS9c7ohwg" base_Package="_sVML4bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVS5kLXYEeOcibS9c7ohwg" base_Package="_sVP2QLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVWj8LXYEeOcibS9c7ohwg" base_Package="_sVTgoLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVa1YLXYEeOcibS9c7ohwg" base_Package="_sVXLALXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVefwLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sVbccLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sViKILXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sVfG0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVl0gLXYEeOcibS9c7ohwg" atleast="1.3.0" base_Package="_sVixMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVqF8LXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sVnCoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVtwULXYEeOcibS9c7ohwg" atleast="1.3.0" base_Package="_sVqtALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sVxasLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sVuXYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sV1FELXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sVyBwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sV5WgLXYEeOcibS9c7ohwg" atleast="1.6.0" base_Package="_sV2TMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sV9A4LXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sV59kLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWBSULXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sV9n8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWEVoLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sWB5YLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWIAALXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sWFjwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWLqYLXYEeOcibS9c7ohwg" base_Package="_sWInELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWPUwLXYEeOcibS9c7ohwg" base_Package="_sWMRcLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWS_ILXYEeOcibS9c7ohwg" base_Package="_sWP70LXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWWpgLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sWTmMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWa68LXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sWX3oLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWelULXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sWbiALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWi2wLXYEeOcibS9c7ohwg" atleast="1.8.0" base_Package="_sWfzcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWmhILXYEeOcibS9c7ohwg" atleast="1.8.0" base_Package="_sWjd0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWqykLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sWnvQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWvrELXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sWrZoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sWzVcLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sWwSILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sW2_0LXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sWz8gLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sW6qMLXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sW3m4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sW-7oLXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sW74ULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXB-8LXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sW_isLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXFpULXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sXDNELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXIsoLXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sXGQYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXLv8LXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sXJTsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXOzQLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sXMXALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXR2kLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sXPaULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXVg8LXYEeOcibS9c7ohwg" atleast="1.1.1" base_Package="_sXSdoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXZLULXYEeOcibS9c7ohwg" atleast="1.3.0" base_Package="_sXWIALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXcOoLXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sXZyYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXggELXYEeOcibS9c7ohwg" atleast="1.2.0" base_Package="_sXc1sLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXkKcLXYEeOcibS9c7ohwg" atleast="1.0.1" base_Package="_sXhHILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXn00LXYEeOcibS9c7ohwg" atleast="1.1.0" base_Package="_sXkxgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXrfMLXYEeOcibS9c7ohwg" atleast="1.0.0" base_Package="_sXob4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXvJkLXYEeOcibS9c7ohwg" atleast="1.5.1" base_Package="_sXsGQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sXyz8LXYEeOcibS9c7ohwg" base_Package="_sXwXsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sX2eULXYEeOcibS9c7ohwg" base_Package="_sXzbALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sX6IsLXYEeOcibS9c7ohwg" base_Package="_sX3FYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sX9MALXYEeOcibS9c7ohwg" base_Package="_sX6vwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYA2YLXYEeOcibS9c7ohwg" base_Package="_sX9zELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYD5sLXYEeOcibS9c7ohwg" base_Package="_sYBdcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYHkELXYEeOcibS9c7ohwg" base_Package="_sYEgwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYKnYLXYEeOcibS9c7ohwg" base_Package="_sYHkEbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYNqsLXYEeOcibS9c7ohwg" base_Package="_sYLOcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYQuALXYEeOcibS9c7ohwg" base_Package="_sYORwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYTxULXYEeOcibS9c7ohwg" base_Package="_sYRVELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYW0oLXYEeOcibS9c7ohwg" base_Package="_sYUYYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYZQ4LXYEeOcibS9c7ohwg" base_Package="_sYXbsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYcUMLXYEeOcibS9c7ohwg" base_Package="_sYZ38LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYewcLXYEeOcibS9c7ohwg" base_Package="_sYcUMbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYhMsLXYEeOcibS9c7ohwg" base_Package="_sYewcbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYjo8LXYEeOcibS9c7ohwg" base_Package="_sYhzwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYmFMLXYEeOcibS9c7ohwg" base_Package="_sYkQALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYpIgLXYEeOcibS9c7ohwg" base_Package="_sYmsQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYq9sLXYEeOcibS9c7ohwg" base_Package="_sYpIgbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYtZ8LXYEeOcibS9c7ohwg" base_Package="_sYrkwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYvPILXYEeOcibS9c7ohwg" base_Package="_sYtZ8bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYxrYLXYEeOcibS9c7ohwg" base_Package="_sYv2MLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sYzgkLXYEeOcibS9c7ohwg" base_Package="_sYxrYbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sY180LXYEeOcibS9c7ohwg" base_Package="_sY0HoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sY3yALXYEeOcibS9c7ohwg" base_Package="_sY180bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sY6OQLXYEeOcibS9c7ohwg" base_Package="_sY4ZELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sY8DcLXYEeOcibS9c7ohwg" base_Package="_sY6OQbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sY-fsLXYEeOcibS9c7ohwg" base_Package="_sY8qgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZAU4LXYEeOcibS9c7ohwg" base_Package="_sY-fsbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZCKELXYEeOcibS9c7ohwg" base_Package="_sZA78LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZEmULXYEeOcibS9c7ohwg" base_Package="_sZCxILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZGbgLXYEeOcibS9c7ohwg" base_Package="_sZFNYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZI3wLXYEeOcibS9c7ohwg" base_Package="_sZHpoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZLUALXYEeOcibS9c7ohwg" base_Package="_sZJe0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZNwQLXYEeOcibS9c7ohwg" base_Package="_sZL7ELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZPlcLXYEeOcibS9c7ohwg" base_Package="_sZNwQbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZRaoLXYEeOcibS9c7ohwg" base_Package="_sZQMgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZT24LXYEeOcibS9c7ohwg" base_Package="_sZSBsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZVsELXYEeOcibS9c7ohwg" base_Package="_sZT24bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZXhQLXYEeOcibS9c7ohwg" base_Package="_sZWTILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZZ9gLXYEeOcibS9c7ohwg" base_Package="_sZYIULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZbysLXYEeOcibS9c7ohwg" base_Package="_sZZ9gbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZeO8LXYEeOcibS9c7ohwg" base_Package="_sZcZwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZgEILXYEeOcibS9c7ohwg" base_Package="_sZeO8bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZigYLXYEeOcibS9c7ohwg" base_Package="_sZgrMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZkVkLXYEeOcibS9c7ohwg" base_Package="_sZigYbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZmKwLXYEeOcibS9c7ohwg" base_Package="_sZkVkbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZn_8LXYEeOcibS9c7ohwg" base_Package="_sZmx0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZqcMLXYEeOcibS9c7ohwg" base_Package="_sZonALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZsRYLXYEeOcibS9c7ohwg" base_Package="_sZqcMbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZuGkLXYEeOcibS9c7ohwg" base_Package="_sZsRYbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZv7wLXYEeOcibS9c7ohwg" base_Package="_sZutoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZxw8LXYEeOcibS9c7ohwg" base_Package="_sZwi0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ0NMLXYEeOcibS9c7ohwg" base_Package="_sZyYALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ2CYLXYEeOcibS9c7ohwg" base_Package="_sZ0NMbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ33kLXYEeOcibS9c7ohwg" base_Package="_sZ2pcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ6T0LXYEeOcibS9c7ohwg" base_Package="_sZ4eoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ8JALXYEeOcibS9c7ohwg" base_Package="_sZ6T0bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sZ9-MLXYEeOcibS9c7ohwg" base_Package="_sZ8wELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saAacLXYEeOcibS9c7ohwg" base_Package="_sZ-lQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saCPoLXYEeOcibS9c7ohwg" base_Package="_saAacbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saEE0LXYEeOcibS9c7ohwg" base_Package="_saC2sLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saF6ALXYEeOcibS9c7ohwg" base_Package="_saEr4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saHvMLXYEeOcibS9c7ohwg" base_Package="_saGhELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saKLcLXYEeOcibS9c7ohwg" base_Package="_saIWQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saMAoLXYEeOcibS9c7ohwg" base_Package="_saKLcbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saN10LXYEeOcibS9c7ohwg" base_Package="_saMAobXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saPrALXYEeOcibS9c7ohwg" base_Package="_saN10bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saRgMLXYEeOcibS9c7ohwg" base_Package="_saQSELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saTVYLXYEeOcibS9c7ohwg" base_Package="_saSHQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saVxoLXYEeOcibS9c7ohwg" base_Package="_saT8cLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saXm0LXYEeOcibS9c7ohwg" base_Package="_saVxobXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saZcALXYEeOcibS9c7ohwg" base_Package="_saYN4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sabRMLXYEeOcibS9c7ohwg" base_Package="_saaDELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sadGYLXYEeOcibS9c7ohwg" base_Package="_sab4QLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sae7kLXYEeOcibS9c7ohwg" base_Package="_sadtcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sagwwLXYEeOcibS9c7ohwg" base_Package="_sae7kbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sah-4LXYEeOcibS9c7ohwg" base_Package="_sagwwbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_saj0ELXYEeOcibS9c7ohwg" base_Package="_sail8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_salpQLXYEeOcibS9c7ohwg" base_Package="_sakbILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sanecLXYEeOcibS9c7ohwg" base_Package="_samQULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sapToLXYEeOcibS9c7ohwg" base_Package="_saoFgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sarI0LXYEeOcibS9c7ohwg" base_Package="_sap6sLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sas-ALXYEeOcibS9c7ohwg" base_Package="_sarI0bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sauMILXYEeOcibS9c7ohwg" base_Package="_sas-AbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sawBULXYEeOcibS9c7ohwg" base_Package="_sauzMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sax2gLXYEeOcibS9c7ohwg" base_Package="_sawoYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sazrsLXYEeOcibS9c7ohwg" base_Package="_saydkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa1g4LXYEeOcibS9c7ohwg" base_Package="_sa0SwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa3WELXYEeOcibS9c7ohwg" base_Package="_sa2H8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa5LQLXYEeOcibS9c7ohwg" base_Package="_sa3WEbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa6ZYLXYEeOcibS9c7ohwg" base_Package="_sa5LQbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa8OkLXYEeOcibS9c7ohwg" base_Package="_sa7AcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa-DwLXYEeOcibS9c7ohwg" base_Package="_sa81oLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sa_48LXYEeOcibS9c7ohwg" base_Package="_sa-q0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbBuILXYEeOcibS9c7ohwg" base_Package="_sbAgALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbDjULXYEeOcibS9c7ohwg" base_Package="_sbCVMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbExcLXYEeOcibS9c7ohwg" base_Package="_sbDjUbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbGmoLXYEeOcibS9c7ohwg" base_Package="_sbFYgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbIb0LXYEeOcibS9c7ohwg" base_Package="_sbHNsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbKRALXYEeOcibS9c7ohwg" base_Package="_sbJC4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbMGMLXYEeOcibS9c7ohwg" base_Package="_sbK4ELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbN7YLXYEeOcibS9c7ohwg" base_Package="_sbMtQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbPJgLXYEeOcibS9c7ohwg" base_Package="_sbN7YbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbQ-sLXYEeOcibS9c7ohwg" base_Package="_sbPwkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbSz4LXYEeOcibS9c7ohwg" base_Package="_sbRlwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbUpELXYEeOcibS9c7ohwg" base_Package="_sbTa8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbWeQLXYEeOcibS9c7ohwg" base_Package="_sbUpEbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbYTcLXYEeOcibS9c7ohwg" base_Package="_sbXFULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbZhkLXYEeOcibS9c7ohwg" base_Package="_sbYTcbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbbWwLXYEeOcibS9c7ohwg" base_Package="_sbaIoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbdL8LXYEeOcibS9c7ohwg" base_Package="_sbb90LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbfBILXYEeOcibS9c7ohwg" base_Package="_sbdzALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbgPQLXYEeOcibS9c7ohwg" base_Package="_sbfBIbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbiEcLXYEeOcibS9c7ohwg" base_Package="_sbg2ULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbj5oLXYEeOcibS9c7ohwg" base_Package="_sbirgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sblHwLXYEeOcibS9c7ohwg" base_Package="_sbj5obXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbm88LXYEeOcibS9c7ohwg" base_Package="_sblu0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sboyILXYEeOcibS9c7ohwg" base_Package="_sbnkALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbqAQLXYEeOcibS9c7ohwg" base_Package="_sboyIbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbr1cLXYEeOcibS9c7ohwg" base_Package="_sbqnULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbu4wLXYEeOcibS9c7ohwg" base_Package="_sbscgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbwt8LXYEeOcibS9c7ohwg" base_Package="_sbvf0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbx8ELXYEeOcibS9c7ohwg" base_Package="_sbwt8bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sbzxQLXYEeOcibS9c7ohwg" base_Package="_sbyjILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb0_YLXYEeOcibS9c7ohwg" base_Package="_sb0YULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb20kLXYEeOcibS9c7ohwg" base_Package="_sb1mcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb4pwLXYEeOcibS9c7ohwg" base_Package="_sb3boLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb6e8LXYEeOcibS9c7ohwg" base_Package="_sb5Q0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb7tELXYEeOcibS9c7ohwg" base_Package="_sb6e8bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb9iQLXYEeOcibS9c7ohwg" base_Package="_sb8UILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb-wYLXYEeOcibS9c7ohwg" base_Package="_sb9iQbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sb_-gLXYEeOcibS9c7ohwg" base_Package="_sb_XcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scBzsLXYEeOcibS9c7ohwg" base_Package="_scAlkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scDo4LXYEeOcibS9c7ohwg" base_Package="_scCawLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scE3ALXYEeOcibS9c7ohwg" base_Package="_scDo4bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scGsMLXYEeOcibS9c7ohwg" base_Package="_scFeELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scH6ULXYEeOcibS9c7ohwg" base_Package="_scGsMbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scJvgLXYEeOcibS9c7ohwg" base_Package="_scIhYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scK9oLXYEeOcibS9c7ohwg" base_Package="_scJvgbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scMy0LXYEeOcibS9c7ohwg" base_Package="_scLksLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scOA8LXYEeOcibS9c7ohwg" base_Package="_scMy0bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scP2ILXYEeOcibS9c7ohwg" base_Package="_scOoALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scREQLXYEeOcibS9c7ohwg" base_Package="_scP2IbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scS5cLXYEeOcibS9c7ohwg" base_Package="_scRrULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scUuoLXYEeOcibS9c7ohwg" base_Package="_scTggLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scV8wLXYEeOcibS9c7ohwg" base_Package="_scUuobXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scXx8LXYEeOcibS9c7ohwg" base_Package="_scWj0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scZnILXYEeOcibS9c7ohwg" base_Package="_scYZALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sca1QLXYEeOcibS9c7ohwg" base_Package="_scZnIbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sccqcLXYEeOcibS9c7ohwg" base_Package="_scbcULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scefoLXYEeOcibS9c7ohwg" base_Package="_scdRgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scftwLXYEeOcibS9c7ohwg" base_Package="_scefobXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_schi8LXYEeOcibS9c7ohwg" base_Package="_scgU0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scixELXYEeOcibS9c7ohwg" base_Package="_sciKALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sckmQLXYEeOcibS9c7ohwg" base_Package="_scjYILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scl0YLXYEeOcibS9c7ohwg" base_Package="_sclNULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scnpkLXYEeOcibS9c7ohwg" base_Package="_scmbcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scpewLXYEeOcibS9c7ohwg" base_Package="_scoQoLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_scsiELXYEeOcibS9c7ohwg" base_Dependency="_scqs4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sctwMLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.xmi.XMIPlugin$Implementation" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore.xmi" vendor="Eclipse Modeling Project" version="2.10.0.v20140303-1023" exportPackage="_scz20LXYEeOcibS9c7ohwg _sc1sALXYEeOcibS9c7ohwg _sc3hMLXYEeOcibS9c7ohwg" base_Component="_scsiEbXYEeOcibS9c7ohwg" name="EMF XML/XMI Persistence" lazyStart="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_scz20LXYEeOcibS9c7ohwg" base_Package="_scyosLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sc1sALXYEeOcibS9c7ohwg" base_Package="_sc0d4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sc3hMLXYEeOcibS9c7ohwg" base_Package="_sc2TELXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sc59cLXYEeOcibS9c7ohwg" base_Dependency="_sc4IQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sc7yoLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.extendedtypes.Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.extendedtypes" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" exportPackage="_sdBSMLXYEeOcibS9c7ohwg _sdDHYLXYEeOcibS9c7ohwg _sdEVgLXYEeOcibS9c7ohwg _sdGKsLXYEeOcibS9c7ohwg _sdH_4LXYEeOcibS9c7ohwg _sdJOALXYEeOcibS9c7ohwg _sdLDMLXYEeOcibS9c7ohwg _sdM4YLXYEeOcibS9c7ohwg _sdOGgLXYEeOcibS9c7ohwg _sdP7sLXYEeOcibS9c7ohwg _sdRw4LXYEeOcibS9c7ohwg _sdS_ALXYEeOcibS9c7ohwg _sdU0MLXYEeOcibS9c7ohwg _sdWpYLXYEeOcibS9c7ohwg _sdX3gLXYEeOcibS9c7ohwg" base_Component="_sc59cbXYEeOcibS9c7ohwg" name="Papyrus enhanced types metamodel plugin" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdBSMLXYEeOcibS9c7ohwg" base_Package="_sdAEELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdDHYLXYEeOcibS9c7ohwg" base_Package="_sdB5QLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdEVgLXYEeOcibS9c7ohwg" base_Package="_sdDucLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdGKsLXYEeOcibS9c7ohwg" base_Package="_sdE8kLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdH_4LXYEeOcibS9c7ohwg" base_Package="_sdGxwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdJOALXYEeOcibS9c7ohwg" base_Package="_sdH_4bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdLDMLXYEeOcibS9c7ohwg" base_Package="_sdJ1ELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdM4YLXYEeOcibS9c7ohwg" base_Package="_sdLqQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdOGgLXYEeOcibS9c7ohwg" base_Package="_sdM4YbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdP7sLXYEeOcibS9c7ohwg" base_Package="_sdOtkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdRw4LXYEeOcibS9c7ohwg" base_Package="_sdQiwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdS_ALXYEeOcibS9c7ohwg" base_Package="_sdRw4bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdU0MLXYEeOcibS9c7ohwg" base_Package="_sdTmELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdWpYLXYEeOcibS9c7ohwg" base_Package="_sdVbQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdX3gLXYEeOcibS9c7ohwg" base_Package="_sdWpYbXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sdaTwLXYEeOcibS9c7ohwg" base_Dependency="_sdZFoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sdcI8LXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.resourceloading.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.resourceloading" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_sdiPkLXYEeOcibS9c7ohwg _sdjdsLXYEeOcibS9c7ohwg _sdlS4LXYEeOcibS9c7ohwg _sdmhALXYEeOcibS9c7ohwg" base_Component="_sda60LXYEeOcibS9c7ohwg" name="Papyrus Resource Loading" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdiPkLXYEeOcibS9c7ohwg" base_Package="_sdgaYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdjdsLXYEeOcibS9c7ohwg" base_Package="_sdiPkbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdlS4LXYEeOcibS9c7ohwg" base_Package="_sdkEwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdmhALXYEeOcibS9c7ohwg" base_Package="_sdlS4bXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sdo9QLXYEeOcibS9c7ohwg" base_Dependency="_sdnvILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sdqycLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.emf.transaction.internal.EMFTransactionPlugin$Implementation" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.transaction" vendor="Eclipse Modeling Project" version="1.8.0.201403111732" exportPackage="_sdwSALXYEeOcibS9c7ohwg _sdyHMLXYEeOcibS9c7ohwg _sdz8YLXYEeOcibS9c7ohwg _sd1xkLXYEeOcibS9c7ohwg _sd3mwLXYEeOcibS9c7ohwg" base_Component="_sdpkULXYEeOcibS9c7ohwg" name="EMF Model Transaction Core" lazyStart="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdwSALXYEeOcibS9c7ohwg" base_Package="_sdvq8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdyHMLXYEeOcibS9c7ohwg" base_Package="_sdw5ELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sdz8YLXYEeOcibS9c7ohwg" base_Package="_sdyuQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sd1xkLXYEeOcibS9c7ohwg" base_Package="_sd0jcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sd3mwLXYEeOcibS9c7ohwg" base_Package="_sd2YoLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sd6DALXYEeOcibS9c7ohwg" base_Dependency="_sd4N0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sd74MLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.emf.type.core" vendor="Eclipse Modeling Project" version="1.7.0.201403111830" exportPackage="_seB-0LXYEeOcibS9c7ohwg _seEbELXYEeOcibS9c7ohwg _seGQQLXYEeOcibS9c7ohwg _seIFcLXYEeOcibS9c7ohwg _seJTkLXYEeOcibS9c7ohwg _seLv0LXYEeOcibS9c7ohwg _seNlALXYEeOcibS9c7ohwg _sePaMLXYEeOcibS9c7ohwg" base_Component="_sd6qELXYEeOcibS9c7ohwg" name="GMF EMF Type Core"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seB-0LXYEeOcibS9c7ohwg" base_Package="_seAwsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seEbELXYEeOcibS9c7ohwg" base_Package="_seDM8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seGQQLXYEeOcibS9c7ohwg" base_Package="_seFCILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seIFcLXYEeOcibS9c7ohwg" base_Package="_seGQQbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seJTkLXYEeOcibS9c7ohwg" base_Package="_seIFcbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seLv0LXYEeOcibS9c7ohwg" base_Package="_seJ6oLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seNlALXYEeOcibS9c7ohwg" base_Package="_seLv0bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sePaMLXYEeOcibS9c7ohwg" base_Package="_seNlAbXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_seR2cLXYEeOcibS9c7ohwg" base_Dependency="_seQBQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_seTroLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.edit.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.edit" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_seZyQLXYEeOcibS9c7ohwg _sebAYLXYEeOcibS9c7ohwg _sec1kLXYEeOcibS9c7ohwg _seeqwLXYEeOcibS9c7ohwg _segf8LXYEeOcibS9c7ohwg _seiVILXYEeOcibS9c7ohwg _sekKULXYEeOcibS9c7ohwg _sel_gLXYEeOcibS9c7ohwg" base_Component="_seSdgLXYEeOcibS9c7ohwg" name="Papyrus Edit Service" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seZyQLXYEeOcibS9c7ohwg" base_Package="_seYkILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sebAYLXYEeOcibS9c7ohwg" base_Package="_seaZULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sec1kLXYEeOcibS9c7ohwg" base_Package="_sebncLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seeqwLXYEeOcibS9c7ohwg" base_Package="_sedcoLXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_segf8LXYEeOcibS9c7ohwg" base_Package="_sefR0LXYEeOcibS9c7ohwg" isInternal="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seiVILXYEeOcibS9c7ohwg" base_Package="_sehHALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sekKULXYEeOcibS9c7ohwg" base_Package="_sei8MLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sel_gLXYEeOcibS9c7ohwg" base_Package="_sekxYLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_seobwLXYEeOcibS9c7ohwg" base_Dependency="_semmkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_seqQ8LXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.commands.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.gmfdiag.commands" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_sewXkLXYEeOcibS9c7ohwg _seyMwLXYEeOcibS9c7ohwg _se0B8LXYEeOcibS9c7ohwg" base_Component="_sepC0LXYEeOcibS9c7ohwg" name="Papyrus Commands Tools" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sewXkLXYEeOcibS9c7ohwg" base_Package="_sevJcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_seyMwLXYEeOcibS9c7ohwg" base_Package="_sew-oLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_se0B8LXYEeOcibS9c7ohwg" base_Package="_seyz0LXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_se13ILXYEeOcibS9c7ohwg" base_Dependency="_se0pALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_se_BELXYEeOcibS9c7ohwg" base_Package="_se9y8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfA2QLXYEeOcibS9c7ohwg" base_Package="_se_oILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfCrcLXYEeOcibS9c7ohwg" base_Package="_sfBdULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfEgoLXYEeOcibS9c7ohwg" base_Package="_sfDSgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sfPfwLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.views.modelexplorer.newchild.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.views.modelexplorer.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" base_Component="_sfORoLXYEeOcibS9c7ohwg" name="Papyrus view model explorer new child" isIncubation="true"/>
+ <ModuleLayer:BundleReference xmi:id="_sfRU8LXYEeOcibS9c7ohwg" base_Dependency="_sfQG0LXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sfTKILXYEeOcibS9c7ohwg" base_Dependency="_sfR8ALXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sfU_ULXYEeOcibS9c7ohwg" base_Dependency="_sfTxMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sfW0gLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.Activator" localization="plugin" requiredExecutionEnvironment="JavaSE-1.6" symbolicName="org.eclipse.papyrus.infra.core" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_sfc7ILXYEeOcibS9c7ohwg _sfewULXYEeOcibS9c7ohwg _sfglgLXYEeOcibS9c7ohwg _sfhzoLXYEeOcibS9c7ohwg _sfkP4LXYEeOcibS9c7ohwg _sfmFELXYEeOcibS9c7ohwg _sfohULXYEeOcibS9c7ohwg _sfpvcLXYEeOcibS9c7ohwg _sfrkoLXYEeOcibS9c7ohwg _sftZ0LXYEeOcibS9c7ohwg _sfvPALXYEeOcibS9c7ohwg _sfwdILXYEeOcibS9c7ohwg _sfySULXYEeOcibS9c7ohwg _sf0HgLXYEeOcibS9c7ohwg _sf18sLXYEeOcibS9c7ohwg _sf3x4LXYEeOcibS9c7ohwg _sf5AALXYEeOcibS9c7ohwg _sf61MLXYEeOcibS9c7ohwg _sf8qYLXYEeOcibS9c7ohwg" base_Component="_sfVmYLXYEeOcibS9c7ohwg" name="Papyrus Backbone" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfc7ILXYEeOcibS9c7ohwg" base_Package="_sfbtALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfewULXYEeOcibS9c7ohwg" base_Package="_sfdiMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfglgLXYEeOcibS9c7ohwg" base_Package="_sffXYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfhzoLXYEeOcibS9c7ohwg" base_Package="_sfhMkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfkP4LXYEeOcibS9c7ohwg" base_Package="_sfiasLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfmFELXYEeOcibS9c7ohwg" base_Package="_sfk28LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfohULXYEeOcibS9c7ohwg" base_Package="_sfmsILXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfpvcLXYEeOcibS9c7ohwg" base_Package="_sfohUbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfrkoLXYEeOcibS9c7ohwg" base_Package="_sfqWgLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sftZ0LXYEeOcibS9c7ohwg" base_Package="_sfsLsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfvPALXYEeOcibS9c7ohwg" base_Package="_sfuA4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfwdILXYEeOcibS9c7ohwg" base_Package="_sfvPAbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sfySULXYEeOcibS9c7ohwg" base_Package="_sfxEMLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf0HgLXYEeOcibS9c7ohwg" base_Package="_sfy5YLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf18sLXYEeOcibS9c7ohwg" base_Package="_sf0ukLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf3x4LXYEeOcibS9c7ohwg" base_Package="_sf2jwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf5AALXYEeOcibS9c7ohwg" base_Package="_sf4Y8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf61MLXYEeOcibS9c7ohwg" base_Package="_sf5nELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sf8qYLXYEeOcibS9c7ohwg" base_Package="_sf7cQLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sf_GoLXYEeOcibS9c7ohwg" base_Dependency="_sf9RcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sgA70LXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.emf.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.emf" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" exportPackage="_sgGbYLXYEeOcibS9c7ohwg _sgHpgLXYEeOcibS9c7ohwg _sgJesLXYEeOcibS9c7ohwg _sgKs0LXYEeOcibS9c7ohwg _sgMiALXYEeOcibS9c7ohwg _sgOXMLXYEeOcibS9c7ohwg _sgPlULXYEeOcibS9c7ohwg _sgRagLXYEeOcibS9c7ohwg _sgSooLXYEeOcibS9c7ohwg" base_Component="_sf_tsLXYEeOcibS9c7ohwg" name="EMF Tools" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgGbYLXYEeOcibS9c7ohwg" base_Package="_sgFNQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgHpgLXYEeOcibS9c7ohwg" base_Package="_sgGbYbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgJesLXYEeOcibS9c7ohwg" base_Package="_sgIQkLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgKs0LXYEeOcibS9c7ohwg" base_Package="_sgJesbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgMiALXYEeOcibS9c7ohwg" base_Package="_sgLT4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgOXMLXYEeOcibS9c7ohwg" base_Package="_sgMiAbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgPlULXYEeOcibS9c7ohwg" base_Package="_sgOXMbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgRagLXYEeOcibS9c7ohwg" base_Package="_sgQMYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgSooLXYEeOcibS9c7ohwg" base_Package="_sgRagbXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sgVE4LXYEeOcibS9c7ohwg" base_Dependency="_sgTPsLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sgWTALXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.uml.service.types.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.uml.service.types" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_sgbykLXYEeOcibS9c7ohwg _sgdAsLXYEeOcibS9c7ohwg _sge14LXYEeOcibS9c7ohwg _sggEALXYEeOcibS9c7ohwg _sgh5MLXYEeOcibS9c7ohwg _sgjHULXYEeOcibS9c7ohwg _sgk8gLXYEeOcibS9c7ohwg _sgmKoLXYEeOcibS9c7ohwg _sgn_0LXYEeOcibS9c7ohwg" base_Component="_sgVE4bXYEeOcibS9c7ohwg" name="Papyrus UML ElementType Service" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgbykLXYEeOcibS9c7ohwg" base_Package="_sgakcLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgdAsLXYEeOcibS9c7ohwg" base_Package="_sgcZoLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sge14LXYEeOcibS9c7ohwg" base_Package="_sgdnwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sggEALXYEeOcibS9c7ohwg" base_Package="_sge14bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgh5MLXYEeOcibS9c7ohwg" base_Package="_sggrELXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgjHULXYEeOcibS9c7ohwg" base_Package="_sgh5MbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgk8gLXYEeOcibS9c7ohwg" base_Package="_sgjuYLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgmKoLXYEeOcibS9c7ohwg" base_Package="_sgk8gbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgn_0LXYEeOcibS9c7ohwg" base_Package="_sgmxsLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sgp1ALXYEeOcibS9c7ohwg" base_Dependency="_sgom4LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sgrqMLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.log.internal.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.core.log" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_sgwisLXYEeOcibS9c7ohwg" base_Component="_sgqcELXYEeOcibS9c7ohwg" name="Papyrus Logging plugin" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sgwisLXYEeOcibS9c7ohwg" base_Package="_sgvUkLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_sgyX4LXYEeOcibS9c7ohwg" base_Dependency="_sgxJwLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_sg0NELXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.common.core" vendor="Eclipse Modeling Project" version="1.7.0.201403111830" exportPackage="_sg5soLXYEeOcibS9c7ohwg _sg66wLXYEeOcibS9c7ohwg _sg8I4LXYEeOcibS9c7ohwg _sg9-ELXYEeOcibS9c7ohwg _sg_MMLXYEeOcibS9c7ohwg _shAaULXYEeOcibS9c7ohwg _shCPgLXYEeOcibS9c7ohwg" base_Component="_sgy-8LXYEeOcibS9c7ohwg" name="GMF Common Core"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sg5soLXYEeOcibS9c7ohwg" base_Package="_sg4egLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sg66wLXYEeOcibS9c7ohwg" base_Package="_sg5sobXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sg8I4LXYEeOcibS9c7ohwg" base_Package="_sg7h0LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sg9-ELXYEeOcibS9c7ohwg" base_Package="_sg8v8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_sg_MMLXYEeOcibS9c7ohwg" base_Package="_sg9-EbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shAaULXYEeOcibS9c7ohwg" base_Package="_sg_zQLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shCPgLXYEeOcibS9c7ohwg" base_Package="_shBBYLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shEEsLXYEeOcibS9c7ohwg" base_Dependency="_shC2kLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shF54LXYEeOcibS9c7ohwg" base_Dependency="_shErwLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shHvELXYEeOcibS9c7ohwg" base_Dependency="_shGg8LXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:Plugin xmi:id="_shI9MLXYEeOcibS9c7ohwg" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.tools.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.tools" vendor="Eclipse Modeling Project" version="1.0.0.v201403271326" exportPackage="_shPD0LXYEeOcibS9c7ohwg _shQR8LXYEeOcibS9c7ohwg _shSHILXYEeOcibS9c7ohwg _shTVQLXYEeOcibS9c7ohwg _shUjYLXYEeOcibS9c7ohwg _shWYkLXYEeOcibS9c7ohwg" base_Component="_shIWILXYEeOcibS9c7ohwg" name="Papyrus Tools" isIncubation="true"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shPD0LXYEeOcibS9c7ohwg" base_Package="_shN1sLXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shQR8LXYEeOcibS9c7ohwg" base_Package="_shPD0bXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shSHILXYEeOcibS9c7ohwg" base_Package="_shQ5ALXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shTVQLXYEeOcibS9c7ohwg" base_Package="_shSHIbXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shUjYLXYEeOcibS9c7ohwg" base_Package="_shT8ULXYEeOcibS9c7ohwg"/>
+ <ADL4Eclipse:EclipseExportedPackage xmi:id="_shWYkLXYEeOcibS9c7ohwg" base_Package="_shVKcLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shYNwLXYEeOcibS9c7ohwg" base_Dependency="_shW_oLXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shaC8LXYEeOcibS9c7ohwg" base_Dependency="_shY00LXYEeOcibS9c7ohwg"/>
+ <ModuleLayer:BundleReference xmi:id="_shb4ILXYEeOcibS9c7ohwg" base_Dependency="_shaqALXYEeOcibS9c7ohwg"/>
</xmi:XMI>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handlers/ControlCommandHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handlers/ControlCommandHandler.java index 877ba90940e..59e96bb777c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handlers/ControlCommandHandler.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handlers/ControlCommandHandler.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2013 Atos, CEA LIST, and others.
+ * Copyright (c) 2013, 2014 Atos, CEA LIST, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -10,6 +10,7 @@ * Contributors:
* Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation
* Christian W. Damus (CEA LIST) - pluggable providers of fragment-resource selection dialogs
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.infra.services.controlmode.handlers;
@@ -92,9 +93,9 @@ public class ControlCommandHandler extends AbstractModelExplorerHandler { }
}
if(defaultName == null) {
- LabelHelper.getPrettyLabel(eObject);
- Pattern p = Pattern.compile("<<.*>>");
- defaultName = p.matcher(defaultName).replaceAll("");
+ defaultName = LabelHelper.getPrettyLabel(eObject);
+ Pattern p = Pattern.compile("<<.*?>>|<.*?>");
+ defaultName = p.matcher(defaultName).replaceAll("").trim();
}
StringBuilder b = new StringBuilder();
for(Character c : defaultName.toCharArray()) {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/util/LabelHelper.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/util/LabelHelper.java index 3af4a8c6c90..3e6a7948d71 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/util/LabelHelper.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/util/LabelHelper.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Atos.
+ * Copyright (c) 2013, 2014 Atos, CEA, and others.
* 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
@@ -7,6 +7,8 @@ *
* Contributors:
* Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
+ *
******************************************************************************/
package org.eclipse.papyrus.infra.services.controlmode.util;
@@ -21,8 +23,6 @@ import org.eclipse.emf.edit.provider.IItemLabelProvider; */
public class LabelHelper {
- protected static ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
/**
* Return an user understandable label for an {@link EObject}
*
@@ -30,10 +30,17 @@ public class LabelHelper { * @return
*/
public static String getPrettyLabel(EObject eObject) {
- IItemLabelProvider itemLavelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);
- if(itemLavelProvider != null) {
- return itemLavelProvider.getText(eObject);
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ try {
+ IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);
+ if(itemLabelProvider != null) {
+ return itemLabelProvider.getText(eObject);
+ }
+ } finally {
+ adapterFactory.dispose();
}
+
return "Error in getting correct label";
}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF index 77657ef5d3d..668b90b3323 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.edit
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ui/GroupNotifierLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ui/GroupNotifierLabelProvider.java index 9f11cf849f6..04eacfd72b9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ui/GroupNotifierLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ui/GroupNotifierLabelProvider.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 Atos.
+ * Copyright (c) 2011, 2014 Atos, CEA, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -10,6 +10,7 @@ * Contributors:
* Arthur Daussy (Atos) - Initial API and implementation
* Arthur Daussy - 371712 : 372745: [ActivityDiagram] Major refactoring group framework
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.activitygroup.ui;
@@ -25,13 +26,14 @@ import org.eclipse.swt.graphics.Image; */
public class GroupNotifierLabelProvider extends LabelProvider {
- static AdapterFactoryLabelProvider factory = new AdapterFactoryLabelProvider(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE));
+ private ComposedAdapterFactory factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ private AdapterFactoryLabelProvider delegate = new AdapterFactoryLabelProvider(factory);
@Override
public String getText(Object element) {
if(element instanceof IGroupNotifier) {
IGroupNotifier notifier = (IGroupNotifier)element;
- return factory.getText(notifier.getEObject());
+ return delegate.getText(notifier.getEObject());
}
return super.getText(element);
}
@@ -40,8 +42,16 @@ public class GroupNotifierLabelProvider extends LabelProvider { public Image getImage(Object element) {
if(element instanceof IGroupNotifier) {
IGroupNotifier notifier = (IGroupNotifier)element;
- return factory.getImage(notifier.getEObject());
+ return delegate.getImage(notifier.getEObject());
}
return super.getImage(element);
}
+
+ @Override
+ public void dispose() {
+ delegate.dispose();
+ factory.dispose();
+
+ super.dispose();
+ }
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/utils/Utils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/utils/Utils.java index b38517b9826..31c72b85ba8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/utils/Utils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/utils/Utils.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 Atos.
+ * Copyright (c) 2011, 2014 Atos, CEA, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -10,6 +10,7 @@ * Contributors:
* Arthur Daussy (Atos) - Initial API and implementation
* Arthur Daussy - 371712 : 372745: [ActivityDiagram] Major refactoring group framework
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.activitygroup.utils;
@@ -25,8 +26,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.requests.ChangeBoundsRequest;
@@ -37,8 +36,7 @@ import org.eclipse.gmf.runtime.notation.LayoutConstraint; import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.predicates.DescendantsFilter;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.request.IGroupRequest;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -176,27 +174,16 @@ public class Utils { return Sets.filter(all, new DescendantsFilter(all));
}
- private static UMLItemProviderAdapterFactory adapter = new UMLItemProviderAdapterFactory();
-
- static AdapterFactoryLabelProvider factory = new AdapterFactoryLabelProvider(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE));
+ static AdapterFactoryLabelProvider factory = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
public static String getCorrectLabel(Object object) {
if(object instanceof EObject) {
- if(object instanceof Element) {
- Object provider = adapter.adapt(object, IItemLabelProvider.class);
- if(provider instanceof IItemLabelProvider) {
- IItemLabelProvider labelProvider = (IItemLabelProvider)provider;
- return labelProvider.getText(object);
- }
- } else {
- return factory.getText(object);
- }
+ return factory.getText(object);
} else if(object instanceof EReference) {
return ((EReference)object).getName();
} else {
- return object.toString();
+ return String.valueOf(object); // null safe
}
- return "Error in getting name";////$NON-NLS-1$
}
public static String getCorrectLabel(IAdaptable object) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/ui/AbstractTemplateParameterConfigurationDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/ui/AbstractTemplateParameterConfigurationDialog.java index 617b1c188b4..6262acadf59 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/ui/AbstractTemplateParameterConfigurationDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/ui/AbstractTemplateParameterConfigurationDialog.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
+ * Copyright (c) 2010, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
*/
package org.eclipse.papyrus.uml.diagram.clazz.custom.ui;
@@ -126,7 +127,7 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog { public void widgetSelected(SelectionEvent e) {
}
});
- choosePararameteredElementButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.icons.uml", "resource/gif/Package.gif"));
+ choosePararameteredElementButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif"));
choosePararameteredElementButton.setBounds(322, 10, 68, 23);
choosePararameteredElementButton.setText("...");
parameteredElementLabel = new CLabel(composite_1, SWT.NONE);
@@ -150,7 +151,7 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog { composite.setBackground(display.getSystemColor(SWT.COLOR_WHITE));
xpndtmSetTheDefault.setControl(composite);
chooseDefaultParameterButton = new Button(composite, SWT.NONE);
- chooseDefaultParameterButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.icons.uml", "resource/gif/Package.gif"));
+ chooseDefaultParameterButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif"));
chooseDefaultParameterButton.setBounds(322, 10, 68, 23);
chooseDefaultParameterButton.setText("...");
defaultElementLabel = new CLabel(composite, SWT.NONE);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ConditionalElementListDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ConditionalElementListDialog.java index fc06e09acf2..cf41e0e929e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ConditionalElementListDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ConditionalElementListDialog.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 AtoS.
+ * Copyright (c) 2011, 2014 AtoS, CEA, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@ *
* Contributors:
* Tristan FAURE (AtoS) tristan.faure@atos.net - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
+ *
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils;
@@ -17,6 +19,7 @@ import java.util.List; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IDisposable;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.papyrus.infra.core.modelsetquery.ModelSetQuery;
import org.eclipse.swt.widgets.Shell;
@@ -40,7 +43,16 @@ public class ConditionalElementListDialog<T extends EObject> extends ElementList }
public ConditionalElementListDialog(Shell parent, Predicate<T> condition, Collection<T> elements) {
- super(parent, new AdapterFactoryLabelProvider(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE)));
+ super(parent, new AdapterFactoryLabelProvider(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE)) {
+ @Override
+ public void dispose() {
+ if(adapterFactory instanceof IDisposable) {
+ // We created this adapter factory, so we must dispose it
+ ((IDisposable)adapterFactory).dispose();
+ }
+ super.dispose();
+ }
+ });
setMultipleSelection(false);
List<T> result = Lists.newArrayList(Iterables.filter(elements, condition));
setTitle("Choose Elements");
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ProviderUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ProviderUtil.java index 5f7f5b56950..da9c4b02bde 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ProviderUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/utils/ProviderUtil.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 AtoS.
+ * Copyright (c) 2011, 2014 AtoS, CEA, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@ *
* Contributors:
* Tristan FAURE (AtoS) tristan.faure@atos.net - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
+ *
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils;
@@ -29,6 +31,15 @@ public class ProviderUtil { */
public static String getLabel (EObject eobject)
{
- return new ReflectiveItemProvider(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE)).getText(eobject);
+ // FIXME: The reflective provider doesn't use the factory to get item labels. If that was intended, it will not work. This will only provide generic labels
+ ComposedAdapterFactory factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ ReflectiveItemProvider provider = new ReflectiveItemProvider(factory);
+ try {
+ return provider.getText(eobject);
+ } finally {
+ // We created these, so we must dispose them
+ provider.dispose();
+ factory.dispose();
+ }
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/dialogs/ElementChooseDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/dialogs/ElementChooseDialog.java index cb4f17e5a61..83b2810f4af 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/dialogs/ElementChooseDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/dialogs/ElementChooseDialog.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010 CEA LIST. + * Copyright (c) 2010, 2014 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -9,6 +9,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 410346 */ package org.eclipse.papyrus.uml.diagram.common.ui.dialogs; @@ -20,6 +21,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.IDisposable; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -28,8 +30,10 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.ParameterableElement; @@ -161,26 +165,31 @@ public class ElementChooseDialog extends AbstractChooseElement { } }); - btnSelect.addMouseListener(new MouseListener() { - - public void mouseUp(MouseEvent e) { + btnSelect.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { getParent().close(); } - - public void mouseDown(MouseEvent e) {} - public void mouseDoubleClick(MouseEvent e) {} }); - btnCancel.addMouseListener(new MouseListener() { - - public void mouseUp(MouseEvent e) { + btnCancel.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { result=null; selectedElement=null; getParent().close(); } - - public void mouseDown(MouseEvent e) {} - public void mouseDoubleClick(MouseEvent e) {} + }); + + getParent().addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + // Remove the adapters created by this factory + if(adapterFactory instanceof IDisposable) { + ((IDisposable)adapterFactory).dispose(); + } + } }); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java index 65abb920576..b89c3de008c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
+ * Copyright (c) 2009, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
@@ -16,7 +17,6 @@ package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
@@ -24,7 +24,6 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.composite.custom.messages.Messages;
import org.eclipse.papyrus.uml.diagram.composite.custom.ui.CollaborationRoleValidator;
import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;
@@ -95,22 +94,26 @@ public class CollaborationRoleCreateCommand extends CollaborationRoleCreateComma Collaboration owner = (Collaboration)getElementToEdit();
// Create and open the selection dialog
- AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new AdapterFactoryContentProvider(adapterFactory));
- // Set dialog parameters
- dialog.setTitle(Messages.CollaborationRoleSelectionDialog_Title);
- dialog.setMessage(Messages.CollaborationRoleSelectionDialog_Message);
- dialog.setAllowMultiple(false);
- dialog.setHelpAvailable(false);
- // ConnectableElement from the whole model can be selected as role.
- dialog.setInput(owner.getModel());
- // CollaborationRoleValidator ensures that an the selected element is a ConnectableElement.
- dialog.setValidator(new CollaborationRoleValidator());
-
- dialog.open();
+ try {
+ // Set dialog parameters
+ dialog.setTitle(Messages.CollaborationRoleSelectionDialog_Title);
+ dialog.setMessage(Messages.CollaborationRoleSelectionDialog_Message);
+ dialog.setAllowMultiple(false);
+ dialog.setHelpAvailable(false);
+ // ConnectableElement from the whole model can be selected as role.
+ dialog.setInput(owner.getModel());
+ // CollaborationRoleValidator ensures that an the selected element is a ConnectableElement.
+ dialog.setValidator(new CollaborationRoleValidator());
+ dialog.open();
+ } finally {
+ adapterFactory.dispose();
+ }
+
// If a ConnectableElement has been selected, complete command execution
// using selection as the "newly created" element and make the edited
// Collaboration reference it in the CollaborationRoles eReference.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/InformationFlowCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/InformationFlowCreateCommand.java index cd94d49e2d1..768cc8b4267 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/InformationFlowCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/InformationFlowCreateCommand.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
+ * Copyright (c) 2009, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
@@ -18,7 +19,6 @@ import java.util.ArrayList; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
@@ -74,52 +74,56 @@ public class InformationFlowCreateCommand extends org.eclipse.papyrus.uml.diagra protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
// Create and open the selection dialog
- AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
InformationItemElementTreeSelectionDialog dialog = new InformationItemElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new AdapterFactoryContentProvider(adapterFactory));
- // Set dialog parameters
- dialog.setTitle(Messages.InformationFlowSelectionDialog_Title);
- dialog.setMessage(Messages.InformationFlowSelectionDialog_Message);
- dialog.setAllowMultiple(true);
- dialog.setHelpAvailable(false);
- dialog.setInput(getSource().getModel());
- dialog.setValidator(new InformationItemValidator());
-
- ArrayList<Classifier> initialSelection = new ArrayList<Classifier>();
-
- // here the dialog.getReturnCode is IDialogConstants.OK_ID
- while(dialog.open() != IDialogConstants.CANCEL_ID) {
-
- /*
- * If classifiers have been selected, complete command execution and write the selection
- * in the conveyed:Classifief Association
- */
- if(dialog.getReturnCode() == ElementTreeSelectionDialog.OK) {
- Object[] conveyedClassified = dialog.getResult();
-
- InformationFlow newInformationFlow = UMLFactory.eINSTANCE.createInformationFlow();
- getContainer().getPackagedElements().add(newInformationFlow);
- newInformationFlow.getInformationSources().add(getSource());
- newInformationFlow.getInformationTargets().add(getTarget());
-
- // add the classifier in the list of conveyed Classifier
- for(int i = 0; i < conveyedClassified.length; i++) {
- newInformationFlow.getConveyeds().add((Classifier)conveyedClassified[i]);
+ try {
+ // Set dialog parameters
+ dialog.setTitle(Messages.InformationFlowSelectionDialog_Title);
+ dialog.setMessage(Messages.InformationFlowSelectionDialog_Message);
+ dialog.setAllowMultiple(true);
+ dialog.setHelpAvailable(false);
+ dialog.setInput(getSource().getModel());
+ dialog.setValidator(new InformationItemValidator());
+
+ ArrayList<Classifier> initialSelection = new ArrayList<Classifier>();
+
+ // here the dialog.getReturnCode is IDialogConstants.OK_ID
+ while(dialog.open() != IDialogConstants.CANCEL_ID) {
+
+ /*
+ * If classifiers have been selected, complete command execution and write the selection
+ * in the conveyed:Classifief Association
+ */
+ if(dialog.getReturnCode() == ElementTreeSelectionDialog.OK) {
+ Object[] conveyedClassified = dialog.getResult();
+
+ InformationFlow newInformationFlow = UMLFactory.eINSTANCE.createInformationFlow();
+ getContainer().getPackagedElements().add(newInformationFlow);
+ newInformationFlow.getInformationSources().add(getSource());
+ newInformationFlow.getInformationTargets().add(getTarget());
+
+ // add the classifier in the list of conveyed Classifier
+ for(int i = 0; i < conveyedClassified.length; i++) {
+ newInformationFlow.getConveyeds().add((Classifier)conveyedClassified[i]);
+ }
+
+ ElementInitializers.getInstance().init_InformationFlow_4021(newInformationFlow);
+
+ ((CreateElementRequest)getRequest()).setNewElement(newInformationFlow);
+ return CommandResult.newOKCommandResult(newInformationFlow);
+
+ } else if(dialog.getReturnCode() == InformationItemElementTreeSelectionDialog.newInformationItemButton_ID) {
+ // create a new InformationItem
+ initialSelection.add((Classifier)createNewInformationItem());
+ dialog.setInitialElementSelections(initialSelection);
}
-
- ElementInitializers.getInstance().init_InformationFlow_4021(newInformationFlow);
-
- ((CreateElementRequest)getRequest()).setNewElement(newInformationFlow);
- return CommandResult.newOKCommandResult(newInformationFlow);
-
- } else if(dialog.getReturnCode() == InformationItemElementTreeSelectionDialog.newInformationItemButton_ID) {
- // create a new InformationItem
- initialSelection.add((Classifier)createNewInformationItem());
- dialog.setInitialElementSelections(initialSelection);
- }
- }// end of while()
-
+ }// end of while()
+ } finally {
+ adapterFactory.dispose();
+ }
+
// No Classifier selected: abort element creation
return CommandResult.newCancelledCommandResult();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/RoleBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/RoleBindingCreateCommand.java index 82ed31b27d5..5ae344cf87f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/RoleBindingCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/RoleBindingCreateCommand.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
+ * Copyright (c) 2009, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 410346
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
@@ -16,7 +17,6 @@ package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
@@ -78,21 +78,25 @@ public class RoleBindingCreateCommand extends org.eclipse.papyrus.uml.diagram.co CollaborationUse graphicalSource = (CollaborationUse)getSource();
// Create and open the selection dialog
- AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new CollaborationRoleTreeContentProvider());
- // Set dialog parameters
- dialog.setTitle(Messages.RoleBindingRoleSelectionDialog_Title);
- dialog.setMessage(Messages.RoleBindingRoleSelectionDialog_Message);
- dialog.setAllowMultiple(false);
- dialog.setHelpAvailable(false);
- // The source CollaborationUse is set as input for the selection dialog,
- // the CollaborationRoleTreeContentProvider provides the roles that can possibly be
- // selected.
- dialog.setInput(graphicalSource);
+ try {
+ // Set dialog parameters
+ dialog.setTitle(Messages.RoleBindingRoleSelectionDialog_Title);
+ dialog.setMessage(Messages.RoleBindingRoleSelectionDialog_Message);
+ dialog.setAllowMultiple(false);
+ dialog.setHelpAvailable(false);
+ // The source CollaborationUse is set as input for the selection dialog,
+ // the CollaborationRoleTreeContentProvider provides the roles that can possibly be
+ // selected.
+ dialog.setInput(graphicalSource);
- dialog.open();
+ dialog.open();
+ } finally {
+ adapterFactory.dispose();
+ }
// If a ConnectableElement has been selected, complete command execution
// using selection as the "newly created" element and make the edited
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java index 540df8ed6cb..a8796595be8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Obeo. + * Copyright (c) 2008, 2014 Obeo, CEA, and others. * 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 @@ -7,6 +7,8 @@ * * Contributors: * Obeo - initial API and implementation + * Christian W. Damus (CEA) - bug 410346 + * *******************************************************************************/ package org.eclipse.papyrus.uml.diagram.wizards.pages; @@ -25,6 +27,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.IDisposable; import org.eclipse.emf.edit.provider.IWrapperItemProvider; import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; @@ -42,6 +45,8 @@ import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type; import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder; import org.eclipse.papyrus.uml.diagram.wizards.Messages; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -127,7 +132,7 @@ public class SelectRootElementPage extends WizardPage { layoutData.heightHint = 300; layoutData.widthHint = 300; modelViewer.getTree().setLayoutData(layoutData); - AdapterFactory adapterFactory = createAdapterFactory(); + final AdapterFactory adapterFactory = createAdapterFactory(); modelViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); modelViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); @@ -143,6 +148,16 @@ public class SelectRootElementPage extends WizardPage { } }); + modelViewer.getControl().addDisposeListener(new DisposeListener() { + + public void widgetDisposed(DisposeEvent e) { + // Dispose the adapter factory that we created to avoid leaking its adapters + if(adapterFactory instanceof IDisposable) { + ((IDisposable)adapterFactory).dispose(); + } + } + }); + setPageComplete(validatePage()); } diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.custom b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.custom index 1c575d13891..b6e30a3c628 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.custom +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.custom @@ -12,8 +12,8 @@ </facetOperations>
<facetOperations name="GetElementIcon">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>
- <eParameters name="eStructuralElement">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
+ <eParameters name="eObject">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eParameters>
<query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.GetImageQuery"/>
<override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetImageQuery.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetImageQuery.java index 8293016477b..ce4d3dd48cd 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetImageQuery.java +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetImageQuery.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.modelexplorer.queries; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; @@ -21,6 +22,7 @@ import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper; import org.eclipse.papyrus.emf.facet.custom.ui.internal.query.ImageQuery; import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.uml.tools.utils.ElementUtil; @@ -36,6 +38,11 @@ public class GetImageQuery implements IJavaQuery2<Element, IImage> { //@Override public IImage evaluate(Element source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException { + ParameterValue parameterValue= (ParameterValue)parameterValues.getParameterValueByName("eObject"); + if(parameterValue.getValue() instanceof EStructuralFeature){ + return ImageQuery.getEObjectImage((EStructuralFeature)parameterValue.getValue()); + } + String iconPath = ""; if(!source.getAppliedStereotypes().isEmpty()) { Stereotype first_stereotype = source.getAppliedStereotypes().get(0); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation index 6fa635f903c..d76d49cb8c9 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_4EGG0ImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="compartments" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_Cz4qUImWEeOGN4dVepS-Uw" type="2008">
<children xmi:type="notation:DecorationNode" xmi:id="_Cz4qUomWEeOGN4dVepS-Uw" type="5029"/>
@@ -166,7 +166,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_nImWEeOGN4dVepS-Uw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_nYmWEeOGN4dVepS-Uw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_61R_nomWEeOGN4dVepS-Uw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_61R_nomWEeOGN4dVepS-Uw" visible="false" type="7019">
<styles xmi:type="notation:TitleStyle" xmi:id="_61R_n4mWEeOGN4dVepS-Uw"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_61R_oImWEeOGN4dVepS-Uw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_61R_oYmWEeOGN4dVepS-Uw"/>
@@ -202,12 +202,12 @@ <children xmi:type="notation:Shape" xmi:id="_Tfr8cYmaEeOGN4dVepS-Uw" type="2012">
<children xmi:type="notation:DecorationNode" xmi:id="_Tfr8c4maEeOGN4dVepS-Uw" type="5038"/>
<element xmi:type="uml:Comment" href="model.uml#_Tfr8cImaEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="852" y="85" width="167"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="997" y="72" width="167"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_TlMukYmaEeOGN4dVepS-Uw" type="2012">
<children xmi:type="notation:DecorationNode" xmi:id="_TlV4gImaEeOGN4dVepS-Uw" type="5038"/>
<element xmi:type="uml:Comment" href="model.uml#_TlMukImaEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="859" y="248" width="149"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="881" y="248" width="149"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_4EGG0YmVEeOGN4dVepS-Uw"/>
<styles xmi:type="notation:EObjectListValueStyle" xmi:id="_OgIPAImWEeOGN4dVepS-Uw" name="css_stylesheets" eObjectListValue="_OgIPAYmWEeOGN4dVepS-Uw"/>
@@ -239,16 +239,20 @@ <styles xmi:type="notation:FontStyle" xmi:id="_YgJloYmaEeOGN4dVepS-Uw"/>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YgJloomaEeOGN4dVepS-Uw" points="[-74, -6, 126, 1]$[-192, 45, 8, 52]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwLXCEeOtu7CRWiD6kg" id="(0.0,0.4)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwbXCEeOtu7CRWiD6kg" id="(1.0,0.56)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Y5mAYImaEeOGN4dVepS-Uw" type="4013" source="_Tfr8cYmaEeOGN4dVepS-Uw" target="_DZrfAYmWEeOGN4dVepS-Uw">
<styles xmi:type="notation:FontStyle" xmi:id="_Y5mAYYmaEeOGN4dVepS-Uw"/>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5mAYomaEeOGN4dVepS-Uw" points="[-83, -1, 122, -8]$[-198, -48, 7, -55]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJELXCEeOtu7CRWiD6kg" id="(0.0,0.47)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJEbXCEeOtu7CRWiD6kg" id="(1.0,0.5)"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_8JDKAImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="labels" measurementUnit="Pixel">
<styles xmi:type="notation:DiagramStyle" xmi:id="_8JDKAYmVEeOGN4dVepS-Uw"/>
<element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>
</notation:Diagram>
- <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css"/>
+ <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="../../stylesheets/compartments.css"/>
</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml index b356eaf5ce0..d1eaf6c61a4 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4DWgNImVEeOGN4dVepS-Uw" name="CSSTests">
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4DWgNImVEeOGN4dVepS-Uw" name="CSSTests">
<ownedComment xmi:type="uml:Comment" xmi:id="__TiJAImVEeOGN4dVepS-Uw">
<body>Test model for CSS in Luna >= M5 (Compartments, Labels)</body>
</ownedComment>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css index fe0cb1f18a7..d38b353f6f8 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css @@ -33,7 +33,3 @@ Enumeration > Compartment { Enumeration > Compartment[kind=LiteRalS]{ /* Case insensitive */
collapsed: false;
}
-
-Compartment {
- showTitle: true;
-}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java index ee6096aa813..553f738b70e 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java @@ -17,6 +17,7 @@ import java.util.Iterator; import java.util.List;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -26,12 +27,13 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
import org.eclipse.gmf.runtime.notation.BasicCompartment;
import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
import org.eclipse.gmf.runtime.notation.TitleStyle;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
@@ -155,8 +157,7 @@ public class CSSCompartmentsTests extends AbstractPapyrusTest { }
//We need an editingDomain for the ResetStyle operation
- TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), diagram.eResource().getResourceSet());
- diagram.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
+ createAndAttachEditingDomain(diagram);
//Test resetStyle
ResetStyleHelper.resetStyle(Collections.singleton(class3));
@@ -180,14 +181,17 @@ public class CSSCompartmentsTests extends AbstractPapyrusTest { for(View compartment : (List<View>)childNode.getChildren()) {
if(compartment instanceof BasicCompartment) {
TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
- Assert.assertFalse("Title should be hidden", titleStyle.isShowTitle());
+ Assert.assertFalse("Title should be hidden for " + childNode + ", " + compartment, titleStyle.isShowTitle());
}
}
}
//Apply style
- CustomStringStyleObservableList stylesList = new CustomStringStyleObservableList(diagram, null, "cssClass");
- stylesList.add("showTitleForAllCompartments");
+ StringListValueStyle stylesList = (StringListValueStyle)diagram.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), "cssClass");
+ if(stylesList == null) {
+ stylesList = NotationFactory.eINSTANCE.createStringListValueStyle();
+ }
+ stylesList.getStringListValue().add("showTitleForAllCompartments");
//Check that all titles are visible
for(View childNode : (List<View>)diagram.getChildren()) {
@@ -198,8 +202,14 @@ public class CSSCompartmentsTests extends AbstractPapyrusTest { }
}
}
+
}
+ protected static TransactionalEditingDomain createAndAttachEditingDomain(EObject element) {
+ TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), element.eResource().getResourceSet());
+ element.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
+ return domain;
+ }
@After
public void dispose() {
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java index 0c1efe15355..758a702b244 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -22,15 +22,19 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.GradientStyle;
import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;
import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
@@ -38,6 +42,13 @@ public class CSSStylesheetTest { private CSSDiagram diagram;
+ @BeforeClass
+ public static void initCSSTheme() {
+ IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();
+ cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");
+ WorkspaceCSSEngine.instance.reset();
+ }
+
@Before
public void init() {
ResourceSet resourceSet = new ResourceSetImpl();
@@ -63,25 +74,25 @@ public class CSSStylesheetTest { Assert.assertEquals("Invalid color", rgb(255, 0, 0), classView.getFillColor()); //Red = #FF0000
Assert.assertNull("Invalid gradient", classView.getGradient());
- Assert.assertTrue(AppearanceHelper.showElementIcon(classView));
+ Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(classView));
}
@Test
public void testInterfaceStyle() {
Shape interfaceView = findShape("Interface1");
- Assert.assertNotNull(interfaceView.getGradient());
- Assert.assertEquals(rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00
- Assert.assertEquals(rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000
- Assert.assertEquals(GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle());
- Assert.assertTrue(AppearanceHelper.showElementIcon(interfaceView));
+ Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());
+ Assert.assertEquals("The fill color should be yellow", rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00
+ Assert.assertEquals("The gradient should be red", rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000
+ Assert.assertEquals("The gradient should be vertical", GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle());
+ Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(interfaceView));
}
@Test
public void testCSSClassStyle() {
Shape interfaceView = findShape("Interface2");
- Assert.assertNotNull(interfaceView.getGradient());
- Assert.assertEquals(rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90
+ Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());
+ Assert.assertEquals("The fill color should be light green (#90EE90)", rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90
//Case insensitive color name
Assert.assertEquals(rgb(0, 191, 255), interfaceView.getGradient().getGradientColor1()); //DeepSkyBlue = #00BFFF
@@ -108,7 +119,7 @@ public class CSSStylesheetTest { //.myClass : Low priority
//.myClass.myOtherClass : Highest priority
//[isAbstract=true] : Medium priority
- //Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga)
+ //Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga)
Shape class3 = findShape("Class3");
Shape class5 = findShape("Class5");
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF index b33520393ec..180307a9208 100644 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF @@ -32,6 +32,6 @@ Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.tests .Activator
Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.te
sts
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties index d875e66cb24..5cec5fa3697 100644 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties @@ -6,4 +6,6 @@ bin.includes = META-INF/,\ about.html,\
plugin.pdoc,\
resources/,\
- SysMLNatTableRequirementTests.launch
+ SysMLNatTableRequirementTests.launch,\
+ plugin.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties index 0b4cc37576e..1433bd0b1cf 100644 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties @@ -8,5 +8,5 @@ # Contributors:
# CEA LIST - initial API and implementation
###############################################################################
-pluginName=Requirement diagram tests
+pluginName=Requirement diagram tests (Incubation)
providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF index 881fb25d355..9d447b2ef6c 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF @@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.transaction;bundle-version="1.4.0", org.junit;bundle-version="4.10.0", org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0", - org.eclipse.papyrus.infra.core, - org.eclipse.papyrus.emf.facet.custom.metamodel, - org.eclipse.papyrus.junit.utils, + org.eclipse.papyrus.infra.core;bundle-version="1.0.0", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.0.0", org.eclipse.papyrus.infra.emf;bundle-version="1.0.0" Export-Package: org.eclipse.papyrus.uml.modelexplorer.tests Bundle-Vendor: %providerName diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF index b3882c9fb0b..5e31afe13a6 100644 --- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF @@ -14,13 +14,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0", org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0", org.junit;bundle-version="4.10.0", - org.eclipse.papyrus.emf.facet.custom.metamodel, - org.eclipse.papyrus.infra.emf, - org.eclipse.papyrus.junit.utils, + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.0.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.0.0", org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0", org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0", org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.0", - org.eclipse.papyrus.emf.facet.custom.core + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0" Export-Package: org.eclipse.papyrus.views.modelexplorer.tests Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy |