Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-08-21 11:43:07 +0000
committerCamille Letavernier2014-08-21 13:50:25 +0000
commitdbc038b44bcbb890ae256d15eb09eb285512f020 (patch)
tree757e736583eea3ae352ad9ac91a81df7e59b79ff /plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui
parentea48a20561464c3cbb7895d430583669a9f82fcc (diff)
downloadorg.eclipse.papyrus-dbc038b44bcbb890ae256d15eb09eb285512f020.tar.gz
org.eclipse.papyrus-dbc038b44bcbb890ae256d15eb09eb285512f020.tar.xz
org.eclipse.papyrus-dbc038b44bcbb890ae256d15eb09eb285512f020.zip
[Code style] Apply clean-up and formatter on Main plug-ins
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui')
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/CustomizedContentProviderUtils.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandler.java9
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IContentPropertiesHandlerFactory.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomOverride.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProvider.java11
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedContentProviderFactory.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProvider.java32
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedLabelProviderFactory.java11
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedToolTipLabelProvider.java10
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ICustomizedTreeContentProvider.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IFontPropertiesHandler.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandler.java2
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ISelectionPropertiesHandlerFactory.java2
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/ImageUtils.java11
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/Activator.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactory.java22
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedContentProviderFactory.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProvider.java76
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedLabelProviderFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java114
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/DefaultCustomOverride.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageManager.java2
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ImageProvider.java2
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandler.java25
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/PropertiesHandlerFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java56
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/TreeElementAdapter.java75
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/Color.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/ImageWrapper.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/custompt/URIImage.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/ColorLabelProvider.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java105
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java5
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java32
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/exported/exception/IllegalParameterException.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/BackgroundQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/DefaultVisibilityQuery.java18
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontNameQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/FontSizeQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ForegroundQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java20
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java11
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java8
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipDelayQuery.java6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipShadowQuery.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ToolTipTextQuery.java14
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java6
58 files changed, 424 insertions, 425 deletions
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 e60394c963f..d2742c1f0c9 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
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.
/**
* A companion utility class for {@link ICustomizedTreeContentProvider}
- *
+ *
* @since 0.2
*/
public final class CustomizedContentProviderUtils {
@@ -35,7 +35,7 @@ public final class CustomizedContentProviderUtils {
/**
* Replace proxy objects by their underlying model elements in the given selection
- *
+ *
* @return the unwrapped version of the selection
*/
public static ISelection resolveSelection(final ISelection selection) {
@@ -58,7 +58,7 @@ public final class CustomizedContentProviderUtils {
/**
* Resolve the given UI element into the underlying model element.
- *
+ *
* @param element
* a UI element, that may be a proxy for a model element
* @return the corresponding model element, or the given element if it is not a proxy
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 015ecff326b..1215c4bbfd7 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
@@ -1,26 +1,27 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
+ * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
*/
package org.eclipse.papyrus.emf.facet.custom.ui;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
/**
- *
+ *
* @since 0.2
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface IContentPropertiesHandler {
FacetOperation getIsVisible();
+
public FacetOperation getCollapseLink();
}
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 f812986fc6a..84f31c19d46 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -16,13 +16,13 @@ import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
- *
+ *
* @since 0.2
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface IContentPropertiesHandlerFactory {
-
+
IContentPropertiesHandlerFactory DEFAULT = new PropertiesHandlerFactory();
IContentPropertiesHandler createIContentPropertiesHandler(
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 99860f9941a..b9b74222e33 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider
*/
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 68dbf80603c..c4584e9cbdc 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -18,7 +18,7 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
* This interface allow to used a {@link IContentProvider} which is implemented
* and customizable using the EMF Facet customization mechanism.
- *
+ *
* @author Gregoire Dupe
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
@@ -28,9 +28,8 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
public interface ICustomizedContentProvider extends IContentProvider {
/**
* This method returns the customization manager used by the content provider. The
- * customization stack update have to be done using this
- * {@link ICustomizationManager}.
- *
+ * customization stack update have to be done using this {@link ICustomizationManager}.
+ *
* @return the customization manager used by the content provider.
*/
ICustomizationManager getCustomizationManager();
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 109da62630a..00ad33eda6d 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
@@ -18,11 +18,11 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
* This is a factory for {@link ICustomizedContentProvider} and {@link ICustomizedTreeContentProvider}.
- *
+ *
* @author Gregoire Dupe
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
- *
+ *
*/
public interface ICustomizedContentProviderFactory {
/**
@@ -32,7 +32,7 @@ public interface ICustomizedContentProviderFactory {
/**
* This method is used to instantiate a {@link ICustomizedContentProvider}
- *
+ *
* @param customizationMgr
* the customization manager which has to be used by the content provider.
* @return a content provider
@@ -44,7 +44,7 @@ public interface ICustomizedContentProviderFactory {
/**
* Instantiate an {@link ICustomizedTreeContentProvider}. With this content provider, your viewer's input has to be
* an EObject or an array or collection of EObjects.F
- *
+ *
* @param customManager
* the customization manager used by the content provider
* @return a tree content provider
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 e4d106e694e..dc309d9c2f8 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
@@ -22,39 +22,41 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
import org.eclipse.swt.graphics.Image;
/**
- * This interface allows to use a {@link ILabelProvider}, an
- * {@link IColorProvider} and an {@link IFontProvider} which is implemented and
+ * This interface allows to use a {@link ILabelProvider}, an {@link IColorProvider} and an {@link IFontProvider} which is implemented and
* customizable using the EMF Facet customization mechanism.
- *
+ *
* @author Gregoire Dupe
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface ICustomizedLabelProvider extends ILabelProvider,
- IColorProvider, IFontProvider , ICustomizedToolTipLabelProvider {
+ IColorProvider, IFontProvider, ICustomizedToolTipLabelProvider {
/**
* This method returns the customization manager used by the label provider. The
- * customization stack updates have to be done using this
- * {@link ICustomizationManager}.
- *
+ * customization stack updates have to be done using this {@link ICustomizationManager}.
+ *
* @return the customization manager used by the content provider.
*/
ICustomizationManager getCustomizationManager();
-
+
boolean isUnderlined(Object element, ETypedElement eTypedElement);
-
+
boolean isStruckthrough(Object element, ETypedElement eTypedElement);
-
+
Image getTopLeftOverlay(Object element, ETypedElement eTypedElement);
+
Image getTopMiddleOverlay(Object element, ETypedElement eTypedElement);
+
Image getTopRightOverlay(Object element, ETypedElement eTypedElement);
-
+
Image getBottomLeftOverlay(Object element, ETypedElement eTypedElement);
+
Image getBottomMiddleOverlay(Object element, ETypedElement eTypedElement);
+
Image getBottomRightOverlay(Object element, ETypedElement eTypedElement);
-
+
String getText(Object element, ETypedElement eTypedElement);
-
+
Image getImage(Object element, ETypedElement eTypedElement);
/**
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 13ffc43ad6b..00e5d8b5426 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -16,9 +16,8 @@ import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProviderF
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
- * This class is the factory allowing to get a instance of
- * {@link ICustomizedLabelProvider}.
- *
+ * This class is the factory allowing to get a instance of {@link ICustomizedLabelProvider}.
+ *
* @author Gregoire Dupe
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
@@ -28,7 +27,7 @@ public interface ICustomizedLabelProviderFactory {
/**
* This method is used to instantiate a {@link ICustomizedLabelProvider}.
- *
+ *
* @param customizationManager
* the customization manager which has to used by the content
* provider.
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 d102f9e2536..5390d6e6207 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Vincent Lorenzo (CEA-LIST) - Bug 372644 - Create Customizable tooltips for the TreeViewer using a CustomizableLabelProvider
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -19,9 +19,9 @@ import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
/**
- *
+ *
* This interface provides methods to customize tooltips
- *
+ *
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
@@ -60,7 +60,7 @@ public interface ICustomizedToolTipLabelProvider {
/**
* The style can be : SWT.LEFT, SWT.CENTER, SWT.RIGHT, SWT.SHADOW_IN, SWT.SHADOW_OUT, SWT.SHADOW_NONE.
- *
+ *
* @param element
* @return
*/
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 79522eee302..ffee6560d31 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
@@ -15,7 +15,7 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
* An {@link ITreeContentProvider} which is implemented and customizable using the EMF Facet customization mechanisms.
- *
+ *
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
* @since 0.2
@@ -24,7 +24,7 @@ public interface ICustomizedTreeContentProvider extends ITreeContentProvider {
/**
* This method returns the customization manager used by the content provider. Updates to the list of loaded
* customizations have to be done using the {@link ICustomizationManager} returned by this method.
- *
+ *
* @return the customization manager used by this content provider.
*/
ICustomizationManager getCustomizationManager();
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 8fe37afccf4..c00476f017e 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider
*/
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 50f81a2d034..85c7606aea1 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
@@ -16,7 +16,7 @@ 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
* resolved elements.
- *
+ *
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
* @since 0.2
@@ -26,7 +26,7 @@ public interface IResolvingCustomizedLabelProviderFactory {
/**
* This method is used to instantiate a {@link ICustomizedLabelProvider}.
- *
+ *
* @param customizationManager
* the customization manager which has to used by the content provider.
* @return a label provider
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 d69290795b2..06b72ce4a92 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
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.emf.facet.custom.ui;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
/**
- *
+ *
* @since 0.2
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
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 102521a3579..788472a6e0e 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
@@ -15,7 +15,7 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
* Factory for {@link ISelectionPropertiesHandler}
- *
+ *
* @since 0.2
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
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 ffd82786028..595bc85bc88 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
@@ -33,7 +33,7 @@ public final class ImageUtils {
/**
* Returns the SWT {@link Image} represented by this {@link IImage}
- *
+ *
* @param image
* the image to unwrap
* @return the SWT image, or <code>null</code> if the {@link IImage} doesn't wrap a SWT image
@@ -46,12 +46,13 @@ public final class ImageUtils {
}
return result;
}
-
- /**
- * Creates an {@link IImage} that wraps the given uri
+
+ /**
+ * Creates an {@link IImage} that wraps the given uri
+ *
* @since 0.4
*/
public static IImage wrap(final String uri) {
return new URIImage(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 75806da4db9..bfc649cc7ea 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
*/
@@ -24,7 +24,7 @@ public class Activator extends AbstractUIPlugin {
// The shared instance
private static Activator plugin;
-
+
/**
* The constructor
*/
@@ -33,6 +33,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -43,6 +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 c9a51fba50b..be2be2ca435 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -41,7 +41,7 @@ import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElemen
import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;
public class CustomizationCommandFactory implements ICustomizationCommandFactory {
-
+
private static final String CONFORM_ATT_NAME = "isConforming"; //$NON-NLS-1$
private final EditingDomain editingDomain;
private final ICommandFactory commandFactory;
@@ -71,17 +71,17 @@ public class CustomizationCommandFactory implements ICustomizationCommandFactory
eClassCustom,
EFacetPackage.eINSTANCE
.getFacet_ExtendedMetaclass(),
- customedEClass);
+ customedEClass);
resultCmd.append(linkToEClass);
if (conformanceQuery != null) {
final ICommandFactoryResult<FacetAttribute> attResult = createConformanceOperation(eClassCustom, conformanceQuery);
resultCmd.append(attResult.getCommand());
}
-
+
return ICommandFactoryResultFactory.DEFAULT.createCommandFactoryResult(resultCmd, eClassCustom);
}
- //TODO Move to FacetCommandFactory
+ // TODO Move to FacetCommandFactory
private ICommandFactoryResult<FacetAttribute> createConformanceOperation(final Facet facet, final Query query) {
final CompoundCommand resultCmd = new CompoundCommand("Creates a facet conformance attribute"); //$NON-NLS-1$
final FacetAttribute conformanceAtt = EFacetFactory.eINSTANCE.createFacetAttribute();
@@ -89,7 +89,7 @@ public class CustomizationCommandFactory implements ICustomizationCommandFactory
conformanceAtt.setEType(EcorePackage.eINSTANCE.getEBoolean());
conformanceAtt.setQuery(query);
conformanceAtt.setDerived(true);
-
+
final Command conformance = this.commandFactory.createSetCommand(this.editingDomain, facet, EFacetPackage.eINSTANCE.getFacet_ConformanceTypedElement(), conformanceAtt);
resultCmd.append(conformance);
final Command addToFacet = this.commandFactory.createAddCommand(this.editingDomain, facet, EFacetPackage.eINSTANCE.getFacet_FacetElements(), conformanceAtt);
@@ -113,7 +113,7 @@ public class CustomizationCommandFactory implements ICustomizationCommandFactory
customization,
CustomPackage.eINSTANCE
.getFacetCustomization_CustomizedFacet(),
- customizedFacet);
+ customizedFacet);
resultCmd.append(linkToFacet);
return ICommandFactoryResultFactory.DEFAULT.createCommandFactoryResult(resultCmd, eFacetCustom);
}
@@ -169,13 +169,13 @@ public class CustomizationCommandFactory implements ICustomizationCommandFactory
facetOperation.setEType(customProperty.getEType());
facetOperation.setLowerBound(customProperty.getLowerBound());
facetOperation.setUpperBound(customProperty.getUpperBound());
-
+
// add the "eStructuralFeature" EParameter that every customization operation must have
final EParameter eParameter = EcoreFactory.eINSTANCE.createEParameter();
eParameter.setName("eStructuralFeature"); //$NON-NLS-1$
eParameter.setEType(EcorePackage.eINSTANCE.getETypedElement());
facetOperation.getEParameters().add(eParameter);
-
+
final ETypedElementSwitchQuery switchQuery = CustomFactory.eINSTANCE.createETypedElementSwitchQuery();
// Link the instance of ETypedElementSwitchQuery to its parent
final Command switchToParent = this.commandFactory
@@ -219,7 +219,7 @@ public class CustomizationCommandFactory implements ICustomizationCommandFactory
final ETypedElement customizedTElt) {
ETypedElementCase caseToModify = null;
for (ETypedElementCase casee : switchQuery.getCases()) {
- //casee has to be null if we want to customize the EObject itself.
+ // casee has to be null if we want to customize the EObject itself.
if (casee.getCase() == null) {
if (customizedTElt == null) {
caseToModify = casee;
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 4a714c9a4ca..37ea25553b4 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
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 090bf6f0f8b..0fb3af270e4 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
* Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider
@@ -18,7 +18,7 @@ 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
+// @SuppressWarnings("deprecation") : Bug 380229 - [deprecated] ICustomizedContentProvider
public class CustomizedContentProviderFactory implements ICustomizedContentProviderFactory {
public ICustomizedContentProvider createCustomizedContentProvider(final ICustomizationManager customManager) {
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 164ef31b817..8b181392b24 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011, 2012, 2013 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
@@ -169,31 +169,31 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
result = object.toString();
}
- }
+ }
return result;
-
-//TODO Remove before to commit
-// if (structuralFeature.getUpperBound() == 1) {
-// final Object object = this.customManager.getFacetManager().get(eObject,
-// structuralFeature, Object.class);
-// result = getText(object);
-// } else {
-// final StringBuffer stringBuffer = new StringBuffer();
-// final List<Object> objects = this.customManager.getFacetManager()
-// .getMultiValued(eObject, structuralFeature, Object.class);
-// final Iterator<Object> objectsIter = objects.iterator();
-// while (objectsIter.hasNext()) {
-// final Object object = objectsIter.next();
-// stringBuffer.append(this.getText(object));
-// if (objectsIter.hasNext()) {
-// stringBuffer.append(", ");
-// }
-// }
-// result = stringBuffer.toString();
-// }
-//TODO (end)
- }
-
+
+ // TODO Remove before to commit
+ // if (structuralFeature.getUpperBound() == 1) {
+ // final Object object = this.customManager.getFacetManager().get(eObject,
+ // structuralFeature, Object.class);
+ // result = getText(object);
+ // } else {
+ // final StringBuffer stringBuffer = new StringBuffer();
+ // final List<Object> objects = this.customManager.getFacetManager()
+ // .getMultiValued(eObject, structuralFeature, Object.class);
+ // final Iterator<Object> objectsIter = objects.iterator();
+ // while (objectsIter.hasNext()) {
+ // final Object object = objectsIter.next();
+ // stringBuffer.append(this.getText(object));
+ // if (objectsIter.hasNext()) {
+ // stringBuffer.append(", ");
+ // }
+ // }
+ // result = stringBuffer.toString();
+ // }
+ // TODO (end)
+ }
+
@Override
public void addListener(final ILabelProviderListener listener) {
this.listeners.add(listener);
@@ -213,7 +213,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
public void removeListener(final ILabelProviderListener listener) {
this.listeners.remove(listener);
}
-
+
private static Color getColor(final RGB rgb) {
final Display display = Display.getDefault();
final IColorProvider colorProvider = IColorProviderFactory.DEFAULT
@@ -253,7 +253,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
.getOrCreateIFontProvider(Display.getDefault());
return fontProvider.getFont(fontData);
}
-
+
public Font getFont(final Object element) {
String fontName = getPropertyValue(element,
@@ -333,7 +333,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
}
return result;
}
-
+
private Image getImage(final Object element, final FacetOperation operation, final ETypedElement feature) {
final IImage iimage = getPropertyValue(element, operation, feature,
IImage.class);
@@ -376,7 +376,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
return getPropertyValue(element,
this.propertiesHandler.getToolTipTextProperty(), null, String.class);
}
-
+
@Override
public int getToolTipStyle(final Object element) {
int style = 0;
@@ -384,10 +384,10 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
this.propertiesHandler.getToolTipShadowProperty(), null,
Shadow.class);
switch (shadow) {
- case NONE :
+ case NONE:
style = SWT.SHADOW_NONE;
break;
- case IN :
+ case IN:
style = SWT.SHADOW_IN;
break;
case OUT:
@@ -396,7 +396,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
default:
throw new IllegalStateException("Un expected value"); //$NON-NLS-1$
}
-
+
final Alignment alignment = getPropertyValue(element,
this.propertiesHandler.getToolTipAlignmentProperty(), null,
Alignment.class);
@@ -413,16 +413,16 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
default:
throw new IllegalStateException("Un expected value"); //$NON-NLS-1$
}
-
+
return style;
}
-
+
@Override
public Image getToolTipImage(final Object element) {
return getPropertyValue(element,
this.propertiesHandler.getToolTipImageProperty(), null, Image.class);
}
-
+
@Override
public Color getToolTipBackgroundColor(final Object element) {
final IColor color = getPropertyValue(element,
@@ -430,7 +430,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
null, IColor.class);
return getColor(new RGB(color.getRed(), color.getGreen(), color.getBlue()));
}
-
+
@Override
public Color getToolTipForegroundColor(final Object element) {
final IColor color = getPropertyValue(element,
@@ -493,7 +493,7 @@ public class CustomizedLabelProvider extends CellLabelProvider implements
return getPropertyValue(element,
this.propertiesHandler.getToolTipTimeDisplayedProperty(), null,
Integer.class).intValue();
-
+
}
@Override
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 3c41a4d0d9e..1ac250dcf85 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
* David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented
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 df6273808ed..4b7d2039d84 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
@@ -11,7 +11,7 @@
* Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements()
* Christian W. Damus (CEA) - bug 430700
* Christian W. Damus (CEA) - bug 440795
- *
+ *
*******************************************************************************/
package org.eclipse.papyrus.emf.facet.custom.ui.internal;
@@ -59,10 +59,10 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
private class EObjectCacheElement {
- //Not null
+ // Not null
private final EObject element;
- //May be null
+ // May be null
private final TreeElement parent;
public EObjectCacheElement(EObject element, TreeElement parent) {
@@ -82,31 +82,31 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
@Override
public boolean equals(Object obj) {
- if(this == obj) {
+ if (this == obj) {
return true;
}
- if(obj == null) {
+ if (obj == null) {
return false;
}
- if(!(obj instanceof EObjectCacheElement)) {
+ if (!(obj instanceof EObjectCacheElement)) {
return false;
}
- EObjectCacheElement other = (EObjectCacheElement)obj;
- if(!getOuterType().equals(other.getOuterType())) {
+ EObjectCacheElement other = (EObjectCacheElement) obj;
+ if (!getOuterType().equals(other.getOuterType())) {
return false;
}
- if(element == null) {
- if(other.element != null) {
+ if (element == null) {
+ if (other.element != null) {
return false;
}
- } else if(!element.equals(other.element)) {
+ } else if (!element.equals(other.element)) {
return false;
}
- if(parent == null) {
- if(other.parent != null) {
+ if (parent == null) {
+ if (other.parent != null) {
return false;
}
- } else if(!parent.equals(other.parent)) {
+ } else if (!parent.equals(other.parent)) {
return false;
}
return true;
@@ -147,11 +147,11 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
// Index the existing elements
final Map<Object, Object> index = new IdentityHashMap<Object, Object>(elements.length + 1);
- if(this.rootElements != null) {
- for(Object next : this.rootElements) {
- if(next instanceof EObjectTreeElement) {
+ if (this.rootElements != null) {
+ for (Object next : this.rootElements) {
+ if (next instanceof EObjectTreeElement) {
// Maps to its tree-element proxy
- index.put(((EObjectTreeElement)next).getEObject(), next);
+ index.put(((EObjectTreeElement) next).getEObject(), next);
} else {
// Maps to itself
index.put(next, next);
@@ -159,16 +159,16 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
}
- for(final Object element : elements) {
- if(!isVisible(element, null)) {
+ for (final Object element : elements) {
+ if (!isVisible(element, null)) {
continue;
}
Object existing = index.get(element);
- if(existing != null) {
+ if (existing != null) {
// Just add it
elementList.add(existing);
- } else if(element instanceof EObject) {
+ } else if (element instanceof EObject) {
final EObjectTreeElement eObjectProxy = getEObjectProxy(element, null);
elementList.add(eObjectProxy);
} else {
@@ -181,7 +181,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
protected static EObjectTreeElement createEObjectProxy(final Object element, final TreeElement parent) {
- final EObject eObject = (EObject)element;
+ final EObject eObject = (EObject) element;
final EObjectTreeElement eObjectProxy = TreeproxyFactory.eINSTANCE.createEObjectTreeElement();
eObjectProxy.setEObject(eObject);
eObjectProxy.setParent(parent);
@@ -266,14 +266,14 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
private TreeElement getSingleValuedReferenceChild(final EReference eReference,
- final EObject eObject, final EReferenceTreeElement parent) {
+ final EObject eObject, final EReferenceTreeElement parent) {
TreeElement child = null;
if (parent.getReferedEObjectTE() == null || parent.getReferedEObjectTE().size() == 0) {
try {
final IFacetManager facetManager = this.customManager
- .getFacetManager();
+ .getFacetManager();
final EObject referedEObject = facetManager.getOrInvoke(
- eObject, eReference, EObject.class);
+ eObject, eReference, EObject.class);
if (referedEObject != null) {
child = getEObjectProxy(referedEObject, parent);
}
@@ -287,15 +287,15 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
private List<EObjectTreeElement> getMultiValuedReferenceChildren(
- final EReference eReference, final EObject eObject,
- final EReferenceTreeElement parent) {
+ final EReference eReference, final EObject eObject,
+ final EReferenceTreeElement parent) {
List<EObjectTreeElement> children = new ArrayList<EObjectTreeElement>();
if (parent.getReferedEObjectTE() == null || parent.getReferedEObjectTE().size() == 0) {
try {
final IFacetManager facetManager = this.customManager
- .getFacetManager();
+ .getFacetManager();
final List<Object> result = facetManager
- .getOrInvokeMultiValued(eObject, eReference, null);
+ .getOrInvokeMultiValued(eObject, eReference, null);
for (final Object object : result) {
if (object instanceof EObject) {
final EObject childEObject = (EObject) object;
@@ -327,7 +327,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
- if(oldInput != newInput) {
+ if (oldInput != newInput) {
cache.clear();
}
}
@@ -379,14 +379,14 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
Collection<Object> result = new LinkedList<Object>();
- for(EReference reference : allReferences) {
- if(isVisible(eObject, reference)) {
- if(collapseLink(eObject, reference)) {
- if(reference.getUpperBound() != 1) {
+ for (EReference reference : allReferences) {
+ if (isVisible(eObject, reference)) {
+ if (collapseLink(eObject, reference)) {
+ if (reference.getUpperBound() != 1) {
result.addAll(getMultiValuedReferenceChildren(reference, eObject, treeElement));
} else {
Object child = getSingleValuedReferenceChild(reference, eObject, treeElement);
- if(child != null) {
+ if (child != null) {
result.add(child);
}
}
@@ -414,10 +414,10 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
List<TreeElement> result = new LinkedList<TreeElement>();
- for(EAttribute eAttribute : allAttributes) {
- if(isVisible(eObject, eAttribute)) {
+ for (EAttribute eAttribute : allAttributes) {
+ if (isVisible(eObject, eAttribute)) {
TreeElement eAttributeTreeElement = getEAttributeProxy(eAttribute, treeElement);
- if(eAttributeTreeElement != null) {
+ if (eAttributeTreeElement != null) {
result.add(eAttributeTreeElement);
}
}
@@ -429,7 +429,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
private EReferenceTreeElement createReferenceProxy(final EReference reference, final EObjectTreeElement parent) {
final EObject eObject = parent.getEObject();
- if(isVisible(eObject, reference)) {
+ if (isVisible(eObject, reference)) {
final EReferenceTreeElement referenceProxy = TreeproxyFactory.eINSTANCE.createEReferenceTreeElement();
referenceProxy.setEReference(reference);
referenceProxy.setParent(parent);
@@ -440,7 +440,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
private EAttributeTreeElement createAttributeProxy(final EAttribute attribute, final EObjectTreeElement parent) {
final EObject eObject = parent.getEObject();
- if(isVisible(eObject, attribute)) {
+ if (isVisible(eObject, attribute)) {
final EAttributeTreeElement attributeProxy = TreeproxyFactory.eINSTANCE.createEAttributeTreeElement();
attributeProxy.setEAttribute(attribute);
attributeProxy.setParent(parent);
@@ -454,8 +454,8 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
try {
final IFacetManager facetManager = this.customManager.getFacetManager();
final Object result = facetManager.getOrInvoke(eObject, eReference, null);
- if(result instanceof EObject) {
- final EObject childEObject = (EObject)result;
+ if (result instanceof EObject) {
+ final EObject childEObject = (EObject) result;
child = getEObjectProxy(childEObject, parent);
}
} catch (final FacetManagerException e) {
@@ -469,9 +469,9 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
try {
final IFacetManager facetManager = this.customManager.getFacetManager();
final List<Object> result = facetManager.getOrInvokeMultiValued(eObject, eReference, null);
- for(final Object object : result) {
- if(object instanceof EObject) {
- final EObject childEObject = (EObject)object;
+ for (final Object object : result) {
+ if (object instanceof EObject) {
+ final EObject childEObject = (EObject) object;
children.add(getEObjectProxy(childEObject, parent));
}
}
@@ -482,27 +482,27 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
protected EObjectTreeElement getEObjectProxy(final Object element, final TreeElement parent) {
- EObjectCacheElement cacheElement = new EObjectCacheElement((EObject)element, parent);
- if(!(cache.containsKey(cacheElement))) {
+ EObjectCacheElement cacheElement = new EObjectCacheElement((EObject) element, parent);
+ if (!(cache.containsKey(cacheElement))) {
cache.put(cacheElement, createEObjectProxy(element, parent));
}
- return (EObjectTreeElement)cache.get(cacheElement);
+ return (EObjectTreeElement) cache.get(cacheElement);
}
protected EAttributeTreeElement getEAttributeProxy(final Object element, final TreeElement parent) {
- EObjectCacheElement cacheElement = new EObjectCacheElement((EObject)element, parent);
- if(!(cache.containsKey(cacheElement))) {
- cache.put(cacheElement, createAttributeProxy((EAttribute)element, (EObjectTreeElement)parent));
+ EObjectCacheElement cacheElement = new EObjectCacheElement((EObject) element, parent);
+ if (!(cache.containsKey(cacheElement))) {
+ cache.put(cacheElement, createAttributeProxy((EAttribute) element, (EObjectTreeElement) parent));
}
- return (EAttributeTreeElement)cache.get(cacheElement);
+ return (EAttributeTreeElement) cache.get(cacheElement);
}
protected EReferenceTreeElement getEReferenceProxy(final Object element, final EObjectTreeElement parent) {
- EObjectCacheElement cacheElement = new EObjectCacheElement((EObject)element, parent);
- if(!(cache.containsKey(cacheElement))) {
- cache.put(cacheElement, createReferenceProxy((EReference)element, parent));
+ EObjectCacheElement cacheElement = new EObjectCacheElement((EObject) element, parent);
+ if (!(cache.containsKey(cacheElement))) {
+ cache.put(cacheElement, createReferenceProxy((EReference) element, parent));
}
- return (EReferenceTreeElement)cache.get(cacheElement);
+ return (EReferenceTreeElement) cache.get(cacheElement);
}
public void dispose() {
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 adf0823c4e5..93c15fc112d 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* David Couvrand (Soft-Maint) - Bug 422058 - Implementation of strikethrough and underline in the CustomizedLabelProvider
*/
@@ -40,7 +40,7 @@ public class DefaultCustomOverride implements ICustomOverride {
final boolean isUnderlined = customManager.getCustomValueOf(
eObject, isUnderlinedProp, Boolean.class).booleanValue();
if (isUnderlined) {
- newResult = String.format("__%s__", newResult); //$NON-NLS-1$
+ newResult = String.format("__%s__", newResult); //$NON-NLS-1$
}
}
return newResult;
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 b260377a850..7c0df56b214 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
@@ -7,7 +7,7 @@
*
* Contributors:
* David Couvrand (Soft-Maint) - Bug 418418 - [Customization] Overlay icons not implemented
- * Thomas Cicognani (Soft-Maint) - Bug 424414 - ImageManager doesn't cache images
+ * Thomas Cicognani (Soft-Maint) - Bug 424414 - ImageManager doesn't cache images
*******************************************************************************/
package org.eclipse.papyrus.emf.facet.custom.ui.internal;
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 1e968f4339f..caae0ecf3da 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
@@ -67,7 +67,7 @@ public final class ImageProvider {
/**
* Create an image descriptor from a resource
- *
+ *
* @param resourcePath
* the path of the resource (in the bundle)
* @return the image descriptor
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 820771916c8..f9e7b980502 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
@@ -38,10 +38,10 @@ public class PropertiesHandler implements IContentPropertiesHandler,
ILabelPropertiesHandler, ISelectionPropertiesHandler, IFontPropertiesHandler {
private static final String SEPARATOR = "::"; //$NON-NLS-1$
private static final String CUSTOM_PROPERTIES = "resources/customproperties.efacet"; //$NON-NLS-1$
-
+
private static final String CUSTOM = "CustomizedEObject"; //$NON-NLS-1$
private static final String TT_CUSTOM = "CustomizedToolTipEObject"; //$NON-NLS-1$
-
+
private static final String IMAGE = "image"; //$NON-NLS-1$
private static final String LABEL = "label"; //$NON-NLS-1$
private static final String BACKGROUND = "background"; //$NON-NLS-1$
@@ -61,19 +61,19 @@ public class PropertiesHandler implements IContentPropertiesHandler,
private static final String BOTTOM_M_OVERLAY = "bottomMiddleOverlay"; //$NON-NLS-1$
private static final String BOTTOM_R_OVERLAY = "bottomRightOverlay"; //$NON-NLS-1$
private static final String SELECTION = "selection"; //$NON-NLS-1$
-
- //for tooltips
+
+ // for tooltips
private static final String TEXT = "text"; //$NON-NLS-1$
private static final String TIME_DISPLAYED = "timeDisplayed"; //$NON-NLS-1$
private static final String DISPLAY_DELAY = "displayDelayTime"; //$NON-NLS-1$
private static final String SHADOW = "shadow"; //$NON-NLS-1$
private static final String ALIGNMENT = "alignment"; //$NON-NLS-1$
-
+
private final Resource resource;
private final Map<String, FacetOperation> map = new HashMap<String, FacetOperation>();
/**
- *
+ *
* @deprecated Must be replaced by
* org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandler
* .PropertiesHandler(ICustomizationManager)
@@ -86,7 +86,7 @@ public class PropertiesHandler implements IContentPropertiesHandler,
.appendSegments(PropertiesHandler.CUSTOM_PROPERTIES.split("/")); //$NON-NLS-1$
this.resource = resourceSet.getResource(propertiesUri, true);
}
-
+
public PropertiesHandler(final ICustomizationManager customizationMgr) {
final String bundleName = Activator.getDefault().getBundle().getSymbolicName();
URI propertiesUri = URI.createPlatformPluginURI(bundleName, true);
@@ -119,17 +119,18 @@ public class PropertiesHandler implements IContentPropertiesHandler,
}
return result;
}
-
+
public FacetOperation getImageProperty() {
return getPropertyByName(PropertiesHandler.CUSTOM,
PropertiesHandler.IMAGE);
}
-
+
public FacetOperation getCollapseLink() {
return getPropertyByName(PropertiesHandler.CUSTOM,
PropertiesHandler.COLLAPSE_LINK);
}
+
public FacetOperation getLabelProperty() {
return getPropertyByName(PropertiesHandler.CUSTOM,
PropertiesHandler.LABEL);
@@ -209,7 +210,7 @@ public class PropertiesHandler implements IContentPropertiesHandler,
return getPropertyByName(PropertiesHandler.CUSTOM,
PropertiesHandler.BOTTOM_R_OVERLAY);
}
-
+
public FacetOperation getSelectionProperty() {
return getPropertyByName(PropertiesHandler.CUSTOM,
PropertiesHandler.SELECTION);
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 93dfc066a0a..e92b4ff0c7f 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
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 579ea41c864..8a475a68cbe 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
@@ -36,14 +36,14 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image image;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
image = this.delegate.getImage(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
image = this.delegate.getImage(parent.getEObject(), treeElement.getEAttribute());
- }
-
+ }
+
else {
image = this.delegate.getImage(CustomizedContentProviderUtils.resolve(element));
}
@@ -54,7 +54,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
String result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getText(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -102,7 +102,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
String result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipText(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -118,7 +118,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipImage(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -134,7 +134,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Font result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipFont(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -150,7 +150,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Color result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipBackgroundColor(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -166,7 +166,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Color result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipForegroundColor(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -182,7 +182,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipTopLeftOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -198,7 +198,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipTopMiddleOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -214,7 +214,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipTopRightOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -230,7 +230,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipBottomLeftOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -246,7 +246,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipBottomMiddleOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -262,7 +262,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipBottomRightOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -278,7 +278,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
int result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipTimeDisplayed(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -294,7 +294,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
int result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipDisplayDelayTime(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -310,7 +310,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
int result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getToolTipStyle(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -330,7 +330,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
boolean result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.isUnderlined(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -346,7 +346,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
boolean result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.isStruckthrough(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -362,7 +362,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getTopLeftOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -378,7 +378,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getTopMiddleOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -394,7 +394,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getTopRightOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -410,7 +410,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getBottomLeftOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -426,7 +426,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getBottomMiddleOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -442,7 +442,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getBottomRightOverlay(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -458,7 +458,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
String result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getText(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
@@ -474,7 +474,7 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
Image result;
if (element instanceof EReferenceTreeElement) {
final EReferenceTreeElement treeElement = (EReferenceTreeElement) element;
- final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
+ final EObjectTreeElement parent = treeElement.getParent();
result = this.delegate.getImage(parent.getEObject(), treeElement.getEReference());
} else if (element instanceof EAttributeTreeElement) {
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
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 6169e1e61c6..0dc486badc8 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
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.
public class TreeElementAdapter implements Adapter {
private static final boolean DEBUG = DebugUtils.getDebugStatus(Activator
- .getDefault());
+ .getDefault());
private final EObjectTreeElement treeElement;
@@ -35,52 +35,51 @@ public class TreeElementAdapter implements Adapter {
public void notifyChanged(final Notification notification) {
DebugUtils.debug(DEBUG,
- "Modified element=" + this.treeElement.getEObject()); //$NON-NLS-1$
+ "Modified element=" + this.treeElement.getEObject()); //$NON-NLS-1$
DebugUtils.debug(DEBUG,
- "Notification feature=" + notification.getFeature()); //$NON-NLS-1$
+ "Notification feature=" + notification.getFeature()); //$NON-NLS-1$
for (Object subElement : this.treeElement
- .getSfTreeElmement()) {
- if( subElement instanceof EStructuralFeatureTreeElement){
- final EStructuralFeature feature = getSF((EStructuralFeatureTreeElement)subElement);
- if (feature.equals(notification.getFeature())) {
- ((EStructuralFeatureTreeElement)subElement).getReferedEObjectTE().clear();
- DebugUtils.debug(
- DEBUG,
- NLS.bind(
- "Cleanning= {0}::{1}", //$NON-NLS-1$
- feature.getContainerClass().getName(),
- feature.getName()));
+ .getSfTreeElmement()) {
+ if (subElement instanceof EStructuralFeatureTreeElement) {
+ final EStructuralFeature feature = getSF((EStructuralFeatureTreeElement) subElement);
+ if (feature.equals(notification.getFeature())) {
+ ((EStructuralFeatureTreeElement) subElement).getReferedEObjectTE().clear();
+ DebugUtils.debug(
+ DEBUG,
+ NLS.bind("Cleanning= {0}::{1}", //$NON-NLS-1$
+ feature.getContainerClass().getName(),
+ feature.getName()));
+ }
}
}
}
-}
-private static EStructuralFeature getSF(
- final EStructuralFeatureTreeElement structFeatuteTE) {
- EStructuralFeature result;
- if (structFeatuteTE instanceof EAttributeTreeElement) {
- final EAttributeTreeElement eAttributeTE = (EAttributeTreeElement) structFeatuteTE;
- result = eAttributeTE.getEAttribute();
- } else if (structFeatuteTE instanceof EReferenceTreeElement) {
- final EReferenceTreeElement eReferenceTE = (EReferenceTreeElement) structFeatuteTE;
- result = eReferenceTE.getEReference();
- } else {
- throw new CustomizedContentProviderRuntimeException(
- "Illegal agrument: " + structFeatuteTE); //$NON-NLS-1$
+ private static EStructuralFeature getSF(
+ final EStructuralFeatureTreeElement structFeatuteTE) {
+ EStructuralFeature result;
+ if (structFeatuteTE instanceof EAttributeTreeElement) {
+ final EAttributeTreeElement eAttributeTE = (EAttributeTreeElement) structFeatuteTE;
+ result = eAttributeTE.getEAttribute();
+ } else if (structFeatuteTE instanceof EReferenceTreeElement) {
+ final EReferenceTreeElement eReferenceTE = (EReferenceTreeElement) structFeatuteTE;
+ result = eReferenceTE.getEReference();
+ } else {
+ throw new CustomizedContentProviderRuntimeException(
+ "Illegal agrument: " + structFeatuteTE); //$NON-NLS-1$
+ }
+ return result;
}
- return result;
-}
-public Notifier getTarget() {
- return null;
-}
+ public Notifier getTarget() {
+ return null;
+ }
-public void setTarget(final Notifier newTarget) {
- // Nothing to do
-}
+ public void setTarget(final Notifier newTarget) {
+ // Nothing to do
+ }
-public boolean isAdapterForType(final Object type) {
- return false;
-}
+ public boolean isAdapterForType(final Object type) {
+ return false;
+ }
}
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 f6eff6490c0..e5d1474cf1f 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
*/
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 ad12b304653..b02236e7ac4 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
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 d086010c012..0ce0160d37d 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
@@ -17,10 +17,10 @@ import java.io.InputStream;
import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
public class URIImage implements IImage {
-
+
private static final long serialVersionUID = 6801140731857137834L;
private String uri;
-
+
public URIImage(final String uri) {
this.uri = uri;
}
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 37801c148ef..d69d10ed029 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
@@ -49,7 +49,7 @@ public class ColorLabelProvider extends LabelProvider implements IColorProvider
public Color getForeground(final Object element) {
Color result = null;
if (this.loadCustomDialog.getLockedCustoms().contains(element)) {
- result = Display.getDefault().getSystemColor(SWT.COLOR_DARK_GRAY);
+ result = Display.getDefault().getSystemColor(SWT.COLOR_DARK_GRAY);
}
return result;
}
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 fee5ff7662f..d9f47239e3a 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
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.emf.facet.custom.ui.internal.dialog;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.ListIterator;
@@ -83,7 +82,7 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
}
public Object[] getChildren(final Object parentElement) {
- return new Object[]{};
+ return new Object[] {};
}
public Object getParent(final Object element) {
@@ -110,7 +109,7 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
private final String lockMsg;
public LoadCustomizationsDialog(final Shell parent,
- final List<Customization> availableCustomizations,
+ final List<Customization> availableCustomizations,
final List<Customization> selectedCustoms,
final List<Customization> lockedCustoms,
final IDialogCallbackWithPreCommit<List<Customization>, Boolean, D> callback,
@@ -148,53 +147,53 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
this.selectedCustomizations.add(lockedCustom);
}
}
-//TODO: Remove before to commit
-// LoadCustomizationsDialog.this.availableCustomizationsTreeViewer
-// .refresh();
-// LoadCustomizationsDialog.this.selectedCustomizationsTreeViewer
-// .refresh();
-//TODO(end): Remove before to commit
+ // TODO: Remove before to commit
+ // LoadCustomizationsDialog.this.availableCustomizationsTreeViewer
+ // .refresh();
+ // LoadCustomizationsDialog.this.selectedCustomizationsTreeViewer
+ // .refresh();
+ // TODO(end): Remove before to commit
}
- //TODO Remove before to commit
+ // TODO Remove before to commit
/** Keep only customizations that apply to the given metamodel */
/*
- private List<Customization> filterForMetamodel(
- final Collection<Customization> allCustomizations, final Collection<EPackage> ePackages) {
- List<Customization> filteredCustomizations = new ArrayList<Customization>();
-
- // show only Customizations corresponding to the current EPackages or
- // referenced EPackages
- final Set<EPackage> allReferencedPackages = new HashSet<EPackage>();
-
- for (EPackage ePackage : ePackages) {
- allReferencedPackages.add(ePackage);
- final Set<EPackage> referencedPackages = ModelUtils.computeReferencedPackages(ePackage);
- allReferencedPackages.addAll(referencedPackages);
- }
-
- for (Customization metamodelView : Customization) {
- String nsURI = metamodelView.getMetamodelURI();
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
- while (ePackage != null) {
- if (allReferencedPackages.contains(ePackage)) {
- filteredCustomizations.add(metamodelView);
- break;
- }
- // allow customizations on Facets
- if (ePackage instanceof FacetSet) {
- FacetSet facetSet = (FacetSet) ePackage;
- ePackage = facetSet.getExtendedPackage();
- } else {
- // allow customizations on sub-packages
- ePackage = ePackage.getESuperPackage();
- }
- }
- }
- return filteredCustomizations;
- }
- */
- //TODO (end) Remove before to commit
+ * private List<Customization> filterForMetamodel(
+ * final Collection<Customization> allCustomizations, final Collection<EPackage> ePackages) {
+ * List<Customization> filteredCustomizations = new ArrayList<Customization>();
+ *
+ * // show only Customizations corresponding to the current EPackages or
+ * // referenced EPackages
+ * final Set<EPackage> allReferencedPackages = new HashSet<EPackage>();
+ *
+ * for (EPackage ePackage : ePackages) {
+ * allReferencedPackages.add(ePackage);
+ * final Set<EPackage> referencedPackages = ModelUtils.computeReferencedPackages(ePackage);
+ * allReferencedPackages.addAll(referencedPackages);
+ * }
+ *
+ * for (Customization metamodelView : Customization) {
+ * String nsURI = metamodelView.getMetamodelURI();
+ * EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
+ * while (ePackage != null) {
+ * if (allReferencedPackages.contains(ePackage)) {
+ * filteredCustomizations.add(metamodelView);
+ * break;
+ * }
+ * // allow customizations on Facets
+ * if (ePackage instanceof FacetSet) {
+ * FacetSet facetSet = (FacetSet) ePackage;
+ * ePackage = facetSet.getExtendedPackage();
+ * } else {
+ * // allow customizations on sub-packages
+ * ePackage = ePackage.getESuperPackage();
+ * }
+ * }
+ * }
+ * return filteredCustomizations;
+ * }
+ */
+ // TODO (end) Remove before to commit
@Override
protected void configureShell(final Shell shell) {
@@ -220,7 +219,7 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
createLoadRequiredFacetsCheckbox(contents);
this.availableCustomizationsTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
-
+
public void doubleClick(final DoubleClickEvent event) {
loadSelectedCustoms();
}
@@ -372,7 +371,7 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
dialog.open();
}
removeFromSelection(toBeRemoved);
- refresh();
+ refresh();
}
protected void removeFromSelection(final List<Customization> toBeRemoved) {
@@ -434,10 +433,10 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
this.availableCustomizationsTreeViewer.setInput(this.availableCustoms);
- //TODO Remove before to commit
-// final TreeItem treeItem = new TreeItem(availableCustomizationsTree, SWT.NONE);
-// treeItem.setText(Messages.LoadCustomizationsDialog_Loading);
- //TODO (end) Remove before to commit
+ // TODO Remove before to commit
+ // final TreeItem treeItem = new TreeItem(availableCustomizationsTree, SWT.NONE);
+ // treeItem.setText(Messages.LoadCustomizationsDialog_Loading);
+ // TODO (end) Remove before to commit
patternText.addModifyListener(new ModifyListener() {
public void modifyText(final ModifyEvent event) {
@@ -641,7 +640,7 @@ public class LoadCustomizationsDialog<D> extends Dialog implements
public void selectSelectedCustom(final Customization customization) {
final ISelection selection = new StructuredSelection(customization);
this.selectedCustomizationsTreeViewer.setSelection(selection);
-
+
}
public List<Customization> getLockedCustoms() {
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 d49af6c65f2..67601e4c2b4 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
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 372fd032c66..c208471226c 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
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 d487ca4cd3e..4b33e65a38c 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
@@ -1,12 +1,11 @@
-
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
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 388ee7b7a6a..f99d205ff96 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
@@ -25,7 +25,7 @@ public interface ICustomizationCommandFactory {
ICommandFactoryResult<Customization> createCustomization(
String name);
-
+
ICommandFactoryResult<EClassCustomization> createEClassCustomization(
Customization customization, EClass customedEClass, Query conformanceQuery);
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 22e5a1b7570..cd6db8e91fb 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
@@ -18,7 +18,7 @@ import org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported.ICommandFac
public interface ICustomizationCommandFactoryFactory {
ICustomizationCommandFactoryFactory DEFAULT = new CustomizationCommandFactoryFactory();
-
+
ICustomizationCommandFactory createCustomizationCommandFactory(
EditingDomain editingDomain, ICommandFactory commandFactory);
}
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 e67e69d76dd..13b30fae782 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.emf.facet.custom.ui.internal.exported;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
/**
- *
+ *
* @since 0.2
*
*/
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 7c2788767c7..b3ec8f602d7 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -16,12 +16,12 @@ import org.eclipse.papyrus.emf.facet.custom.ui.internal.PropertiesHandlerFactory
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
/**
- *
+ *
* @since 0.2
*
*/
public interface ILabelPropertiesHandlerFactory {
-
+
ILabelPropertiesHandlerFactory DEFAULT = new PropertiesHandlerFactory();
ILabelPropertiesHandler createLabelPropertiesHandler(
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 fe493345953..18cd4c77296 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
* Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customizatio
/**
* A dialog to load {@link Customization}s.
- *
+ *
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
* @since 0.2.0
@@ -28,7 +28,7 @@ public interface ILoadCustomizationsDialog<D> {
/**
* Opens the dialog and blocks until it closes.
- *
+ *
* @return the dialog's return code
*/
int open();
@@ -38,7 +38,7 @@ public interface ILoadCustomizationsDialog<D> {
/**
* Emulate a press on the OK button
- *
+ *
* @since 0.2
*/
D pressOk();
@@ -64,13 +64,12 @@ public interface ILoadCustomizationsDialog<D> {
/**
* This method is used to add a customization on the top of the
* customization stack.
- *
+ *
* @param customization
* must be one element of the list returned by {@link
* ICustomizationLoaderDialo.getAvailableCustomizations()}
* @throws IllegalParameterException
- * when the parameter is not one element of the list returned by
- * {@link
+ * when the parameter is not one element of the list returned by {@link
* ICustomizationLoaderDialo.getAvailableCustomizations()}
*/
void addCustomization(Customization customization)
@@ -79,7 +78,7 @@ public interface ILoadCustomizationsDialog<D> {
/**
* This method is used to add customizations on the top of the customization
* stack.
- *
+ *
* @param customizations
* must be one element of the list returned by {@link
* ICustomizationLoaderDialo.getAvailableCustomizations()}
@@ -93,20 +92,19 @@ public interface ILoadCustomizationsDialog<D> {
/**
* This method is used to remove a customization from the list.
- *
+ *
* @param customization
* must be one element of the list returned by {@link
* ICustomizationLoaderDialo.getSelectedCustomizations()}
* @throws IllegalParameterException
- * when the parameter is not one element of the list returned by
- * {@link ICustomizationLoaderDialo.getSelectedCustomizations()}
+ * when the parameter is not one element of the list returned by {@link ICustomizationLoaderDialo.getSelectedCustomizations()}
*/
void removeCustomization(Customization customization)
throws IllegalParameterException;
/**
* This method is used to remove a list of customization from the list.
- *
+ *
* @param customizations
* must be one element of the list returned by {@link
* ICustomizationLoaderDialo.getSelectedCustomizations()}
@@ -131,7 +129,7 @@ public interface ILoadCustomizationsDialog<D> {
/**
* The intersection between getSelectedCustomizations() and
* getAvailableCustomizations') has to be empty.
- *
+ *
* @return the customizations selected using the dialog.
*/
List<Customization> getSelectedCustomizations();
@@ -139,14 +137,14 @@ public interface ILoadCustomizationsDialog<D> {
/**
* The intersection between getSelectedCustomizations() and
* getAvailableCustomizations') has to be empty.
- *
+ *
* @return the available and not yet selected customizations
*/
List<Customization> getAvailableCustomizations();
/**
* This method is used to push up a customization.
- *
+ *
* @param customization
* a selected customization.
* @throws IllegalParameterException
@@ -157,7 +155,7 @@ public interface ILoadCustomizationsDialog<D> {
/**
* This method is used to push down a customization.
- *
+ *
* @param customization
* a selected customization.
* @throws IllegalParameterException
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 0f8bd3653e8..b5c3e0cbafc 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
*/
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Shell;
/**
* Factory for {@link ILoadCustomizationsDialog}.
- *
+ *
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
* @since 0.2.0
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 3b1792de8bc..cb4d1e6de72 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2011 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
*/
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 d445e56c5bb..ca2bbe3d435 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/DefaultVisibilityQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/DefaultVisibilityQuery.java
index 5df7496103b..c569b36df6d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/DefaultVisibilityQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/DefaultVisibilityQuery.java
@@ -38,31 +38,31 @@ public class DefaultVisibilityQuery implements IJavaQuery2<EObject, Boolean> {
public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
ParameterValue paramValue = parameterValues.getParameterValueByName("eStructuralFeature");
- if(paramValue == null) {
+ if (paramValue == null) {
return true;
}
- EStructuralFeature feature = (EStructuralFeature)paramValue.getValue();
+ EStructuralFeature feature = (EStructuralFeature) paramValue.getValue();
- if(feature == null) {
+ if (feature == null) {
return true;
}
- if(feature instanceof EAttribute) {
+ if (feature instanceof EAttribute) {
return false;
}
- if(feature instanceof FacetReference) {
+ if (feature instanceof FacetReference) {
return true;
}
- if(feature instanceof EReference) {
+ if (feature instanceof EReference) {
Object value = source.eGet(feature);
- if(value == null) {
+ if (value == null) {
return false;
}
- if(value instanceof Collection<?>) {
- return !((Collection<?>)value).isEmpty();
+ if (value instanceof Collection<?>) {
+ return !((Collection<?>) value).isEmpty();
}
}
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 d383da278c7..00ae52de7e0 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
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 0d2f5e4abcd..246bc22d38d 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
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 c29d8c816b6..f5ce1c4bbf4 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012 Mia-Software.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
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 5c9a88c06d8..1cd3c7af587 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
@@ -57,25 +57,25 @@ public class ImageQuery implements IJavaQuery2<EObject, IImage> {
IImage result = null;
final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
+
try {
- final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);
- if(itemLabelProvider != null) {
+ final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(source, IItemLabelProvider.class);
+ if (itemLabelProvider != null) {
Object imageObject = itemLabelProvider.getImage(source);
Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);
result = new ImageWrapper(image);
-//// final ImageDescriptor imgDescriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(source);
-// final IImageProvider imgProvider = IImageProviderFactory.DEFAULT.createIImageProvider(Activator.getDefault());
-// if(imgDescriptor != null) {
-// final Image image = imgProvider.getImage(imgDescriptor);
-// result = new ImageWrapper(image);
-// }
+ // // final ImageDescriptor imgDescriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(source);
+ // final IImageProvider imgProvider = IImageProviderFactory.DEFAULT.createIImageProvider(Activator.getDefault());
+ // if(imgDescriptor != null) {
+ // final Image image = imgProvider.getImage(imgDescriptor);
+ // result = new ImageWrapper(image);
+ // }
}
} finally {
// Dispose the adapter factory because it added an adapter that would leak, as it will never be reused
adapterFactory.dispose();
}
-
+
return result;
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java
index 8e5e5b7d05a..9961cae90ec 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
@@ -48,14 +48,14 @@ public class LabelQuery implements IJavaQuery2<EObject, String> {
if (sfParam == null) {
final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
+
try {
- final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);
+ final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(source, IItemLabelProvider.class);
// We don't want to use a ReflectiveItemProvider because it provides
// a string prefixed with the eObject's meta-class name.
- if(itemLabelProvider instanceof ReflectiveItemProvider) {
+ if (itemLabelProvider instanceof ReflectiveItemProvider) {
result = LabelQuery.getDefaultName(source);
- } else if(itemLabelProvider == null) {
+ } else if (itemLabelProvider == null) {
result = ModelUtils.getDefaultName(source);
} else {
result = itemLabelProvider.getText(source);
@@ -94,8 +94,7 @@ public class LabelQuery implements IJavaQuery2<EObject, String> {
}
/**
- * @return a default name based on a string feature of the given
- * {@link EObject}
+ * @return a default name based on a string feature of the given {@link EObject}
*/
// from org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils
public static String getDefaultName(final EObject eObject) {
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 100babe0511..256e4e37766 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
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Alignment;
/**
- *
+ *
* This query is used to get the default alignment for the tooltip texts
*
*/
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 8b852224a6c..d6d2d9929d3 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
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,19 +23,19 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IColor;
/**
- *
+ *
* This query is used to get the default background color for the tooltips (255,255,225)
*
*/
public class ToolTipBackgroundQuery implements IJavaQuery2<EObject, IColor> {
private static final int BCK_GND_BLUE = 225;
-
+
public IColor evaluate(final EObject source,
final IParameterValueList2 parameterValues,
final IFacetManager facetManager)
throws DerivedTypedElementException {
- //default yellow background for tooltip
+ // default yellow background for tooltip
return new Color(Color.MAX_VALUE, Color.MAX_VALUE, ToolTipBackgroundQuery.BCK_GND_BLUE);
}
}
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 2cc5e483f49..b3654390346 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
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,8 +20,8 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
/**
- *
- * This query is used to get the default time for the tooltips
+ *
+ * This query is used to get the default time for the tooltips
*
*/
public class ToolTipDelayQuery implements IJavaQuery2<EObject, Integer> {
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 1f22edac96a..3ae15c6ba9c 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
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt.Shadow;
/**
- *
+ *
* This query is used to get the default shadow for the tooltips
*
*/
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 27e240f2f91..981efca51f7 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
@@ -1,14 +1,14 @@
/*******************************************************************************
* Copyright (c) 2012 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Vincent Lorenzo (CEA-LIST) - Bug 373255 - Add tooltips providing a documentation for the selected elements in the Select ETypedElement Dialog
- *
+ *
*******************************************************************************/
package org.eclipse.papyrus.emf.facet.custom.ui.internal.query;
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.osgi.util.NLS;
/**
- *
+ *
* This query returns the tooltip to display for DocumentedElement and
* EModelElement
- *
+ *
*/
public class ToolTipTextQuery implements IJavaQuery2<EObject, String> {
@@ -47,13 +47,13 @@ public class ToolTipTextQuery implements IJavaQuery2<EObject, String> {
final String documentation = getDocumentation(source);
if (documentation != null) {
result = NLS.bind(Messages.ToolTipTextQuery_Documentation,
- documentation);
+ documentation);
}
return result;
}
/**
- *
+ *
* @param source
* @param parameterValues
* @param facetManager
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 7f4d3fc7ce7..76c82b3030d 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
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 846552c83a3..d5f9abcc494 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
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2013 Soft-Maint.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* 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
@@ -49,5 +49,5 @@ public class URIImageQueryEvaluator implements IQueryImplementation {
final String uri = ((URIImageQuery) query).getUri();
return new URIImage(uri);
}
-
+
}

Back to the top