From 2e68a7b7c248b9292741762e64d6f0eac011001c Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Mon, 25 Aug 2014 16:02:46 +0200 Subject: [Code style] Apply clean-up profile to Papyrus Main plug-ins --- .../custom/ui/IContentPropertiesHandlerFactory.java | 2 +- .../custom/ui/ICustomizedContentProviderFactory.java | 2 +- .../custom/ui/ICustomizedLabelProviderFactory.java | 2 +- .../ui/IResolvingCustomizedLabelProviderFactory.java | 2 +- .../custom/ui/ISelectionPropertiesHandlerFactory.java | 2 +- .../papyrus/emf/facet/custom/ui/ImageUtils.java | 4 ++-- .../emf/facet/custom/ui/internal/Activator.java | 4 ++-- .../ui/internal/CustomizationCommandFactory.java | 14 +++++++------- .../ui/internal/CustomizedContentProviderFactory.java | 2 +- .../custom/ui/internal/CustomizedLabelDecorator.java | 6 +++--- .../custom/ui/internal/CustomizedLabelProvider.java | 18 +++++++++--------- .../ui/internal/CustomizedLabelProviderFactory.java | 2 +- .../ui/internal/CustomizedTreeContentProvider.java | 16 ++++++++-------- .../ui/internal/DecoratingCustomizedLabelProvider.java | 2 +- .../custom/ui/internal/DefaultCustomOverride.java | 4 ++-- .../emf/facet/custom/ui/internal/ImageManager.java | 6 +++--- .../emf/facet/custom/ui/internal/ImageProvider.java | 2 +- .../facet/custom/ui/internal/PropertiesHandler.java | 2 +- .../custom/ui/internal/PropertiesHandlerFactory.java | 2 +- .../ui/internal/ResolvingCustomizedLabelProvider.java | 4 ++-- .../ResolvingCustomizedLabelProviderFactory.java | 2 +- .../facet/custom/ui/internal/TreeElementAdapter.java | 4 ++-- .../custom/ui/internal/dialog/ColorLabelProvider.java | 2 +- .../ui/internal/dialog/LoadCustomizationsDialog.java | 16 ++++++++-------- .../dialog/LoadCustomizationsDialogFactory.java | 2 +- .../dialog/SynchronizedLoadCustomizationsDialog.java | 2 +- .../exported/ICustomizationCommandFactory.java | 6 +++--- .../exported/ILabelPropertiesHandlerFactory.java | 2 +- .../exported/dialog/ILoadCustomizationsDialog.java | 2 +- .../dialog/ILoadCustomizationsDialogFactory.java | 2 +- .../custom/ui/internal/query/BackgroundQuery.java | 2 +- .../custom/ui/internal/query/ForegroundQuery.java | 2 +- .../emf/facet/custom/ui/internal/query/ImageQuery.java | 2 +- .../ui/internal/query/ToolTipAlignmentQuery.java | 2 +- .../ui/internal/query/ToolTipBackgroundQuery.java | 2 +- .../custom/ui/internal/query/ToolTipShadowQuery.java | 2 +- .../custom/ui/internal/query/ToolTipTextQuery.java | 2 +- .../query/URIImageQueryImplementationFactory.java | 2 +- .../ui/internal/querytype/URIImageQueryEvaluator.java | 2 +- .../ui/internal/view/CustomizationsCatalogView.java | 10 +++++----- 40 files changed, 83 insertions(+), 83 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/IContentPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java index 84f31c19d46..2974daa3335 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 @@ -12,8 +12,8 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; /** * 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 00ad33eda6d..95da42c8c7c 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 @@ -13,8 +13,8 @@ package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedContentProviderFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedContentProviderFactory; /** * 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/ICustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java index 00e5d8b5426..323527db570 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 @@ -12,8 +12,8 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProviderFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProviderFactory; /** * This class is the factory allowing to get a instance of {@link ICustomizedLabelProvider}. 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 85c7606aea1..710933e217c 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 @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.ResolvingCustomizedLabelProviderFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.ResolvingCustomizedLabelProviderFactory; /** * 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/ISelectionPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java index 788472a6e0e..2d069557554 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 @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.papyrus.emf.facet.custom.ui; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; /** * 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 595bc85bc88..da4fdc43a1a 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 @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.papyrus.emf.facet.custom.ui; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage; 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; /** @@ -49,7 +49,7 @@ public final class ImageUtils { /** * Creates an {@link IImage} that wraps the given uri - * + * * @since 0.4 */ public static IImage wrap(final String uri) { 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 bfc649cc7ea..ea513089256 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 @@ -33,7 +33,7 @@ public class Activator extends AbstractUIPlugin { /* * (non-Javadoc) - * + * * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ @Override @@ -44,7 +44,7 @@ public class Activator extends AbstractUIPlugin { /* * (non-Javadoc) - * + * * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ @Override 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 be2be2ca435..1e3d5c88a49 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 @@ -21,6 +21,13 @@ 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.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; 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; @@ -32,13 +39,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Q 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/CustomizedContentProviderFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java index 0fb3af270e4..93e51439272 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 @@ -12,10 +12,10 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui.internal; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; 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 5520d0ef658..cce67e7f257 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 @@ -15,9 +15,6 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.ETypedElement; -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; @@ -26,6 +23,9 @@ 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.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.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 8b181392b24..dbd3499764f 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 @@ -33,15 +33,6 @@ 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.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; @@ -55,6 +46,15 @@ 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.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.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 1ac250dcf85..c945d530342 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 @@ -12,9 +12,9 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui.internal; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; 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 4b7d2039d84..34e9f7f3b67 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 @@ -30,14 +30,6 @@ 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.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; @@ -46,6 +38,14 @@ import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy. 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.TreeElement; import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeproxyFactory; +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; @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 3985d65f023..c339a77c462 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 @@ -11,11 +11,11 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.ETypedElement; -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.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; 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 93c15fc112d..89d896f3406 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 @@ -12,11 +12,11 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.EObject; +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.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 7c0df56b214..10708ebd87c 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 @@ -17,14 +17,14 @@ import java.util.Map; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.URI; +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.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 caae0ecf3da..0a3b73a5e82 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 @@ -16,9 +16,9 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import java.net.URL; -import org.eclipse.papyrus.emf.facet.util.core.Logger; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; +import org.eclipse.papyrus.emf.facet.util.core.Logger; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; 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 f9e7b980502..482e8939219 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 @@ -24,6 +24,7 @@ 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.papyrus.emf.facet.custom.core.ICustomizationManager; 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; @@ -32,7 +33,6 @@ 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 { 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 e92b4ff0c7f..22d09cf8d2c 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 @@ -14,13 +14,13 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; 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 { 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 8a475a68cbe..a4ad09bdbd9 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 @@ -11,14 +11,14 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal; import org.eclipse.emf.ecore.ETypedElement; -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.papyrus.emf.facet.custom.ui.CustomizedContentProviderUtils; +import org.eclipse.papyrus.emf.facet.custom.ui.ICustomizedLabelProvider; 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 abe9b091d0a..7a7ab3e886f 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 @@ -11,9 +11,9 @@ *******************************************************************************/ package org.eclipse.papyrus.emf.facet.custom.ui.internal; +import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; 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 0dc486badc8..65870956b96 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 @@ -14,13 +14,13 @@ 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.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; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exception.CustomizedContentProviderRuntimeException; +import org.eclipse.papyrus.emf.facet.util.core.DebugUtils; 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/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 d69d10ed029..8604051812c 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 @@ -11,10 +11,10 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; -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.papyrus.emf.facet.custom.ui.internal.ImageProvider; 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 d9f47239e3a..cc87a8ccd41 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 @@ -21,11 +21,6 @@ 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.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 +34,11 @@ 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.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.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -161,17 +161,17 @@ public class LoadCustomizationsDialog extends Dialog implements * private List filterForMetamodel( * final Collection allCustomizations, final Collection ePackages) { * List filteredCustomizations = new ArrayList(); - * + * * // show only Customizations corresponding to the current EPackages or * // referenced EPackages * final Set allReferencedPackages = new HashSet(); - * + * * for (EPackage ePackage : ePackages) { * allReferencedPackages.add(ePackage); * final Set referencedPackages = ModelUtils.computeReferencedPackages(ePackage); * allReferencedPackages.addAll(referencedPackages); * } - * + * * for (Customization metamodelView : Customization) { * String nsURI = metamodelView.getMetamodelURI(); * EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI); 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 67601e4c2b4..318a90ddb24 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 @@ -14,10 +14,10 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; import java.util.Collections; import java.util.List; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; 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 c208471226c..0a2515c1fbd 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 @@ -15,6 +15,7 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog; import java.util.List; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; 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; @@ -22,7 +23,6 @@ import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync.Abstr 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/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 f99d205ff96..e1d1305b7e7 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 @@ -13,13 +13,13 @@ 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.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; 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/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 b3ec8f602d7..7f831809a69 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 @@ -12,8 +12,8 @@ */ package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported; -import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory; /** * 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 18cd4c77296..d14b76cd615 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 @@ -14,8 +14,8 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog; import java.util.List; -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; +import org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception.IllegalParameterException; /** * 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 b5c3e0cbafc..3032ec67861 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 @@ -13,9 +13,9 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog; import java.util.List; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization; 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/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 ca2bbe3d435..cc5381e7049 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 @@ -13,12 +13,12 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; 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/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 f5ce1c4bbf4..69b5b3d4650 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 @@ -13,12 +13,12 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; 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 1cd3c7af587..5635b0427de 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 @@ -22,6 +22,7 @@ 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.papyrus.emf.facet.custom.metamodel.custompt.IImage; 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; @@ -30,7 +31,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribu import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.papyrus.emf.facet.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/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 256e4e37766..f4ed2a6d56a 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 @@ -15,11 +15,11 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment; 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 d6d2d9929d3..9125f609400 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 @@ -15,12 +15,12 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor; 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/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 3ae15c6ba9c..19081fe056f 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 @@ -15,11 +15,11 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow; 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 981efca51f7..5de26588ffd 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 @@ -16,12 +16,12 @@ 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.osgi.util.NLS; 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 76c82b3030d..593a46eca24 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 @@ -14,13 +14,13 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.query; import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.QueryPackage; 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 d5f9abcc494..cb67e77fb30 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 @@ -15,6 +15,7 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.querytype; import java.util.List; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.URIImageQuery; 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; @@ -22,7 +23,6 @@ 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 72812d77154..38ad8e09a70 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 @@ -25,11 +25,6 @@ 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.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; @@ -41,6 +36,11 @@ 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.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.swt.graphics.Image; public class CustomizationsCatalogView implements IExecutableExtensionFactory, IOpenListener { -- cgit v1.2.3