From a3d01d08c5af2a12eb6ba5cf606d7449935b2fa1 Mon Sep 17 00:00:00 2001 From: ptessier Date: Fri, 21 Feb 2014 10:57:54 +0100 Subject: Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet 0.2 impact of package renaming --- .../custom/ui/CustomizedContentProviderUtils.java | 8 ++--- .../facet/custom/ui/IContentPropertiesHandler.java | 4 +-- .../ui/IContentPropertiesHandlerFactory.java | 6 ++-- .../emf/facet/custom/ui/ICustomOverride.java | 6 ++-- .../custom/ui/ICustomizedContentProvider.java | 4 +-- .../ui/ICustomizedContentProviderFactory.java | 6 ++-- .../facet/custom/ui/ICustomizedLabelProvider.java | 4 +-- .../custom/ui/ICustomizedLabelProviderFactory.java | 6 ++-- .../custom/ui/ICustomizedToolTipLabelProvider.java | 2 +- .../custom/ui/ICustomizedTreeContentProvider.java | 4 +-- .../facet/custom/ui/IFontPropertiesHandler.java | 4 +-- .../IResolvingCustomizedLabelProviderFactory.java | 6 ++-- .../custom/ui/ISelectionPropertiesHandler.java | 4 +-- .../ui/ISelectionPropertiesHandlerFactory.java | 6 ++-- .../papyrus/emf/facet/custom/ui/ImageUtils.java | 8 ++--- .../emf/facet/custom/ui/internal/Activator.java | 4 +-- .../ui/internal/CustomizationCommandFactory.java | 38 +++++++++++----------- .../CustomizationCommandFactoryFactory.java | 8 ++--- .../internal/CustomizedContentProviderFactory.java | 10 +++--- .../ui/internal/CustomizedLabelDecorator.java | 14 ++++---- .../ui/internal/CustomizedLabelProvider.java | 38 +++++++++++----------- .../internal/CustomizedLabelProviderFactory.java | 8 ++--- .../ui/internal/CustomizedTreeContentProvider.java | 34 +++++++++---------- .../DecoratingCustomizedLabelProvider.java | 6 ++-- .../custom/ui/internal/DefaultCustomOverride.java | 12 +++---- .../emf/facet/custom/ui/internal/ImageManager.java | 14 ++++---- .../facet/custom/ui/internal/ImageProvider.java | 4 +-- .../emf/facet/custom/ui/internal/Messages.java | 4 +-- .../custom/ui/internal/PropertiesHandler.java | 22 ++++++------- .../ui/internal/PropertiesHandlerFactory.java | 18 +++++----- .../internal/ResolvingCustomizedLabelProvider.java | 14 ++++---- .../ResolvingCustomizedLabelProviderFactory.java | 8 ++--- .../custom/ui/internal/TreeElementAdapter.java | 14 ++++---- .../facet/custom/ui/internal/custompt/Color.java | 4 +-- .../custom/ui/internal/custompt/ImageWrapper.java | 4 +-- .../custom/ui/internal/custompt/URIImage.java | 4 +-- .../ui/internal/dialog/ColorLabelProvider.java | 6 ++-- .../internal/dialog/LoadCustomizationsDialog.java | 14 ++++---- .../dialog/LoadCustomizationsDialogFactory.java | 10 +++--- .../SynchronizedLoadCustomizationsDialog.java | 18 +++++----- .../CustomizationEditRuntimeException.java | 2 +- .../CustomizedContentProviderRuntimeException.java | 2 +- .../exported/CustomizationUIConstants.java | 4 +-- .../exported/ICustomizationCommandFactory.java | 16 ++++----- .../ICustomizationCommandFactoryFactory.java | 6 ++-- .../internal/exported/ILabelPropertiesHandler.java | 4 +-- .../exported/ILabelPropertiesHandlerFactory.java | 6 ++-- .../exported/dialog/ILoadCustomizationsDialog.java | 6 ++-- .../dialog/ILoadCustomizationsDialogFactory.java | 8 ++--- .../exception/IllegalParameterException.java | 2 +- .../custom/ui/internal/query/BackgroundQuery.java | 14 ++++---- .../custom/ui/internal/query/FontNameQuery.java | 10 +++--- .../custom/ui/internal/query/FontSizeQuery.java | 10 +++--- .../custom/ui/internal/query/ForegroundQuery.java | 14 ++++---- .../facet/custom/ui/internal/query/ImageQuery.java | 26 +++++++-------- .../facet/custom/ui/internal/query/LabelQuery.java | 18 +++++----- .../custom/ui/internal/query/SelectionQuery.java | 12 +++---- .../ui/internal/query/ToolTipAlignmentQuery.java | 12 +++---- .../ui/internal/query/ToolTipBackgroundQuery.java | 14 ++++---- .../ui/internal/query/ToolTipDelayQuery.java | 10 +++--- .../ui/internal/query/ToolTipShadowQuery.java | 12 +++---- .../custom/ui/internal/query/ToolTipTextQuery.java | 12 +++---- .../query/URIImageQueryImplementationFactory.java | 16 ++++----- .../internal/querytype/URIImageQueryEvaluator.java | 18 +++++----- .../internal/view/CustomizationsCatalogView.java | 24 +++++++------- 65 files changed, 343 insertions(+), 343 deletions(-) (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus') diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/CustomizedContentProviderUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/CustomizedContentProviderUtils.java index 42d400014f2..e60394c963f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/CustomizedContentProviderUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/CustomizedContentProviderUtils.java @@ -9,19 +9,19 @@ * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider * Nicolas Bros (Mia-Software) - Bug 380407 - Missing since tag on CustomizedContentProviderUtils *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.Assert; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; /** * A companion utility class for {@link ICustomizedTreeContentProvider} diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandler.java index 4c0e63a6a3f..013197852ac 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandler.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandler.java @@ -10,9 +10,9 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java index 6ba0241106a..f812986fc6a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java @@ -10,10 +10,10 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomOverride.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomOverride.java index f0eccfeab34..99860f9941a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomOverride.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomOverride.java @@ -9,10 +9,10 @@ * Contributors: * David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.core.exception.CustomizationException; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.core.exception.CustomizationException; import org.eclipse.swt.graphics.FontData; /** diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProvider.java index 27f7ba8d41e..68dbf80603c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProvider.java @@ -10,10 +10,10 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; import org.eclipse.jface.viewers.IContentProvider; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * This interface allow to used a {@link IContentProvider} which is implemented diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProviderFactory.java index ced6cf1d4f1..109da62630a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProviderFactory.java @@ -11,10 +11,10 @@ * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.CustomizedContentProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedContentProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * This is a factory for {@link ICustomizedContentProvider} and {@link ICustomizedTreeContentProvider}. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProvider.java index 1a5ddb85e9d..e4d106e694e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProvider.java @@ -12,13 +12,13 @@ * Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; import org.eclipse.swt.graphics.Image; /** diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java index 08893579b99..13ffc43ad6b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java @@ -10,10 +10,10 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.CustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * This class is the factory allowing to get a instance of diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedToolTipLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedToolTipLabelProvider.java index 4b82620582b..d102f9e2536 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedToolTipLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedToolTipLabelProvider.java @@ -10,7 +10,7 @@ * Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; import org.eclipse.emf.ecore.ETypedElement; import org.eclipse.jface.viewers.ViewerCell; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedTreeContentProvider.java index 753c29fed0c..79522eee302 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedTreeContentProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedTreeContentProvider.java @@ -8,10 +8,10 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * An {@link ITreeContentProvider} which is implemented and customizable using the EMF Facet customization mechanisms. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IFontPropertiesHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IFontPropertiesHandler.java index d78f859fcd9..8fe37afccf4 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IFontPropertiesHandler.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IFontPropertiesHandler.java @@ -9,9 +9,9 @@ * Contributors: * David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider */ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; /** * @since 0.4 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java index c6982ac6f34..50f81a2d034 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java @@ -8,10 +8,10 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.ResolvingCustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.ResolvingCustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * A factory to create instances of {@link ICustomizedLabelProvider} that work on proxy UI elements, by customizing the diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandler.java index 746db07ce30..d69290795b2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandler.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandler.java @@ -8,9 +8,9 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 377866 - selection customization *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java index 704c14f1e63..102521a3579 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java @@ -8,10 +8,10 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 377866 - selection customization *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * Factory for {@link ISelectionPropertiesHandler} diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ImageUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ImageUtils.java index 23886e81b66..ffd82786028 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ImageUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ImageUtils.java @@ -10,11 +10,11 @@ * Nicolas Bros (Mia-Software) - Bug 375388 - Cell editor for IImage * Nicolas Rault (Soft-Maint) - Bug 412565 - Need an URIImage Constructor *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui; +package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; -import org.eclipse.emf.facet.custom.ui.internal.custompt.ImageWrapper; -import org.eclipse.emf.facet.custom.ui.internal.custompt.URIImage; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.URIImage; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; import org.eclipse.swt.graphics.Image; /** diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Activator.java index 5d631fdd52f..75806da4db9 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Activator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Activator.java @@ -9,7 +9,7 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.emf.facet.custom.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.papyrus.emf.facet.custom.ui"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactory.java index 87922a6a882..c9a51fba50b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactory.java @@ -11,7 +11,7 @@ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning * Nicolas Bros (Mia-Software) - Bug 378271 - [Table] Select Columns To Hide is broken */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CompoundCommand; @@ -21,24 +21,24 @@ import org.eclipse.emf.ecore.ETypedElement; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization; -import org.eclipse.emf.facet.custom.ui.internal.exception.CustomizationEditRuntimeException; -import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; -import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResult; -import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResultFactory; -import org.eclipse.emf.facet.util.emf.core.internal.exported.ICommandFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exception.CustomizationEditRuntimeException; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.util.emf.core.command.ICommandFactoryResult; +import org.eclipse.papyrus.emf.facet.util.emf.core.command.ICommandFactoryResultFactory; +import org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported.ICommandFactory; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization; public class CustomizationCommandFactory implements ICustomizationCommandFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java index 6bb53aa42bd..4a714c9a4ca 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java @@ -10,12 +10,12 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory; -import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactoryFactory; -import org.eclipse.emf.facet.util.emf.core.internal.exported.ICommandFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactoryFactory; +import org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported.ICommandFactory; public class CustomizationCommandFactoryFactory implements ICustomizationCommandFactoryFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java index 9276cd8b9aa..090bf6f0f8b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java @@ -10,12 +10,12 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.ICustomizedContentProvider; -import org.eclipse.emf.facet.custom.ui.ICustomizedContentProviderFactory; -import org.eclipse.emf.facet.custom.ui.ICustomizedTreeContentProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedContentProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedContentProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedTreeContentProvider; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; @SuppressWarnings("deprecation") //@SuppressWarnings("deprecation") : Bug 380229 - [deprecated] ICustomizedContentProvider diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelDecorator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelDecorator.java index d7c1f78d84d..5520d0ef658 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelDecorator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelDecorator.java @@ -11,21 +11,21 @@ * Thomas Cicognani (Soft-Maint) - Bug 424414 - ImageManager doesn't cache images * Thomas Cicognani (Soft-Maint) - Bug 424416 - Plug-in for JFace Utilities *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.core.internal.exported.CustomizationUtils; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; -import org.eclipse.emf.facet.util.jface.ui.imageprovider.IImageProvider; -import org.eclipse.emf.facet.util.jface.ui.imageprovider.IImageProviderFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider.IImageProvider; +import org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider.IImageProviderFactory; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.DecorationOverlayIcon; import org.eclipse.jface.viewers.IDecorationContext; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelDecorator; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.core.internal.exported.CustomizationUtils; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; import org.eclipse.swt.graphics.Image; public class CustomizedLabelDecorator extends LabelDecorator { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProvider.java index d9666996d41..164ef31b817 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProvider.java @@ -9,7 +9,7 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework - * Nicolas Bros (Mia-Software) - Bug 372198 - resource leak in org.eclipse.emf.facet.custom.ui.internal.CustomizedLabelProvider + * Nicolas Bros (Mia-Software) - Bug 372198 - resource leak in org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProvider * Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning * Nicolas Bros (Mia-Software) - Bug 374941 - To be able to customize overlay icons on EClass @@ -24,7 +24,7 @@ * Grégoire Dupé (Mia-Software) - Bug 424122 - [Table] Images, fonts and colors are not shared between the instances of table * Thomas Cicognani (Soft-Maint) - Bug 424414 - ImageManager doesn't cache images */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.util.ArrayList; import java.util.Iterator; @@ -33,28 +33,28 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.ETypedElement; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory; -import org.eclipse.emf.facet.custom.core.exception.CustomizationException; -import org.eclipse.emf.facet.custom.core.internal.exported.CustomizationUtils; -import org.eclipse.emf.facet.custom.metamodel.custompt.IColor; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow; -import org.eclipse.emf.facet.custom.ui.ICustomOverride; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProvider; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; -import org.eclipse.emf.facet.util.core.DebugUtils; -import org.eclipse.emf.facet.util.core.Logger; -import org.eclipse.emf.facet.util.swt.colorprovider.IColorProvider; -import org.eclipse.emf.facet.util.swt.colorprovider.IColorProviderFactory; -import org.eclipse.emf.facet.util.swt.fontprovider.IFontProvider; -import org.eclipse.emf.facet.util.swt.fontprovider.IFontProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomOverride; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.util.core.DebugUtils; +import org.eclipse.papyrus.emf.facet.util.core.Logger; +import org.eclipse.papyrus.emf.facet.util.swt.colorprovider.IColorProvider; +import org.eclipse.papyrus.emf.facet.util.swt.colorprovider.IColorProviderFactory; +import org.eclipse.papyrus.emf.facet.util.swt.fontprovider.IFontProvider; +import org.eclipse.papyrus.emf.facet.util.swt.fontprovider.IFontProviderFactory; import org.eclipse.jface.viewers.CellLabelProvider; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManagerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.exception.CustomizationException; +import org.eclipse.papyrus.emf.facet.custom.core.internal.exported.CustomizationUtils; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProviderFactory.java index f0a3cec3a5a..3c41a4d0d9e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProviderFactory.java @@ -10,11 +10,11 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProvider; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; public class CustomizedLabelProviderFactory implements ICustomizedLabelProviderFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java index 31bab479a1e..ac7d7a5cd25 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java @@ -10,7 +10,7 @@ * Gregoire Dupe (Mia-Software) - Bug 385292 - [CustomizedTreeContentProvider] StackOverFlow when refreshing a TreeViewer with ICustomizedTreeContentProvider * Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements() *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.util.ArrayList; import java.util.Collection; @@ -23,23 +23,23 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.core.exception.CustomizationException; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeproxyFactory; -import org.eclipse.emf.facet.custom.ui.IContentPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.IContentPropertiesHandlerFactory; -import org.eclipse.emf.facet.custom.ui.ICustomizedContentProvider; -import org.eclipse.emf.facet.custom.ui.ICustomizedTreeContentProvider; -import org.eclipse.emf.facet.efacet.core.FacetUtils; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException; -import org.eclipse.emf.facet.util.core.Logger; +import org.eclipse.papyrus.emf.facet.custom.ui.IContentPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.IContentPropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedContentProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedTreeContentProvider; +import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.FacetManagerException; +import org.eclipse.papyrus.emf.facet.util.core.Logger; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.core.exception.CustomizationException; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeproxyFactory; @SuppressWarnings("deprecation") // @SuppressWarnings("deprecation") : Bug 380229 - [deprecated] ICustomizedContentProvider diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java index 55297087f4e..3985d65f023 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java @@ -8,14 +8,14 @@ * Contributors: * David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; import org.eclipse.jface.viewers.DecoratingStyledCellLabelProvider; import org.eclipse.jface.viewers.IDecorationContext; import org.eclipse.jface.viewers.ILabelDecorator; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DefaultCustomOverride.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DefaultCustomOverride.java index 56c7bef23b5..adf0823c4e5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DefaultCustomOverride.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DefaultCustomOverride.java @@ -9,14 +9,14 @@ * Contributors: * David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.core.exception.CustomizationException; -import org.eclipse.emf.facet.custom.ui.ICustomOverride; -import org.eclipse.emf.facet.custom.ui.IFontPropertiesHandler; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomOverride; +import org.eclipse.papyrus.emf.facet.custom.ui.IFontPropertiesHandler; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.core.exception.CustomizationException; import org.eclipse.swt.graphics.FontData; public class DefaultCustomOverride implements ICustomOverride { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageManager.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageManager.java index 256a26fb565..b260377a850 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageManager.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageManager.java @@ -9,7 +9,7 @@ * David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented * Thomas Cicognani (Soft-Maint) - Bug 424414 - ImageManager doesn't cache images *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.net.URL; import java.util.HashMap; @@ -17,14 +17,14 @@ import java.util.Map; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; -import org.eclipse.emf.facet.custom.ui.internal.custompt.ImageWrapper; -import org.eclipse.emf.facet.custom.ui.internal.custompt.URIImage; -import org.eclipse.emf.facet.util.core.Logger; -import org.eclipse.emf.facet.util.swt.imageprovider.IImageProvider; -import org.eclipse.emf.facet.util.swt.imageprovider.IImageProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.URIImage; +import org.eclipse.papyrus.emf.facet.util.core.Logger; +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.osgi.util.NLS; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; import org.eclipse.swt.graphics.Device; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PlatformUI; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageProvider.java index a8bfc3eabda..1e968f4339f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageProvider.java @@ -12,11 +12,11 @@ * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.net.URL; -import org.eclipse.emf.facet.util.core.Logger; +import org.eclipse.papyrus.emf.facet.util.core.Logger; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Messages.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Messages.java index 7ec996a3eae..ce1f53830c3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Messages.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Messages.java @@ -12,12 +12,12 @@ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning * Vincent Lorenzo (CEA-LIST) - Bug 373255 - Add tooltips providing a documentation for the selected elements in the Select ETypedElement Dialog *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.osgi.util.NLS; public final class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.emf.facet.custom.ui.internal.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.papyrus.emf.facet.custom.ui.internal.messages"; //$NON-NLS-1$ public static String CustomizationsCatalogView_title; public static String CustomizationsView_allQuerySets; public static String CustomizationsView_jobName_RefreshCustomizationsView; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandler.java index a409999742a..20f34b5f940 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandler.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandler.java @@ -15,7 +15,7 @@ * Nicolas Bros (Mia-Software) - Bug 377866 - selection customization * David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.util.HashMap; import java.util.Map; @@ -24,15 +24,15 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.ETypedElement; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.IContentPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.IFontPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.ISelectionPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandler; -import org.eclipse.emf.facet.efacet.core.FacetUtils; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; +import org.eclipse.papyrus.emf.facet.custom.ui.IContentPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.IFontPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.ISelectionPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandler; +import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; public class PropertiesHandler implements IContentPropertiesHandler, ILabelPropertiesHandler, ISelectionPropertiesHandler, IFontPropertiesHandler { @@ -74,7 +74,7 @@ public class PropertiesHandler implements IContentPropertiesHandler, /** * * @deprecated Must be replaced by - * org.eclipse.emf.facet.custom.ui.internal.PropertiesHandler + * org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandler * .PropertiesHandler(ICustomizationManager) */ @Deprecated diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandlerFactory.java index cc545fc4445..93dfc066a0a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandlerFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandlerFactory.java @@ -11,23 +11,23 @@ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning * Nicolas Bros (Mia-Software) - Bug 377866 - selection customization */ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.IContentPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.IContentPropertiesHandlerFactory; -import org.eclipse.emf.facet.custom.ui.ISelectionPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.ISelectionPropertiesHandlerFactory; -import org.eclipse.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandler; -import org.eclipse.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.IContentPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.IContentPropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ISelectionPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.ISelectionPropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandler; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.ILabelPropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; public class PropertiesHandlerFactory implements IContentPropertiesHandlerFactory, ILabelPropertiesHandlerFactory, ISelectionPropertiesHandlerFactory { /** * @deprecated must be replaced by - * org.eclipse.emf.facet.custom.ui.internal.PropertiesHandlerFactory + * org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory * .createIContentPropertiesHandler(ICustomizationManager) */ @Deprecated diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java index d7780646b26..84950c7f7db 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java @@ -8,17 +8,17 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; -import org.eclipse.emf.facet.custom.ui.CustomizedContentProviderUtils; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.CustomizedContentProviderUtils; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java index 3fc33a36cfd..abe9b091d0a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java @@ -9,11 +9,11 @@ * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider * David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.ICustomizedLabelProvider; -import org.eclipse.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; public class ResolvingCustomizedLabelProviderFactory implements IResolvingCustomizedLabelProviderFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/TreeElementAdapter.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/TreeElementAdapter.java index 1598f4bff78..7e6cbf7ac5c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/TreeElementAdapter.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/TreeElementAdapter.java @@ -8,19 +8,19 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements() *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal; +package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement; -import org.eclipse.emf.facet.custom.ui.internal.exception.CustomizedContentProviderRuntimeException; -import org.eclipse.emf.facet.util.core.DebugUtils; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exception.CustomizedContentProviderRuntimeException; +import org.eclipse.papyrus.emf.facet.util.core.DebugUtils; import org.eclipse.osgi.util.NLS; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EAttributeTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement; public class TreeElementAdapter implements Adapter { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/Color.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/Color.java index fb8208b4f6a..f6eff6490c0 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/Color.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/Color.java @@ -9,9 +9,9 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model */ -package org.eclipse.emf.facet.custom.ui.internal.custompt; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt; -import org.eclipse.emf.facet.custom.metamodel.custompt.IColor; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; public class Color implements IColor { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/ImageWrapper.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/ImageWrapper.java index d625315610c..ad12b304653 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/ImageWrapper.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/ImageWrapper.java @@ -10,13 +10,13 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model * Nicolas Bros (Mia-Software) - Bug 374941 - To be able to customize overlay icons on EClass */ -package org.eclipse.emf.facet.custom.ui.internal.custompt; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/URIImage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/URIImage.java index 281d2341668..d086010c012 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/URIImage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/URIImage.java @@ -10,11 +10,11 @@ * David Couvrand (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI * Nicolas Rault (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI */ -package org.eclipse.emf.facet.custom.ui.internal.custompt; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt; import java.io.InputStream; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; public class URIImage implements IImage { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/ColorLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/ColorLabelProvider.java index b26f4d8636c..37801c148ef 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/ColorLabelProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/ColorLabelProvider.java @@ -9,12 +9,12 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.ImageProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.ImageProvider; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java index 11fb06c9481..b5ce87c654e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java @@ -11,7 +11,7 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,11 @@ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.Messages; -import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; -import org.eclipse.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; -import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallback; -import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.Messages; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialogCallback; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -39,6 +38,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java index 63173a9d2cf..d49af6c65f2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java @@ -9,15 +9,15 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; import java.util.Collections; import java.util.List; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; -import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory; -import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.widgets.Shell; public class LoadCustomizationsDialogFactory implements ILoadCustomizationsDialogFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java index 0090c63ee36..372fd032c66 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java @@ -11,18 +11,18 @@ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning * Nicolas Bros (Mia-Software) - Bug 372626 - Aggregates */ -package org.eclipse.emf.facet.custom.ui.internal.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; import java.util.List; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; -import org.eclipse.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; -import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; -import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.AbstractExceptionFreeRunnable; -import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.AbstractVoidExceptionFreeRunnable; -import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.AbstractVoidRunnable; -import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.SynchronizedObject; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync.AbstractExceptionFreeRunnable; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync.AbstractVoidExceptionFreeRunnable; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync.AbstractVoidRunnable; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync.SynchronizedObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java index 611c7050bff..d487ca4cd3e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java @@ -10,7 +10,7 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.exception; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exception; public class CustomizationEditRuntimeException extends RuntimeException { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java index 6aa3a9eae21..b4a1b3522df 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java @@ -8,7 +8,7 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements() *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.exception; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exception; public class CustomizedContentProviderRuntimeException extends RuntimeException { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/CustomizationUIConstants.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/CustomizationUIConstants.java index 91e19a330eb..80a9220172b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/CustomizationUIConstants.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/CustomizationUIConstants.java @@ -8,14 +8,14 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 372626 - Aggregates *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.exported; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; /** * @since 0.2 */ public final class CustomizationUIConstants { - private static final String CATALOG_VIEW_ID = "org.eclipse.emf.facet.custom.ui.view.catalog"; //$NON-NLS-1$ + private static final String CATALOG_VIEW_ID = "org.eclipse.papyrus.emf.facet.custom.ui.view.catalog"; //$NON-NLS-1$ private CustomizationUIConstants() { // utility class diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java index bf65605d96e..388ee7b7a6a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java @@ -9,17 +9,17 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.exported; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; -import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResult; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.util.emf.core.command.ICommandFactoryResult; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization; public interface ICustomizationCommandFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java index 0f01063623f..22e5a1b7570 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java @@ -9,11 +9,11 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.exported; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.emf.facet.custom.ui.internal.CustomizationCommandFactoryFactory; -import org.eclipse.emf.facet.util.emf.core.internal.exported.ICommandFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizationCommandFactoryFactory; +import org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported.ICommandFactory; public interface ICustomizationCommandFactoryFactory { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java index 9cab557ed30..e67e69d76dd 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java @@ -10,9 +10,9 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui.internal.exported; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java index 9d0684710f3..7c2788767c7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java @@ -10,10 +10,10 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui.internal.exported; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; -import org.eclipse.emf.facet.custom.core.ICustomizationManager; -import org.eclipse.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java index e6303ae5666..fe493345953 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java @@ -10,12 +10,12 @@ * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning */ -package org.eclipse.emf.facet.custom.ui.internal.exported.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog; import java.util.List; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; /** * A dialog to load {@link Customization}s. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java index 126ce512c00..0f8bd3653e8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java @@ -9,13 +9,13 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.exported.dialog; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog; import java.util.List; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.dialog.LoadCustomizationsDialogFactory; -import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog.LoadCustomizationsDialogFactory; +import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.widgets.Shell; /** diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/exception/IllegalParameterException.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/exception/IllegalParameterException.java index dbf51a20f27..3b1792de8bc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/exception/IllegalParameterException.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/exception/IllegalParameterException.java @@ -9,7 +9,7 @@ * Contributors: * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model */ -package org.eclipse.emf.facet.custom.ui.internal.exported.exception; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception; import java.util.List; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/BackgroundQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/BackgroundQuery.java index b759212194e..d445e56c5bb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/BackgroundQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/BackgroundQuery.java @@ -10,15 +10,15 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.custompt.IColor; -import org.eclipse.emf.facet.custom.ui.internal.custompt.Color; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.Color; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; public class BackgroundQuery implements IJavaQuery2 { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontNameQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontNameQuery.java index e338177bc61..d383da278c7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontNameQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontNameQuery.java @@ -10,13 +10,13 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.swt.widgets.Display; public class FontNameQuery implements IJavaQuery2 { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontSizeQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontSizeQuery.java index 0429f5cf358..0d2f5e4abcd 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontSizeQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontSizeQuery.java @@ -10,13 +10,13 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.swt.widgets.Display; public class FontSizeQuery implements IJavaQuery2 { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ForegroundQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ForegroundQuery.java index a4ecb4db938..c29d8c816b6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ForegroundQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ForegroundQuery.java @@ -10,15 +10,15 @@ * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.custompt.IColor; -import org.eclipse.emf.facet.custom.ui.internal.custompt.Color; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.Color; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; public class ForegroundQuery implements IJavaQuery2 { 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 2397e2bf1b8..1d80907c116 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 @@ -12,7 +12,7 @@ * 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 */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; @@ -21,19 +21,19 @@ import org.eclipse.emf.ecore.ETypedElement; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.emf.facet.custom.metamodel.custompt.IImage; -import org.eclipse.emf.facet.custom.ui.internal.Activator; -import org.eclipse.emf.facet.custom.ui.internal.ImageProvider; -import org.eclipse.emf.facet.custom.ui.internal.custompt.ImageWrapper; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.emf.facet.util.swt.imageprovider.IImageProvider; -import org.eclipse.emf.facet.util.swt.imageprovider.IImageProviderFactory; +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; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute; +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; public class ImageQuery implements IJavaQuery2 { 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 e68597d4aee..0d0d0130c20 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 @@ -13,7 +13,7 @@ * Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List, List) * Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.ReflectiveItemProvider; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.emf.facet.util.emf.core.ModelUtils; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.util.emf.core.ModelUtils; public class LabelQuery implements IJavaQuery2 { @@ -91,7 +91,7 @@ public class LabelQuery implements IJavaQuery2 { * @return a default name based on a string feature of the given * {@link EObject} */ - // from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils + // from org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils public static String getDefaultName(final EObject eObject) { String result = ""; //$NON-NLS-1$ // find a feature that can be used as a name @@ -111,8 +111,8 @@ public class LabelQuery implements IJavaQuery2 { * a name * @return an EStructuralFeature */ - // Copied from org.eclipse.emf.edit.provider.ReflectiveItemProvider to org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils - // Copied from org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils + // Copied from org.eclipse.emf.edit.provider.ReflectiveItemProvider to org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils + // Copied from org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils private static EStructuralFeature getLabelFeature(final EClass eClass) { EAttribute result = null; for (final EAttribute eAttribute : eClass.getEAllAttributes()) { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/SelectionQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/SelectionQuery.java index 3597ae09e4c..048b1a6c1d2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/SelectionQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/SelectionQuery.java @@ -8,18 +8,18 @@ * Contributors: * Nicolas Bros (Mia-Software) - Bug 377866 - selection customization *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import java.util.Collections; import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.core.exception.FacetManagerException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; /** * This is the query that returns the default selection for a given source and feature (i.e. row and column in a table). diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java index e4e82000f76..100babe0511 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java @@ -12,14 +12,14 @@ * *****************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java index 283052d3b43..8b852224a6c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java @@ -12,15 +12,15 @@ * *****************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.custompt.IColor; -import org.eclipse.emf.facet.custom.ui.internal.custompt.Color; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.Color; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipDelayQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipDelayQuery.java index 40fe97a7073..2cc5e483f49 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipDelayQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipDelayQuery.java @@ -11,13 +11,13 @@ * Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider * *****************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipShadowQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipShadowQuery.java index e0077edb17b..1f22edac96a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipShadowQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipShadowQuery.java @@ -12,14 +12,14 @@ * *****************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +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.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow; /** * diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipTextQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipTextQuery.java index 2521276df6f..27e240f2f91 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipTextQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipTextQuery.java @@ -11,16 +11,16 @@ * *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.ui.internal.Messages; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.Messages; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.osgi.util.NLS; /** diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java index 88111e8211a..7f4d3fc7ce7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java @@ -11,16 +11,16 @@ * Nicolas Rault (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI */ -package org.eclipse.emf.facet.custom.ui.internal.query; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.facet.custom.metamodel.v0_3_0.query.QueryPackage; -import org.eclipse.emf.facet.custom.ui.internal.querytype.URIImageQueryEvaluator; -import org.eclipse.emf.facet.efacet.core.IDerivedTypedElementManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.efacet.core.query.IQueryImplementation; -import org.eclipse.emf.facet.efacet.core.query.IQueryImplementationFactory; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.querytype.URIImageQueryEvaluator; +import org.eclipse.papyrus.emf.facet.efacet.core.IDerivedTypedElementManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.efacet.core.query.IQueryImplementation; +import org.eclipse.papyrus.emf.facet.efacet.core.query.IQueryImplementationFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.QueryPackage; import org.osgi.framework.Bundle; public class URIImageQueryImplementationFactory implements diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java index d6fe2627c66..846552c83a3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java @@ -10,19 +10,19 @@ * David Couvrand (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI * Nicolas Rault (Soft-Maint) - Bug 402725 - Need a query to get an image from an URI */ -package org.eclipse.emf.facet.custom.ui.internal.querytype; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.querytype; import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.facet.custom.metamodel.v0_3_0.query.URIImageQuery; -import org.eclipse.emf.facet.custom.ui.internal.custompt.URIImage; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.efacet.core.query.IQueryImplementation; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.URIImage; +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.core.query.IQueryImplementation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.URIImageQuery; public class URIImageQueryEvaluator implements IQueryImplementation { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/view/CustomizationsCatalogView.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/view/CustomizationsCatalogView.java index a976cf34077..72812d77154 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/view/CustomizationsCatalogView.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/view/CustomizationsCatalogView.java @@ -12,7 +12,7 @@ * Nicolas Bros (Mia-Software) - Bug 372626 - Aggregates * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning *******************************************************************************/ -package org.eclipse.emf.facet.custom.ui.internal.view; +package org.eclipse.papyrus.emf.facet.custom.ui.internal.view; import java.util.ArrayList; import java.util.Collection; @@ -25,22 +25,22 @@ import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.facet.common.ui.internal.exported.views.IColumnDescription; -import org.eclipse.emf.facet.common.ui.internal.exported.views.IElementsViewFactory; -import org.eclipse.emf.facet.custom.core.ICustomizationCatalogManager; -import org.eclipse.emf.facet.custom.core.ICustomizationCatalogManagerFactory; -import org.eclipse.emf.facet.custom.core.internal.exported.CustomizationUtils; -import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization; -import org.eclipse.emf.facet.custom.ui.internal.ImageProvider; -import org.eclipse.emf.facet.custom.ui.internal.Messages; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; -import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.ImageProvider; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.Messages; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.IOpenListener; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.OpenEvent; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views.IColumnDescription; +import org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views.IElementsViewFactory; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManager; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManagerFactory; +import org.eclipse.papyrus.emf.facet.custom.core.internal.exported.CustomizationUtils; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; import org.eclipse.swt.graphics.Image; public class CustomizationsCatalogView implements IExecutableExtensionFactory, IOpenListener { -- cgit v1.2.3