diff options
| author | Benoit Maggi | 2018-06-01 08:08:28 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2018-06-01 09:33:22 +0000 |
| commit | c39d2473c9c273c84cae8fd1208d49bb4c4a5695 (patch) | |
| tree | e6983b779e98564c9d848272cb11bd2bedc34587 /plugins | |
| parent | ef46a8f6f3acb600bc62e0eda549fba86f20eb4b (diff) | |
| download | org.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.tar.gz org.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.tar.xz org.eclipse.papyrus-c39d2473c9c273c84cae8fd1208d49bb4c4a5695.zip | |
Bug 528895 - [Quality] Field modifier should follow convention order
- use correct order for field modifier
- add missing header
- replace C<>line by Celine
Change-Id: I2608484da46215dbd65a1e85d47d0aa7706feb58
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'plugins')
148 files changed, 364 insertions, 349 deletions
diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java index bf65ae957fc..b903fe98bae 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java @@ -29,10 +29,10 @@ public interface IBuildEditor extends IFileEditor { * @Deprecated The build key should be specified for each IBuildEditor instance */ @Deprecated - public final static String BUILD_KEY = "bin.includes"; //$NON-NLS-1$ + public static final String BUILD_KEY = "bin.includes"; //$NON-NLS-1$ /** key for the source folders */ - public final static String SOURCE_FOLDER_KEY = "source.."; //$NON-NLS-1$ + public static final String SOURCE_FOLDER_KEY = "source.."; //$NON-NLS-1$ /** key for the bin folders */ public static final String BIN_KEY = "bin.."; //$NON-NLS-1$ diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java index 0aa5cffd5f5..32a50867101 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java @@ -33,7 +33,7 @@ public class JavaQueryConstraint extends AbstractConstraint { /** * The Java Class property */ - public final static String QUERY_CLASS_NAME_PROPERTY = "className"; //$NON-NLS-1$ + public static final String QUERY_CLASS_NAME_PROPERTY = "className"; //$NON-NLS-1$ private JavaQuery query = new FalseQuery(); diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java index 050810aba81..49aa26b5ebe 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java @@ -25,7 +25,6 @@ public class TrueConstraint extends AbstractConstraint { @Override protected boolean equivalent(Constraint constraint) { - // return constraint != null && constraint instanceof TrueConstraint; return false; // TrueConstraint is always true ; it shouldn't override another "always true" constraint } diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java index 072fe8e856b..a05d3ae9f69 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java @@ -40,7 +40,7 @@ public class ConstraintsManager { /** * The Constraints extension point ID */ - public final static String EXTENSION_ID = Activator.PLUGIN_ID + ".ConstraintEnvironment"; //$NON-NLS-1$ + public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".ConstraintEnvironment"; //$NON-NLS-1$ private ResourceSet resourceSet; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java index 523b761f09f..2ffa2d63a04 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java @@ -1,6 +1,16 @@ -/** +/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL * - */ + * + * 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * + *****************************************************************************/ package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; import org.eclipse.emf.transaction.RecordingCommand; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java index 5bbb386d710..e81460b10ea 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java @@ -64,7 +64,7 @@ public abstract class AbstractPanelModel extends AbstractModel implements IAbstr * @param tabItem * @return */ - abstract protected TabFolderModel lookupTabFolder(IPageModel tabItem); + protected abstract TabFolderModel lookupTabFolder(IPageModel tabItem); } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java index 0357b6187e3..ec5f0bbfda0 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java @@ -113,7 +113,7 @@ public abstract class AbstractMultiPageSashEditor extends EditorPart implements * Subclass must implements this method. It should return the provider used by the editor. * */ - abstract protected ISashWindowsContentProvider createPageProvider(); + protected abstract ISashWindowsContentProvider createPageProvider(); /** * Handles a property change notification from a nested editor. The default implementation simply forwards the change to diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java index 59e73bd7e9c..594d6b9f483 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java @@ -135,7 +135,7 @@ public abstract class AbstractTabFolderPart extends AbstractPanelPart { * the index of the page * @return the editor for the specified page, or <code>null</code> if the specified page was not created with <code>addPage(IEditorPart,IEditorInput)</code> */ - // abstract protected IEditorPart getEditor(int pageIndex); + // protected abstract IEditorPart getEditor(int pageIndex); /** * Returns the service locator for the given page index. This method can be used to create service locators for pages that are just controls. The @@ -465,12 +465,12 @@ public abstract class AbstractTabFolderPart extends AbstractPanelPart { // /** // * // */ - // abstract protected void firePropertyChange(int propertyId); + // protected abstract void firePropertyChange(int propertyId); // // /** // * // */ - // abstract protected IEditorSite getEditorSite(); + // protected abstract IEditorSite getEditorSite(); } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java index bcc1fc747ce..6180c2b0ae5 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java @@ -269,7 +269,7 @@ public abstract class MultiPageEditor extends MultiPageEditorPart { * Subclass must implements this method. It should return the provider used by the editor. * */ - abstract protected ISashWindowsContentProvider createPageProvider(); + protected abstract ISashWindowsContentProvider createPageProvider(); /** * Refresh the tabs order. diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java index 40c057e37ba..341699de61d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java @@ -73,7 +73,7 @@ public abstract class AbstractBaseModel extends AbstractModel implements IVersio * * @return */ - abstract protected String getModelFileExtension(); + protected abstract String getModelFileExtension(); /** * Return true if the resource is set, false otherwise. When the resource is diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java index fc78dc5e481..aa9f6b49324 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java @@ -38,13 +38,13 @@ public class ExtensionServicesRegistry extends ServicesRegistry { protected String extensionPointNamespace; /** Extension point name inside the extension description **/ - public final static String SERVICE_EXTENSIONPOINT = "service"; + public static final String SERVICE_EXTENSIONPOINT = "service"; /** ServiceFactory Extension point **/ - public final static String SERVICE_FACTORY_ELEMENT_NAME = "serviceFactory"; + public static final String SERVICE_FACTORY_ELEMENT_NAME = "serviceFactory"; /** constant for the attribute factoryClass **/ - public final static String CONTEXTCLASS_ATTRIBUTE = "contextClass"; + public static final String CONTEXTCLASS_ATTRIBUTE = "contextClass"; /** extension point propertyname */ private final static String STARTKIND_PROPERTY = "startKind"; diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java index 4e5b6dd6334..eae5d5958b3 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfigurationAcce import org.eclipse.xtext.ui.editor.utils.TextStyle; public class CSSHighlightingConfiguration extends DefaultHighlightingConfiguration { - public final static String DECLARATIONNAME = "DeclarationName"; - public final static String SELECTOR = "Selector"; - public final static String ELEMENT = "ELEMENT"; - public final static String URL = "Url"; - public final static String FUNCTION = "Function"; + public static final String DECLARATIONNAME = "DeclarationName"; + public static final String SELECTOR = "Selector"; + public static final String ELEMENT = "ELEMENT"; + public static final String URL = "Url"; + public static final String FUNCTION = "Function"; @Override public void configure(IHighlightingConfigurationAcceptor acceptor) { diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java index f102778dc27..f2b1051d0c6 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java @@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype; public class InducedRepresentationCreationEditPolicy extends GraphicalEditPolicy { /** constant for this edit policy role */ - public final static String INDUCED_REPRESENTATION_CREATOR_EDITPOLICY = "InducedRepresentationCreationEditPolicy"; //$NON-NLS-1$ + public static final String INDUCED_REPRESENTATION_CREATOR_EDITPOLICY = "InducedRepresentationCreationEditPolicy"; //$NON-NLS-1$ /** manager for notifications: should the compartment react to the notification? */ protected NotificationManager notificationManager; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/IDirectEditorConfigurationIds.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/IDirectEditorConfigurationIds.java index 128249cac03..b7365fe1779 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/IDirectEditorConfigurationIds.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/IDirectEditorConfigurationIds.java @@ -21,7 +21,7 @@ package org.eclipse.papyrus.extensionpoints.editors.definition; public interface IDirectEditorConfigurationIds { /** id of the direct editor configuration extension point */ - public final static String DIRECT_EDITOR_CONFIGURATION_EXTENSION_ID = org.eclipse.papyrus.extensionpoints.editors.Activator.PLUGIN_ID + ".DirectEditor"; + public static final String DIRECT_EDITOR_CONFIGURATION_EXTENSION_ID = org.eclipse.papyrus.extensionpoints.editors.Activator.PLUGIN_ID + ".DirectEditor"; /** id of the direct editor configuration element */ public static final String TAG_DIRECT_EDITOR_CONFIGURATION = "DirectEditor"; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandExtensionFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandExtensionFactory.java index 18da1947c0c..da3152f66fc 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandExtensionFactory.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandExtensionFactory.java @@ -27,28 +27,28 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; public class CreationCommandExtensionFactory extends ExtensionUtils { /** singleton eINSTANCE of this class */ - public final static CreationCommandExtensionFactory eINSTANCE = new CreationCommandExtensionFactory(); + public static final CreationCommandExtensionFactory eINSTANCE = new CreationCommandExtensionFactory(); /** constant for the creation command **/ - public final static String CREATION_COMMAND_EXTENSIONPOINT = "creationCommand"; + public static final String CREATION_COMMAND_EXTENSIONPOINT = "creationCommand"; /** constant for the attribute creationCommandClass **/ - public final static String CREATION_COMMAND_CLASS_ATTR = "creationCommandClass"; + public static final String CREATION_COMMAND_CLASS_ATTR = "creationCommandClass"; /** constant for the attribute creationCommandClass **/ - public final static String CONDITION_COMMAND_CLASS_ATTR = "creationCondition"; + public static final String CONDITION_COMMAND_CLASS_ATTR = "creationCondition"; /** constant for the attribute label **/ - public final static String LABEL_ATTR = "label"; + public static final String LABEL_ATTR = "label"; /** constant for the attribute contextId **/ - public final static String ID_ATTRIBUTE = "id"; + public static final String ID_ATTRIBUTE = "id"; /** constant for the attribute icon **/ - public final static String ICON_ATTR = "icon"; + public static final String ICON_ATTR = "icon"; /** constant for the attribute language **/ - public final static String LANGUAGE_ATTR = "language"; + public static final String LANGUAGE_ATTR = "language"; /** * @return the eINSTANCE diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java index 11c7140f831..ead6a262757 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java @@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest; public class PasteRequest extends Request { /** The Constant REQ_PAPYRUS_PASTE. */ - public final static String REQ_PAPYRUS_PASTE = "Papyrus_PASTE"; //$NON-NLS-1$ + public static final String REQ_PAPYRUS_PASTE = "Papyrus_PASTE"; //$NON-NLS-1$ /** The element to paste. */ protected Collection elementToPaste; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java index 9810d54c940..949b9ab93f3 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java @@ -9,7 +9,7 @@ * Contributors: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation * Christian W. Damus (CEA) - support pluggable edit-part conflict detection (CDO) - * C�line Janssens (ALL4TEC) - Override getDragTracker with the PapyrusRubberbandDragTracker + * Celine Janssens (ALL4TEC) - Override getDragTracker with the PapyrusRubberbandDragTracker * Christian W. Damus - bugs 451230, 461629, 501946 * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - add refresh of SVGPostProcessor - Bug 467569 * @@ -53,7 +53,7 @@ public class PapyrusDiagramEditPart extends DiagramEditPart { /** * Id of the right clic button */ - public final static int RIGHT_MOUSE_BUTTON = 3; + public static final int RIGHT_MOUSE_BUTTON = 3; public PapyrusDiagramEditPart(View diagramView) { super(diagramView); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java index 212591c2766..2e79ca9f456 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java @@ -49,7 +49,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties; public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPart { /** Title of this compartment */ - public final static String COMPARTMENT_NAME = "symbol"; // $NON-NLS-1$ + public static final String COMPARTMENT_NAME = "symbol"; // $NON-NLS-1$ /** * Creates a new ShapeDisplayCompartmentEditPart diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java index 306b014a6c4..c2b3853d5d6 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java @@ -59,7 +59,7 @@ public class BorderDisplayEditPolicy extends GraphicalEditPolicyEx implements IC private static final int DEFAULT_LENGTH_VALUE = -1; /** key for this edit policy. */ - public final static String BORDER_DISPLAY_EDITPOLICY = "BORDER_DISPLAY_EDITPOLICY";//$NON-NLS-1$ + public static final String BORDER_DISPLAY_EDITPOLICY = "BORDER_DISPLAY_EDITPOLICY";//$NON-NLS-1$ /** The style observable. */ protected IObservableValue styleObservable; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java index d70f8854345..2bc5a459fd5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java @@ -33,7 +33,7 @@ public class FollowSVGSymbolEditPolicy extends GraphicalEditPolicy implements IC public static final String FOLLOW_SVG_SYMBOL = "followSVGSymbol"; /** key for this edit policy */ - public final static String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy"; + public static final String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy"; protected IObservableValue styleObservable; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java index 247a2ad4ca9..4eef2a8a02a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/MaintainSymbolRatioEditPolicy.java @@ -32,7 +32,7 @@ public class MaintainSymbolRatioEditPolicy extends GraphicalEditPolicy implement public static final String MAINTAIN_SYMBOL_RATIO = "maintainSymbolRatio"; /** key for this edit policy */ - public final static String MAINTAIN_SYMBOL_RATIO_EDITPOLICY = "MAINTAIN_SYMBOL_RATIO_EDITPOLICY"; + public static final String MAINTAIN_SYMBOL_RATIO_EDITPOLICY = "MAINTAIN_SYMBOL_RATIO_EDITPOLICY"; protected IObservableValue styleObservable; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java index 838887258b4..a0946e77b4b 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NameDisplayEditPolicy.java @@ -32,7 +32,7 @@ public class NameDisplayEditPolicy extends GraphicalEditPolicy implements IChang public static final String DISPLAY_NAME = "displayName"; /** key for this edit policy */ - public final static String NAME_DISPLAY_EDITPOLICY = "NAME_DISPLAY_EDITPOLICY"; + public static final String NAME_DISPLAY_EDITPOLICY = "NAME_DISPLAY_EDITPOLICY"; protected IObservableValue styleObservable; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java index d4692227a36..8714c152249 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/RefreshTextAlignmentEditPolicy.java @@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; public class RefreshTextAlignmentEditPolicy extends GraphicalEditPolicyEx implements IChangeListener { /** key for this edit policy. */ - public final static String REFRESH_TEXT_ALIGNMENT_EDITPOLICY = "Refresh text alignment edit policy";//$NON-NLS-N$ + public static final String REFRESH_TEXT_ALIGNMENT_EDITPOLICY = "Refresh text alignment edit policy";//$NON-NLS-N$ /** The style observable. */ protected IObservableValue styleObservable; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java index c02146228d2..6f42cbac05b 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Display; public class ShapeCompartmentEditPolicy extends GraphicalEditPolicy implements AutomaticNotationEditPolicy, NotificationListener, IPapyrusListener { /** constant for this edit policy role */ - public final static String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$ + public static final String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$ /** manager for notifications: should the compartment react to the notification? */ protected NotificationManager notificationManager; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java index 7d87a3a031d..0b61105bbcc 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java @@ -9,7 +9,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.helper; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java index 983611fbe95..b4e34a553da 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PastePreferencesPage.java @@ -32,7 +32,7 @@ public class PastePreferencesPage extends FieldEditorPreferencePage implements I /** * Keep the references */ - public final static String KEEP_EXTERNAL_REFERENCES = "KEEP_EXTERNAL_REFERENCES"; //$NON-NLS-1$ + public static final String KEEP_EXTERNAL_REFERENCES = "KEEP_EXTERNAL_REFERENCES"; //$NON-NLS-1$ /** * Editor for managing paste strategies diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java index 65390b83014..7c561530905 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java @@ -51,17 +51,17 @@ public class PreferencesConstantsHelper { /** * Prefix for preference for Papyrus Level editor */ - public final static String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$ + public static final String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$ /** * Prefix for preference for Diagram Level */ - public final static String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$ + public static final String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$ /** * Prefix for preference for element Level */ - public final static String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$ + public static final String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$ private final static String COLOR = "color."; //$NON-NLS-1$ @@ -121,113 +121,113 @@ public class PreferencesConstantsHelper { private final static String LOCATION_Y_CONSTANT = "location_y"; //$NON-NLS-1$ - public final static String VIEW_RULERS_CONSTANT = WorkspaceViewerProperties.VIEWRULERS; + public static final String VIEW_RULERS_CONSTANT = WorkspaceViewerProperties.VIEWRULERS; - public final static String VIEW_GRID_CONSTANT = WorkspaceViewerProperties.VIEWGRID; + public static final String VIEW_GRID_CONSTANT = WorkspaceViewerProperties.VIEWGRID; - public final static String RULER_UNITS_CONSTANT = WorkspaceViewerProperties.RULERUNIT; + public static final String RULER_UNITS_CONSTANT = WorkspaceViewerProperties.RULERUNIT; - public final static String SNAP_TO_GRID_CONSTANT = WorkspaceViewerProperties.SNAPTOGRID; + public static final String SNAP_TO_GRID_CONSTANT = WorkspaceViewerProperties.SNAPTOGRID; - public final static String SNAP_TO_GEOMETRY_CONSTANT = WorkspaceViewerProperties.SNAPTOGEOMETRY; + public static final String SNAP_TO_GEOMETRY_CONSTANT = WorkspaceViewerProperties.SNAPTOGEOMETRY; - public final static String GRID_LINE_COLOR_CONSTANT = WorkspaceViewerProperties.GRIDLINECOLOR; + public static final String GRID_LINE_COLOR_CONSTANT = WorkspaceViewerProperties.GRIDLINECOLOR; - public final static String GRID_SPACING_CONSTANT = WorkspaceViewerProperties.GRIDSPACING; + public static final String GRID_SPACING_CONSTANT = WorkspaceViewerProperties.GRIDSPACING; - public final static String GRID_ORDER_CONSTANT = WorkspaceViewerProperties.GRIDORDER; + public static final String GRID_ORDER_CONSTANT = WorkspaceViewerProperties.GRIDORDER; - public final static String GRID_LINE_STYLE_CONSTANT = WorkspaceViewerProperties.GRIDLINESTYLE; + public static final String GRID_LINE_STYLE_CONSTANT = WorkspaceViewerProperties.GRIDLINESTYLE; - public final static String VIEW_PAGE_BREAK_CONSTANT = WorkspaceViewerProperties.VIEWPAGEBREAKS; + public static final String VIEW_PAGE_BREAK_CONSTANT = WorkspaceViewerProperties.VIEWPAGEBREAKS; - public final static String DRAW_CONNECTION_POINT_CONSTANT = "drawConnectionPoint"; //$NON-NLS-1$ + public static final String DRAW_CONNECTION_POINT_CONSTANT = "drawConnectionPoint"; //$NON-NLS-1$ - public final static String INVERT_BINDING_FOR_DEFAULT_RESIZE_AND_CONSTRAINED_RESIZE_CONSTANT = "invertBindingForDefaultResizeAndConstrainedResize"; //$NON-NLS-1$ + public static final String INVERT_BINDING_FOR_DEFAULT_RESIZE_AND_CONSTRAINED_RESIZE_CONSTANT = "invertBindingForDefaultResizeAndConstrainedResize"; //$NON-NLS-1$ - public final static String RESTORE_LINK_ELEMENT_CONSTANT = "restoreLinkElement"; //$NON-NLS-1$ + public static final String RESTORE_LINK_ELEMENT_CONSTANT = "restoreLinkElement"; //$NON-NLS-1$ - public final static String EXTERNAL_REFERENCE_STRATEGY_CONSTANT = "externalReferenceStrategy"; //$NON-NLS-1$ + public static final String EXTERNAL_REFERENCE_STRATEGY_CONSTANT = "externalReferenceStrategy"; //$NON-NLS-1$ /** * A preference of type COLOR FILL */ - public final static int COLOR_FILL = 0; + public static final int COLOR_FILL = 0; /** * A preference of type FONT */ - public final static int FONT = COLOR_FILL + 1; + public static final int FONT = COLOR_FILL + 1; /** * A preference of type COLOR FONT */ - public final static int COLOR_FONT = FONT + 1; + public static final int COLOR_FONT = FONT + 1; /** * A preference of type COLOR LINE */ - public final static int COLOR_LINE = COLOR_FONT + 1; + public static final int COLOR_LINE = COLOR_FONT + 1; /** * A preference of type COLOR GRADIENT */ - public final static int COLOR_GRADIENT = COLOR_LINE + 1; + public static final int COLOR_GRADIENT = COLOR_LINE + 1; /** * A preference of type GRADIENT POLICY */ - public final static int GRADIENT_POLICY = COLOR_GRADIENT + 1; + public static final int GRADIENT_POLICY = COLOR_GRADIENT + 1; /** * A preference of type JUMPLINK STATUS */ - public final static int JUMPLINK_STATUS = GRADIENT_POLICY + 1; + public static final int JUMPLINK_STATUS = GRADIENT_POLICY + 1; /** * A preference of type JUMPLINK REVERSE */ - public final static int JUMPLINK_REVERSE = JUMPLINK_STATUS + 1; + public static final int JUMPLINK_REVERSE = JUMPLINK_STATUS + 1; /** * A preference of type JUMPLINK TYPE */ - public final static int JUMPLINK_TYPE = JUMPLINK_REVERSE + 1; + public static final int JUMPLINK_TYPE = JUMPLINK_REVERSE + 1; /** * A preference of type ROUTING POLICY DISTANCE */ - public final static int ROUTING_POLICY_DISTANCE = JUMPLINK_TYPE + 1; + public static final int ROUTING_POLICY_DISTANCE = JUMPLINK_TYPE + 1; /** * A preference of type ROUTING POLICY OBSTRUCTION */ - public final static int ROUTING_POLICY_OBSTRUCTION = ROUTING_POLICY_DISTANCE + 1; + public static final int ROUTING_POLICY_OBSTRUCTION = ROUTING_POLICY_DISTANCE + 1; /** * A preference of type ROUTING STYLE */ - public final static int ROUTING_STYLE = ROUTING_POLICY_OBSTRUCTION + 1; + public static final int ROUTING_STYLE = ROUTING_POLICY_OBSTRUCTION + 1; /** * A preference of type SMOOTHNESS */ - public final static int SMOOTHNESS = ROUTING_STYLE + 1; + public static final int SMOOTHNESS = ROUTING_STYLE + 1; /** * A preference of type Shadow */ - public final static int SHADOW = SMOOTHNESS + 1; + public static final int SHADOW = SMOOTHNESS + 1; /** * A preference of type elementIcon */ - public final static int ELEMENTICON = SHADOW + 1; + public static final int ELEMENTICON = SHADOW + 1; /** * A preference of type QualifiedName */ - public final static int QUALIFIEDNAME = ELEMENTICON + 1; + public static final int QUALIFIEDNAME = ELEMENTICON + 1; /** * A preference of type height diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java index 72c067aff0c..38063e40d72 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java @@ -28,7 +28,7 @@ public class DiagramReconcilersReader extends RegistryReader { */ private Map<String, Collection<DiagramReconciler>> myReconcilersRO; - public final static DiagramReconcilersReader getInstance() { + public static final DiagramReconcilersReader getInstance() { if (ourInstance == null) { synchronized (DiagramReconcilersReader.class) { if (ourInstance == null) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java index 646f61df06a..d6da2d91b39 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java @@ -8,7 +8,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.selection; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java index 563793f59ea..1b48c57beb8 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java @@ -8,7 +8,7 @@ * * Contributors: * - * Céline Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors + * Celine Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors * ****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.selection; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java index a4feb816431..9452d0dcf5c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java @@ -8,7 +8,7 @@ * * Contributors: * - * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation * ****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.selection; @@ -30,7 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory; * By default they are all part of the selection. * This factory creates 8 tools combining those criteria.<br/> * - * @author Céline JANSSENS + * @author Celine JANSSENS * */ public class SelectionToolPaletteFactory extends PaletteFactory.Adapter { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java index f42a5607efe..209b55f8b5c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java @@ -728,13 +728,13 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro private static PapyrusPaletteService instance; /** the standard group id */ - public final static String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$ + public static final String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$ /** the standard separator id */ - public final static String SEPARATOR_STANDARD = "standardSeparator"; //$NON-NLS-1$ + public static final String SEPARATOR_STANDARD = "standardSeparator"; //$NON-NLS-1$ /** the standard separator id */ - public final static String TOOL_SELECTION = "selectionTool"; //$NON-NLS-1$ + public static final String TOOL_SELECTION = "selectionTool"; //$NON-NLS-1$ /** * Creates a new instance of the Palette Service diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java index c6ed9ac2761..f9f4eb9fb0f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java @@ -201,13 +201,13 @@ public class LayoutUtils { private final static int[] westArray = { PositionConstants.WEST, PositionConstants.NORTH_WEST, PositionConstants.SOUTH_WEST }; - public final static List<Integer> northPositions = fillList(northArray); + public static final List<Integer> northPositions = fillList(northArray); - public final static List<Integer> southPositions = fillList(southArray); + public static final List<Integer> southPositions = fillList(southArray); - public final static List<Integer> eastPositions = fillList(eastArray); + public static final List<Integer> eastPositions = fillList(eastArray); - public final static List<Integer> westPositions = fillList(westArray); + public static final List<Integer> westPositions = fillList(westArray); private static List<Integer> fillList(int[] array) { List<Integer> list = new ArrayList<Integer>(); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java index 07f14aafad5..50562205abf 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java @@ -32,7 +32,7 @@ import org.eclipse.swt.graphics.Image; public abstract class MoveDropStrategy extends TransactionalDropStrategy { - // public final static String TARGET_FEATURE = "targetFeature"; + // public static final String TARGET_FEATURE = "targetFeature"; protected EStructuralFeature feature; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java index 8bfbbc86af2..dcff8a9c3a5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java @@ -118,11 +118,11 @@ public class DiagramOutline extends Page implements IPapyrusContentOutlinePage, private Diagram diagram = null; /** Outline mode */ - public final static int SHOW_TREE = 1; + public static final int SHOW_TREE = 1; - public final static int SHOW_OVERVIEW = 2; + public static final int SHOW_OVERVIEW = 2; - public final static int SHOW_BOTH = 0; + public static final int SHOW_BOTH = 0; private Composite overview; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/ConnectionBendpointEditPolicy2.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/ConnectionBendpointEditPolicy2.java index 9fe76ba1020..a057fe54fd3 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/ConnectionBendpointEditPolicy2.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/ConnectionBendpointEditPolicy2.java @@ -611,7 +611,7 @@ abstract class ConnectionBendpointEditPolicy2 extends * @return Command SetBendpointsCommand that contains the point changes for * the connection. */ - abstract protected Command getBendpointsChangedCommand( + protected abstract Command getBendpointsChangedCommand( BendpointRequest request); protected Command getCreateBendpointCommand(BendpointRequest request) { diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java index c2edfa5f942..4113e72f395 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java @@ -57,7 +57,7 @@ public final class HyperLinkConstants { public static final String LEGACY_HYPERLINK_TABLE = PAPYRUS_HYPERLINK_PREFIX + "Table"; - public final static String[] validHyperLinkPageSources = new String[] { HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE, HyperLinkConstants.LEGACY_HYPERLINK_DIAGRAM, HyperLinkConstants.LEGACY_HYPERLINK_TABLE }; + public static final String[] validHyperLinkPageSources = new String[] { HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE, HyperLinkConstants.LEGACY_HYPERLINK_DIAGRAM, HyperLinkConstants.LEGACY_HYPERLINK_TABLE }; /** * Plugin constants diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java index 6eea27d74c7..01f0f41fc73 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java @@ -37,7 +37,7 @@ public class TableReconcilersReader extends RegistryReader { private List<TableReconciler> myReconcilers; - public final static TableReconcilersReader getInstance() { + public static final TableReconcilersReader getInstance() { if (ourInstance == null) { synchronized (TableReconcilersReader.class) { if (ourInstance == null) { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java index c2b136d31d1..4aa3e7ea8b4 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java @@ -28,17 +28,17 @@ public class TablePreferencesConstantsHelper { /** * Prefix for preference for Papyrus nattable Level editor */ - public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$ + public static final String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$ /** * Prefix for preference for Diagram Level */ - public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$ + public static final String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$ /** * Prefix for preference for element Level */ - public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$ + public static final String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$ /** * Get the preference constant used to store the preference of an element. diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/UserActionConstants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/UserActionConstants.java index 5117ef1d90c..14a039e8cf4 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/UserActionConstants.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/UserActionConstants.java @@ -21,26 +21,26 @@ public interface UserActionConstants { /** * The integer representing the undefined user action. */ - public final static int UNDEFINED_USER_ACTION = -1; + public static final int UNDEFINED_USER_ACTION = -1; /** * The integer representing the replace user action. */ - public final static int REPLACE_USER_ACTION = 0; + public static final int REPLACE_USER_ACTION = 0; /** * The integer representing the add user action. */ - public final static int ADD_USER_ACTION = 1; + public static final int ADD_USER_ACTION = 1; /** * The integer representing the skip user action. */ - public final static int SKIP_USER_ACTION = 2; + public static final int SKIP_USER_ACTION = 2; /** * The integer representing the cancel user action. */ - public final static int CANCEL_USER_ACTION = 3; + public static final int CANCEL_USER_ACTION = 3; } diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java index a8bbc9f3cad..5064eb3fe30 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java @@ -38,7 +38,7 @@ public class PropertiesHeaderLabelProvider extends LabelProvider { /** * The {@link LabelProviderService} Context */ - public final static String PROPERTIES_HEADER_CONTEXT = "org.eclipse.papyrus.infra.properties.ui.header.labelProvider.context"; + public static final String PROPERTIES_HEADER_CONTEXT = "org.eclipse.papyrus.infra.properties.ui.header.labelProvider.context"; public PropertiesHeaderLabelProvider() { LabelProviderService labelProviderService = new LabelProviderServiceImpl(); diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationImageUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationImageUtils.java index 28866a4e3a2..5dfde6d011f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationImageUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationImageUtils.java @@ -29,13 +29,13 @@ import org.eclipse.swt.graphics.Point; public class DecorationImageUtils { /** point corresponding to the size 16x16. */ - public final static Point SIZE_16_16 = new Point(16, 16); + public static final Point SIZE_16_16 = new Point(16, 16); /** * The number of decoration is 5 (number of possible decoration position as enumerated by constants in IDecoration from JFace * (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY)fro mTOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY) */ - public final static int NB_DECORATIONS = 5; + public static final int NB_DECORATIONS = 5; private DecorationImageUtils() { // to prevent instanciation diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestParameterConstants.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestParameterConstants.java index 6dd8b114dbe..11fbaafe345 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestParameterConstants.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestParameterConstants.java @@ -110,7 +110,7 @@ public interface RequestParameterConstants { /** * the ID to store the name to be set for the new element. */ - public final static String NAME_TO_SET = "nameToSet"; //$NON-NLS-1$ + public static final String NAME_TO_SET = "nameToSet"; //$NON-NLS-1$ /** * indicates the string to take to build the name of the new element (typically, we will increments the provided string) @@ -118,12 +118,12 @@ public interface RequestParameterConstants { * * @since 3.0 */ - public final static String BASE_NAME_TO_SET = "baseNameToSet"; //$NON-NLS-1$ + public static final String BASE_NAME_TO_SET = "baseNameToSet"; //$NON-NLS-1$ /** * the ID to store the visual id of the view on which we are working, the value must be a string */ - public final static String VIEW_VISUAL_ID = "VISUAL_ID";//$NON-NLS-1$ + public static final String VIEW_VISUAL_ID = "VISUAL_ID";//$NON-NLS-1$ /** * this constant is used to precise if it is needed to launch UI during the edition of an element @@ -165,7 +165,7 @@ public interface RequestParameterConstants { /** * Store the view on which we are working. */ - public final static String AFFECTED_VIEW = "AFFECTED_VIEW";//$NON-NLS-1$ + public static final String AFFECTED_VIEW = "AFFECTED_VIEW";//$NON-NLS-1$ /** * this constant is used to precise if it is needed to make the editdialog cancellable or not diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferenceConstants.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferenceConstants.java index 20016613eec..7000be0d826 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferenceConstants.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferenceConstants.java @@ -21,10 +21,10 @@ public class PreferenceConstants { /** * Should the validation operation automatically open the validation view, once done (and errors/warnings are present)? */ - public final static String AUTO_SHOW_VALIDATION_VIEW = "org.eclipse.papyrus.infra.services.validation.AutoShowValidationView"; //$NON-NLS-1$ + public static final String AUTO_SHOW_VALIDATION_VIEW = "org.eclipse.papyrus.infra.services.validation.AutoShowValidationView"; //$NON-NLS-1$ /** * different ways to show markers that belong to children */ - public final static String HIERARCHICAL_MARKERS = "org.eclipse.papyrus.infra.services.validation.HierarchicalMarkers"; //$NON-NLS-1$ + public static final String HIERARCHICAL_MARKERS = "org.eclipse.papyrus.infra.services.validation.HierarchicalMarkers"; //$NON-NLS-1$ } diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java index 7dd317400f5..c3912aebd6e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java @@ -36,11 +36,11 @@ import org.eclipse.papyrus.infra.services.viewersearch.Messages; */ public class ViewerSearchService extends AbstractViewerSearcher implements IService { - public final static String EXTENSION_ID = Activator.PLUGIN_ID + ".viewerSearcher"; //$NON-NLS-1$ + public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".viewerSearcher"; //$NON-NLS-1$ - public final static String VIEWER_SEARCHER_ID = "id"; //$NON-NLS-1$ + public static final String VIEWER_SEARCHER_ID = "id"; //$NON-NLS-1$ - public final static String VIEWER_SEARCHER_CLASS = "class"; //$NON-NLS-1$ + public static final String VIEWER_SEARCHER_CLASS = "class"; //$NON-NLS-1$ /** The viewerSearchers that contribute to the service. */ private final Map<String, IViewerSearcher> viewerSearchers = new HashMap<String, IViewerSearcher>(); diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java index 99083a98b97..154b1fe3a53 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java @@ -18,7 +18,7 @@ import org.eclipse.papyrus.infra.types.core.Activator; public interface IAdviceKindExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".adviceConfigurationKind";//$NON-NLS-1$ + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".adviceConfigurationKind";//$NON-NLS-1$ public static final String FACTORY_CLASS = "factoryClass";//$NON-NLS-1$ diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java index 6acdfbe21e8..351d281ce6a 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java @@ -17,7 +17,7 @@ import org.eclipse.papyrus.infra.types.core.Activator; public interface IContainerConfigurationKindExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".containerConfigurationKind"; + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".containerConfigurationKind"; public static final String FACTORY_CLASS = "factoryClass"; diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java index a39a19da6d4..0485baf1a86 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java @@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.types.core.Activator; public interface IElementTypeConfigurationKindExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeConfigurationKind"; + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeConfigurationKind"; /** attribute factoryClass */ public static final String FACTORY_CLASS = "factoryClass"; diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java index 24a09884fed..473f89c429e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java @@ -17,7 +17,7 @@ import org.eclipse.papyrus.infra.types.core.Activator; public interface IElementTypeSetExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeSetConfiguration"; + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeSetConfiguration"; /** attribute: path to the model file in the bundle */ public static final String PATH = "path"; diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java index 819e9d32814..77e04a071d9 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java @@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.types.core.Activator; public interface IMatcherConfigurationKindExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".matcherConfigurationKind"; + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".matcherConfigurationKind"; /** attribute factoryClass */ public static final String FACTORY_CLASS = "factoryClass"; diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java index b00a766e027..a09511c951d 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java @@ -30,15 +30,15 @@ public abstract class AbstractAdviceFactory<T extends AdviceConfiguration> imple getInheritance(adviceConfiguration)); } - abstract protected String getId(T adviceConfiguration); + protected abstract String getId(T adviceConfiguration); - abstract protected String getTypeId(T adviceConfiguration); + protected abstract String getTypeId(T adviceConfiguration); - abstract protected IElementMatcher getMatcher(T adviceConfiguration); + protected abstract IElementMatcher getMatcher(T adviceConfiguration); - abstract protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration); + protected abstract IContainerDescriptor getContainerDescriptor(T adviceConfiguration); - abstract protected IEditHelperAdvice getEditHelperAdvice(T adviceConfiguration); + protected abstract IEditHelperAdvice getEditHelperAdvice(T adviceConfiguration); - abstract protected AdviceBindingInheritance getInheritance(T adviceConfiguration); + protected abstract AdviceBindingInheritance getInheritance(T adviceConfiguration); } diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java index 4ee5f97c6c6..b3968a0cac9 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java @@ -22,7 +22,7 @@ public class NullEditHelperAdvice extends AbstractEditHelperAdvice { super(); } - public final static synchronized NullEditHelperAdvice getInstance() { + public static final synchronized NullEditHelperAdvice getInstance() { if(instance == null) { instance = new NullEditHelperAdvice(); } diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java index 126eb1e529a..2bf4d1352a3 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java @@ -88,11 +88,11 @@ public abstract class AbstractRule<T extends RuleConfiguration> implements IRule } - abstract protected boolean approveMoveRequest(ConfiguredHintedSpecializationElementType type, MoveRequest request); + protected abstract boolean approveMoveRequest(ConfiguredHintedSpecializationElementType type, MoveRequest request); - abstract protected boolean approveSetRequest(ConfiguredHintedSpecializationElementType type, SetRequest request); + protected abstract boolean approveSetRequest(ConfiguredHintedSpecializationElementType type, SetRequest request); - abstract protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType type, CreateElementRequest request); + protected abstract boolean approveCreationRequest(ConfiguredHintedSpecializationElementType type, CreateElementRequest request); @Override public void init(T invariantRuleConfiguration) { diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java index a58fd13a030..06ac154f4d9 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java @@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.types.rulebased.Activator; public interface IRuleExtensionPoint { /** ID of the extension point */ - public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".ruleKind"; + public static final String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".ruleKind"; public static final String CONFIGURATION_CLASS = "configurationClass"; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java index 99df6818407..a552e5a5e64 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java @@ -31,22 +31,22 @@ import org.eclipse.papyrus.infra.ui.Activator; public class EditorDescriptorExtensionFactory extends ExtensionUtils { /** singleton eINSTANCE of this class */ - public final static EditorDescriptorExtensionFactory eINSTANCE = new EditorDescriptorExtensionFactory(); + public static final EditorDescriptorExtensionFactory eINSTANCE = new EditorDescriptorExtensionFactory(); /** constant for the editor diagram **/ - public final static String EDITOR_DIAGRAM_EXTENSIONPOINT = "editorDiagram"; + public static final String EDITOR_DIAGRAM_EXTENSIONPOINT = "editorDiagram"; /** constant for the attribute factoryClass **/ - public final static String FACTORYCLASS_ATTRIBUTE = "factoryClass"; + public static final String FACTORYCLASS_ATTRIBUTE = "factoryClass"; /** constant for the attribute contextId **/ - public final static String ACTIONBARCONTRIBUTORID_ATTRIBUTE = "actionBarContributorId"; + public static final String ACTIONBARCONTRIBUTORID_ATTRIBUTE = "actionBarContributorId"; /** constant for the attribute icon **/ - public final static String ICON_ATTRIBUTE = "icon"; + public static final String ICON_ATTRIBUTE = "icon"; /** constant for the order attribute */ - public final static String ORDER_ATTRIBUTE = "order"; + public static final String ORDER_ATTRIBUTE = "order"; /** * @return the eINSTANCE diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java index 95c42ca2e08..e974f7327c9 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java @@ -191,7 +191,7 @@ public class LifeCycleEventsProvider implements ILifeCycleEventsProvider { * * @param <T> */ - abstract protected class AbstractEventListenersLazyList<T> { + protected abstract class AbstractEventListenersLazyList<T> { List<T> listeners; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java index 502a8c291e7..5e56e8e715b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java @@ -30,16 +30,16 @@ import org.eclipse.ui.part.EditorActionBarContributor; public class ActionBarContributorExtensionFactory extends ExtensionUtils { /** singleton eINSTANCE of this class */ - public final static ActionBarContributorExtensionFactory eINSTANCE = new ActionBarContributorExtensionFactory(); + public static final ActionBarContributorExtensionFactory eINSTANCE = new ActionBarContributorExtensionFactory(); /** constant for the editor diagram **/ - public final static String EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT = "" + "actionBarContributor"; + public static final String EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT = "" + "actionBarContributor"; /** constant for the attribute factoryClass **/ - public final static String CONTEXTCLASS_ATTRIBUTE = "implementingClass"; + public static final String CONTEXTCLASS_ATTRIBUTE = "implementingClass"; /** constant for the attribute contextId **/ - public final static String ID_ATTRIBUTE = "id"; + public static final String ID_ATTRIBUTE = "id"; /** * @return the eINSTANCE diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java index 3269100bac9..6b2b6f1409c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java @@ -125,7 +125,7 @@ public class SelectorDialogTabReader extends RegistryReader { * * @return */ - public final static SelectorDialogTabReader getInstance() { + public static final SelectorDialogTabReader getInstance() { if (ourInstance == null) { synchronized (SelectorDialogTabReader.class) { if (ourInstance == null) { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java index 67d8cdfbecb..5e0f745e36b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java @@ -281,7 +281,7 @@ public abstract class AbstractEditor extends Composite implements DisposeListene * Binds the Widget Observable to the Model observable property, * using the specified converters when available */ - abstract protected void doBinding(); + protected abstract void doBinding(); /** * @return the type of objects that this widget can edit diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java index e8d764bfe34..c90dc11a13c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java @@ -56,6 +56,6 @@ public class NullSelector implements IElementSelector { // Nothing } - public final static NullSelector instance = new NullSelector(); + public static final NullSelector instance = new NullSelector(); } diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java index a2e3e1c5478..330ad63c926 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java @@ -127,7 +127,7 @@ public abstract class DependencyUpdater<T> { } } - abstract protected void save(IFile file) throws Exception; + protected abstract void save(IFile file) throws Exception; protected void updateWithContribution(final Shell parentShell, final T uri, final Contribution contribution, final int repositoryIndex, final Map<Object, Object> context) { EList<MappedRepository> repositories = contribution.getRepositories(); diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/AbstractPaletteConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/AbstractPaletteConfigurationWizard.java index 4107f4037c2..4ab9f47dd3e 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/AbstractPaletteConfigurationWizard.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/AbstractPaletteConfigurationWizard.java @@ -199,12 +199,12 @@ public abstract class AbstractPaletteConfigurationWizard extends Wizard { /** * Load models on papyrus( Palettes, element types, etc...). */ - abstract protected void deployModels(); + protected abstract void deployModels(); /** * save resources() */ - abstract protected void saveResources(); + protected abstract void saveResources(); /** * {@inheritDoc} diff --git a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/src/org/eclipse/papyrus/toolsmiths/profilemigration/ui/dialogs/AbstractProfileMigrationDialog.java b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/src/org/eclipse/papyrus/toolsmiths/profilemigration/ui/dialogs/AbstractProfileMigrationDialog.java index 63541b280b4..f8ca96ba192 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/src/org/eclipse/papyrus/toolsmiths/profilemigration/ui/dialogs/AbstractProfileMigrationDialog.java +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/src/org/eclipse/papyrus/toolsmiths/profilemigration/ui/dialogs/AbstractProfileMigrationDialog.java @@ -133,7 +133,7 @@ abstract public class AbstractProfileMigrationDialog extends FormDialog { * * @return the description */ - abstract protected String getDecription(); + protected abstract String getDecription(); /** * Create the migration action section @@ -179,7 +179,7 @@ abstract public class AbstractProfileMigrationDialog extends FormDialog { * @param toolkit * the form toolkit */ - abstract protected void getMigrationActionSectionContent(Composite body, FormToolkit toolkit); + protected abstract void getMigrationActionSectionContent(Composite body, FormToolkit toolkit); /** * Create a checkbox for not displaying the popup again diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java index dcd068f11ef..caf3fdd7d34 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java @@ -158,7 +158,7 @@ public abstract class CreateCallActionDialog extends CreateInvocationActionDialo * @return true if there are parameters which will be mapped with output * pins */ - abstract protected boolean hasOutParameters(EObject invokedObject); + protected abstract boolean hasOutParameters(EObject invokedObject); /** * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java index 659fb22aac1..a2ef70827e6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java @@ -229,14 +229,14 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * * @return preference id */ - abstract protected String getSelectionIsDefaultPreference(); + protected abstract String getSelectionIsDefaultPreference(); /** * Get the id of the preference storing the last selected owner. * * @return preference id */ - abstract protected String getCreationDefaultOwnerPreference(); + protected abstract String getCreationDefaultOwnerPreference(); /** * Create the other needed sections. Subclasses can override this method. @@ -677,7 +677,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * * @return array of EClasses */ - abstract protected EClass[] getPossibleInvokedTypes(); + protected abstract EClass[] getPossibleInvokedTypes(); /** * Get the possible parents of the new invoked element @@ -686,7 +686,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * the parent of the action * @return collection of EObject possible owners */ - abstract protected Set<? extends EClassifier> getPossibleInvokedParents(EObject actionParent); + protected abstract Set<? extends EClassifier> getPossibleInvokedParents(EObject actionParent); /** * Whether element can be parent of the new invoked element @@ -695,21 +695,21 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * the parent to test * @return true if parent is of an appropriate eclass */ - abstract protected boolean isPossibleInvokedParent(EObject parent); + protected abstract boolean isPossibleInvokedParent(EObject parent); /** * Get feature referencing the invoked object * * @return invocation feature */ - abstract protected EReference getInvocationFeature(); + protected abstract EReference getInvocationFeature(); /** * Get the image for the parent selection button * * @return image */ - abstract protected Image getParentImage(); + protected abstract Image getParentImage(); /** * Get the label to present the name of the invoked object @@ -752,40 +752,40 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * * @return dialog title */ - abstract protected String getTitle(); + protected abstract String getTitle(); /** * Get the title of the invocation creation section * * @return section title */ - abstract protected String getInvocationCreationSectionTitle(); + protected abstract String getInvocationCreationSectionTitle(); /** * Get the help description of the invocation creation section * * @return section title */ - abstract protected String getInvocationCreationSectionHelp(); + protected abstract String getInvocationCreationSectionHelp(); /** * Get the title of the invocation selection section * * @return section title */ - abstract protected String getInvocationSelectionSectionTitle(); + protected abstract String getInvocationSelectionSectionTitle(); /** * Get the label to choose to select an existing element * * @return label */ - abstract protected String getSelectionLabel(); + protected abstract String getSelectionLabel(); /** * Get the label to choose to create a new element * * @return label */ - abstract protected String getCreationLabel(); + protected abstract String getCreationLabel(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java index 9478b9c28b4..33115d0676f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/AutomatedModelCompletionPreferencesInitializer.java @@ -25,9 +25,9 @@ import org.eclipse.papyrus.uml.diagram.common.Activator; */ public class AutomatedModelCompletionPreferencesInitializer extends AbstractPreferenceInitializer { - final static public String PIN_SYNCHRONIZATION = CustomMessages.AutomatedModelCompletionPreferencesInitializer_PinSynchronization; + public static final String PIN_SYNCHRONIZATION = CustomMessages.AutomatedModelCompletionPreferencesInitializer_PinSynchronization; - final static public String NONE = CustomMessages.AutomatedModelCompletionPreferencesInitializer_None; + public static final String NONE = CustomMessages.AutomatedModelCompletionPreferencesInitializer_None; /** * Constructor. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java index c76a05850af..52938ef5788 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java @@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.InvocationAction; public class UMLCallActionTester extends PropertyTester { /** Tester ID for UML Call Action nature */ - public final static String IS_CALL_ACTION = "isCallAction"; + public static final String IS_CALL_ACTION = "isCallAction"; /** Default constructor */ public UMLCallActionTester() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java index 5d78eca8fec..1450d27089a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLPackageSelectionTester.java @@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Package; public class UMLPackageSelectionTester extends PropertyTester { /** Tester ID for UML Call Action nature */ - public final static String IS_PACKAGE = "isUMLPackage"; + public static final String IS_PACKAGE = "isUMLPackage"; public UMLPackageSelectionTester() { } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractCustomLabelEditPolicy.java index 31d5167668e..b1c6ca7eef4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractCustomLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractCustomLabelEditPolicy.java @@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.Element; public abstract class AbstractCustomLabelEditPolicy extends GraphicalEditPolicy implements IPapyrusListener, NotificationListener { /** constant for this edit policy role */ - public final static String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ /** * Creates a new Specific Name display edit policy diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InformationFlowCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InformationFlowCustomLabelEditPolicy.java index 8e5cfb75638..3e1f4dfc284 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InformationFlowCustomLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InformationFlowCustomLabelEditPolicy.java @@ -30,13 +30,13 @@ import org.eclipse.uml2.uml.InformationFlow; public class InformationFlowCustomLabelEditPolicy extends AbstractCustomLabelEditPolicy { /** constant for this edit policy role */ - public final static String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ - public final static int ADD_CONVEYED_CLASSIFIER = Notification.ADD; + public static final int ADD_CONVEYED_CLASSIFIER = Notification.ADD; - public final static int REMOVE_CONVEYED_CLASSIFER = Notification.REMOVE; + public static final int REMOVE_CONVEYED_CLASSIFER = Notification.REMOVE; - public final static int CHANGE_NAME_OF_A_CONVOYED_CLASSIFIER = Notification.SET; + public static final int CHANGE_NAME_OF_A_CONVOYED_CLASSIFIER = Notification.SET; public InformationFlowCustomLabelEditPolicy() { super(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java index 2c19a3df041..443f52e0c97 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java @@ -41,12 +41,12 @@ public class UpdateReferencesCommand extends AbstractTransactionalCommand { /** * Mode used to set references */ - public final static boolean SET_MODE = true; + public static final boolean SET_MODE = true; /** * Mode used to unset references */ - public final static boolean UNSET_MODE = false; + public static final boolean UNSET_MODE = false; /** * List of all {@link IGraphicalEditPart} of all children diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java index 341f0daa0b4..bfb9ff31ee5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java @@ -110,13 +110,13 @@ public abstract class CompositeCreatorWithCommand implements ICompositeCreator { /** * Remove the notification using {@link PendingGroupNotificationsManager} and the appropriate key */ - abstract protected void removeNotification(); + protected abstract void removeNotification(); /** * Get the run action label * * @return string label */ - abstract protected String getRunLabel(); + protected abstract String getRunLabel(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/AbstractShowHideAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/AbstractShowHideAction.java index 9587b2c2cce..4e1336176eb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/AbstractShowHideAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/AbstractShowHideAction.java @@ -300,7 +300,7 @@ public abstract class AbstractShowHideAction implements IActionDelegate, IWorkbe * * @return the input for the TreeDialog */ - abstract protected List<Object> getInput(); + protected abstract List<Object> getInput(); /** * Fill the following fields with the elements to show and the elements to @@ -323,7 +323,7 @@ public abstract class AbstractShowHideAction implements IActionDelegate, IWorkbe * * @return the command done by this action */ - abstract protected Command getActionCommand(); + protected abstract Command getActionCommand(); /** * Setter for {@link #labelProvider} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java index 550ba2949a7..c57aa342e97 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java @@ -29,7 +29,7 @@ public class RotateAction implements IObjectActionDelegate { /** The Constant ID. */ // @unused - public final static String ID = "org.eclipse.papyrus.uml.diagram.common.actions.RotateAction.id"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.papyrus.uml.diagram.common.actions.RotateAction.id"; //$NON-NLS-1$ private ShapeNodeEditPart selectedElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java index 20b7077f449..ba6751e364c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java @@ -68,11 +68,11 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand protected final static String COMMAND_ERROR_MESSAGE = "One of the anchors is left outside of the new figure's size"; // Constants to describe which axis position should be preserved - public final static int PRESERVE_Y = 0; + public static final int PRESERVE_Y = 0; - public final static int PRESERVE_X = 1; + public static final int PRESERVE_X = 1; - public final static int PRESERVE_XY = 2; + public static final int PRESERVE_XY = 2; /** * Constructor. It needs the shape being resized, it's re-size delta and the diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java index 1cc4669a212..ec55c71a916 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java @@ -181,5 +181,5 @@ public abstract class AbstractCheckedTreeColumnViewerSelectionDialog extends Cus * @param columnIndex * @return the {@link EditingSupport} for the column or <code>null</code> */ - abstract protected EditingSupport getEditingSupport(int columnIndex); + protected abstract EditingSupport getEditingSupport(int columnIndex); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java index 55a003a3451..e85a25cf082 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java @@ -79,7 +79,7 @@ public abstract class AbstractAppliedStereotypeDisplayEditPolicy extends Graphic protected String EMPTY_STRING = "";//$NON-NLS-1$ /** constant for this edit policy role */ - public final static String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeDisplayEditPolicy";//$NON-NLS-1$ + public static final String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeDisplayEditPolicy";//$NON-NLS-1$ /** host semantic element */ protected Element hostSemanticElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java index 4f66d31474b..9ff4669f9d6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java @@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.Usage; public abstract class AppliedStereotypeLabelDisplayEditPolicy extends AbstractAppliedStereotypeDisplayEditPolicy { /** constant for this edit policy role */ - public final static String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeLabelDisplayEditPolicy"; + public static final String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeLabelDisplayEditPolicy"; /** tag displayed for the UML element */ public String tag; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java index 597045fcca9..e5ed9da7860 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java @@ -43,7 +43,7 @@ public abstract class ChangeStereotypedShapeEditPolicy extends GraphicalEditPoli /** constant for this edit policy role */ - public final static String CHANGE_SHAPE_POLICY = "CHANGE_SHAPE_POLICY"; + public static final String CHANGE_SHAPE_POLICY = "CHANGE_SHAPE_POLICY"; /** host semantic element */ protected Element hostSemanticElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PasteEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PasteEditPolicy.java index 746fae6df50..ea771e129b7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PasteEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PasteEditPolicy.java @@ -52,7 +52,7 @@ import org.eclipse.uml2.uml.Element; @SuppressWarnings({ "rawtypes", "restriction" }) public class PasteEditPolicy extends ContainerEditPolicy { - public final static String PASTE_ROLE = "PASTE_ROLE"; //$NON-NLS-1$ + public static final String PASTE_ROLE = "PASTE_ROLE"; //$NON-NLS-1$ /** * @see org.eclipse.gef.EditPolicy#getCommand(Request) diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java index 4b14f7c5e1d..7267a877d20 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java @@ -43,7 +43,7 @@ import org.eclipse.uml2.uml.UMLPackage; public class QualifiedNameDisplayEditPolicy extends GraphicalEditPolicy implements NotificationListener, IPapyrusListener { /** key for this edit policy */ - public final static String QUALIFIED_NAME_POLICY = "Qualified_name_editpolicy"; //$NON-NLS-1$ + public static final String QUALIFIED_NAME_POLICY = "Qualified_name_editpolicy"; //$NON-NLS-1$ /** host semantic element */ protected NamedElement hostSemanticNamedElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/WrappingLabelWithScalableIcons.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/WrappingLabelWithScalableIcons.java index 5c47f3cac2e..24bc4fe2374 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/WrappingLabelWithScalableIcons.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/WrappingLabelWithScalableIcons.java @@ -30,7 +30,7 @@ public class WrappingLabelWithScalableIcons extends WrappingLabel { /** * Width between icons (and between icons & text) */ - public final static int GAP_WIDTH = 4; + public static final int GAP_WIDTH = 4; @Override public void paintFigure(Graphics graphics) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ILabelPreferenceConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ILabelPreferenceConstants.java index 5acfb571f5d..37cc16d08a5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ILabelPreferenceConstants.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ILabelPreferenceConstants.java @@ -24,23 +24,23 @@ public interface ILabelPreferenceConstants extends ICustomAppearance { public String LABEL_DISPLAY_PREFERENCE = "label.display"; //$NON-NLS-1$ /** Style constant for id info display in labels. */ - public final static String DISP_ID = "id"; //$NON-NLS-1$ + public static final String DISP_ID = "id"; //$NON-NLS-1$ /** Style constant for dimension info display in labels. */ - public final static String DISP_DIMENSION = "dimension"; //$NON-NLS-1$ + public static final String DISP_DIMENSION = "dimension"; //$NON-NLS-1$ /** Style constant for specification info display in labels. */ - public final static String DISP_SPECIFICATION = "specification"; //$NON-NLS-1$ + public static final String DISP_SPECIFICATION = "specification"; //$NON-NLS-1$ /** Style constant for signal info display in labels. */ - public final static String DISP_SIGNAL = "signal"; //$NON-NLS-1$ + public static final String DISP_SIGNAL = "signal"; //$NON-NLS-1$ /** Style constant forcing multiplicity display in labels. */ - public final static String DISP_DEFAULT_MULTIPLICITY = "defaultMultiplicity"; //$NON-NLS-1$ + public static final String DISP_DEFAULT_MULTIPLICITY = "defaultMultiplicity"; //$NON-NLS-1$ /** Style constant forcing type display in labels. */ - public final static String DISP_UNDEFINED_TYPE = "undefinedType"; //$NON-NLS-1$ + public static final String DISP_UNDEFINED_TYPE = "undefinedType"; //$NON-NLS-1$ /** Style constant forcing name display in labels. */ - public final static String DISP_NON_NAVIGABLE_ROLE = "nonNavigableRole"; //$NON-NLS-1$ + public static final String DISP_NON_NAVIGABLE_ROLE = "nonNavigableRole"; //$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayConstant.java index 3427505ee5a..4092cac5942 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayConstant.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayConstant.java @@ -76,16 +76,16 @@ public class StereotypeDisplayConstant { // Special Char Constants - public final static String STEREOTYPE_LABEL_SEPARATOR = ", ";//$NON-NLS-1$ + public static final String STEREOTYPE_LABEL_SEPARATOR = ", ";//$NON-NLS-1$ public static final String STEREOTYPE_PROPERTY_SEPARATOR = "\n";//$NON-NLS-1$ public static final String STEREOTYPE_PROPERTY_VALUE_SEPARATOR = " = ";//$NON-NLS-1$ public static final String STEREOTYPE_PROPERTIES_SEPARATOR = " ";//$NON-NLS-1$ // Ornament Constants - public final static String QUOTE_LEFT = Activator.ST_LEFT; - public final static String QUOTE_RIGHT = Activator.ST_RIGHT; - public final static String BRACE_LEFT = "{";//$NON-NLS-1$ - public final static String BRACE_RIGHT = "}";//$NON-NLS-1$ + public static final String QUOTE_LEFT = Activator.ST_LEFT; + public static final String QUOTE_RIGHT = Activator.ST_RIGHT; + public static final String BRACE_LEFT = "{";//$NON-NLS-1$ + public static final String BRACE_RIGHT = "}";//$NON-NLS-1$ // Define if Stereotype View are Persistent or not. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayMigrationConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayMigrationConstant.java index 57e4f86ff4c..2a4cfc969f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayMigrationConstant.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayMigrationConstant.java @@ -60,6 +60,6 @@ public final class StereotypeDisplayMigrationConstant { /** * Separator Constants */ - public final static String EANNOTATION_LIST_SEPARATOR = ","; //$NON-NLS-1$ - public final static String EANNOTATION_PROPERTY_SEPARATOR = "."; //$NON-NLS-1$ + public static final String EANNOTATION_LIST_SEPARATOR = ","; //$NON-NLS-1$ + public static final String EANNOTATION_PROPERTY_SEPARATOR = "."; //$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/CustomPopupDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/CustomPopupDialog.java index 0f8f6fee40c..22c6aeda2aa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/CustomPopupDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/CustomPopupDialog.java @@ -142,12 +142,12 @@ public abstract class CustomPopupDialog extends PopupDialog { * * @return the actions */ - abstract protected Collection<Action> getActions(); + protected abstract Collection<Action> getActions(); /** * Creates the subsection. */ - abstract protected void createSubsection(); + protected abstract void createSubsection(); /** * {@inheritDoc} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLModelTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLModelTester.java index eb1ca234b62..18e522f3cd2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLModelTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLModelTester.java @@ -32,10 +32,10 @@ import org.eclipse.uml2.uml.Profile; public class UMLModelTester extends PropertyTester { /** Tester ID for UML Model nature */ - public final static String IS_UML_MODEL = "isUMLModel"; + public static final String IS_UML_MODEL = "isUMLModel"; /** Tester ID for UML Profile nature */ - public final static String IS_UML_PROFILE = "isUMLProfile"; + public static final String IS_UML_PROFILE = "isUMLProfile"; /** Test the receiver against the selected property */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLSelectionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLSelectionTester.java index fc77bf13f79..92ccc225959 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLSelectionTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/UMLSelectionTester.java @@ -35,10 +35,10 @@ import org.eclipse.uml2.uml.Profile; public class UMLSelectionTester extends PropertyTester { /** Tester ID for UML Model nature */ - public final static String IS_UML_MODEL = "isUMLModel"; + public static final String IS_UML_MODEL = "isUMLModel"; /** Tester ID for UML Profile nature */ - public final static String IS_UML_PROFILE = "isUMLProfile"; + public static final String IS_UML_PROFILE = "isUMLProfile"; /** Default constructor */ public UMLSelectionTester() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java index 4e24d4c18d3..be2dc13536b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java @@ -30,7 +30,7 @@ import org.eclipse.uml2.uml.Element; public abstract class AbstractCustomLabelEditPolicy extends GraphicalEditPolicy implements IPapyrusListener, NotificationListener { /** constant for this edit policy role. */ - public final static String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ /** * Creates a new Specific Name display edit policy. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/AbstractCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/AbstractCustomLabelEditPolicy.java index a807ea3fea4..31856857293 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/AbstractCustomLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/AbstractCustomLabelEditPolicy.java @@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.Element; public abstract class AbstractCustomLabelEditPolicy extends GraphicalEditPolicy implements IPapyrusListener, NotificationListener { /** constant for this edit policy role */ - public final static String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ /** * Creates a new Specific Name display edit policy diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/InformationFlowCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/InformationFlowCustomLabelEditPolicy.java index 74ec96c07e7..3ed5e151700 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/InformationFlowCustomLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/InformationFlowCustomLabelEditPolicy.java @@ -31,13 +31,13 @@ import org.eclipse.uml2.uml.InformationFlow; public class InformationFlowCustomLabelEditPolicy extends AbstractCustomLabelEditPolicy { /** constant for this edit policy role */ - public final static String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_NAME_LABEL_POLICY = "SpecificNameLabelEditPolicy"; //$NON-NLS-1$ - public final static int ADD_CONVEYED_CLASSIFIER = Notification.ADD; + public static final int ADD_CONVEYED_CLASSIFIER = Notification.ADD; - public final static int REMOVE_CONVEYED_CLASSIFER = Notification.REMOVE; + public static final int REMOVE_CONVEYED_CLASSIFER = Notification.REMOVE; - public final static int CHANGE_NAME_OF_A_CONVOYED_CLASSIFIER = Notification.SET; + public static final int CHANGE_NAME_OF_A_CONVOYED_CLASSIFIER = Notification.SET; public InformationFlowCustomLabelEditPolicy() { super(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractDistributeAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractDistributeAction.java index 420eb60fa16..500f933bb99 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractDistributeAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractDistributeAction.java @@ -130,7 +130,7 @@ public abstract class AbstractDistributeAction { * @param elementsForAction * the elements on which this action is applied */ - abstract protected void buildAction(List<?> elementsForAction); + protected abstract void buildAction(List<?> elementsForAction); /** * Return the command to do this action diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractShowHideAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractShowHideAction.java index 32161e948b8..b86ae3c49ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractShowHideAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractShowHideAction.java @@ -268,7 +268,7 @@ public abstract class AbstractShowHideAction implements IActionDelegate, IWorkbe * @return * the input for the TreeDialog */ - abstract protected List<Object> getInput(); + protected abstract List<Object> getInput(); /** * Fill the following fields with the elements to show and the elements to hide diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DistributeAffixedChildNodeLinkAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DistributeAffixedChildNodeLinkAction.java index cd4c62ee783..16fbfccb3af 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DistributeAffixedChildNodeLinkAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DistributeAffixedChildNodeLinkAction.java @@ -62,10 +62,10 @@ public class DistributeAffixedChildNodeLinkAction extends AbstractDistributeActi private int mode; /** constant for the link selection mode. */ - public final static int DISTRIBUTE_ON_ONE_END = 1; + public static final int DISTRIBUTE_ON_ONE_END = 1; /** constant for the link/node selection. */ - public final static int DISTRIBUTE_ON_TWO_END = DISTRIBUTE_ON_ONE_END + 1; + public static final int DISTRIBUTE_ON_TWO_END = DISTRIBUTE_ON_ONE_END + 1; /** * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java index cba60603b2f..9787b520fb9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java @@ -20,7 +20,6 @@ import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.papyrus.uml.diagram.common.handlers.ParametricAndListeningHandler; import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils; import org.eclipse.papyrus.uml.diagram.menu.actions.CustomAlignAction; -//import org.eclipse.papyrus.uml.diagram.menu.actions.CustomAlignAction2; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java index 1aaeb719448..7bdf99322ff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java @@ -189,7 +189,7 @@ public class ArrangeHandler extends AbstractGraphicalCommandHandler { diagramPart = (IDiagramWorkbenchPart) part; } else if (part != null) { - diagramPart = (IDiagramWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class); + diagramPart = part.getAdapter(IDiagramWorkbenchPart.class); } return diagramPart; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java index 28e99be4964..e6de947b354 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java @@ -48,9 +48,9 @@ import org.eclipse.uml2.uml.UMLPackage; public class ExtensionCustomNameEditPolicy extends AbstractEditPolicy implements NotificationListener, IPapyrusListener { - public final static String SPECIFIC_EXTENSION_NAME_POLICY = org.eclipse.papyrus.uml.service.types.ui.util.ExtensionHelper.SPECIFIC_EXTENSION_NAME_POLICY; + public static final String SPECIFIC_EXTENSION_NAME_POLICY = org.eclipse.papyrus.uml.service.types.ui.util.ExtensionHelper.SPECIFIC_EXTENSION_NAME_POLICY; - public final static int CHANGE_NAME_OF_A_STEREOTYPE = Notification.SET; + public static final int CHANGE_NAME_OF_A_STEREOTYPE = Notification.SET; /** stores the host associated semantic element */ protected EObject hostSemanticElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java index 33be1127393..9b6764ef396 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * C�line Janssens (celine.janssens@all4tec.net) - Add Coregion functionnality + * Celine Janssens (celine.janssens@all4tec.net) - Add Coregion functionnality * EclipseSource - Bug 533770 * *****************************************************************************/ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java index aff410d01c0..841c7ee5fc6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java @@ -29,7 +29,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes; import org.eclipse.papyrus.uml.service.types.utils.ElementUtil; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class CInteractionInteractionCompartmentEditPart extends InteractionInteractionCompartmentEditPart { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java index 25df616e648..d42f82b8050 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java @@ -374,7 +374,7 @@ public class OLDLifelineXYLayoutEditPolicy { * List of EditPart to check * @return The parent */ - public final static ShapeNodeEditPart getParent(LifelineEditPart lifelinePart, Rectangle childBounds, List<ShapeNodeEditPart> toCheckExecutionSpecificationList) { + public static final ShapeNodeEditPart getParent(LifelineEditPart lifelinePart, Rectangle childBounds, List<ShapeNodeEditPart> toCheckExecutionSpecificationList) { ShapeNodeEditPart parent = null; // Loop through the ExecutionSpecification list and try to find the most to the right // ExecutionSpecification within the executionSpecificationEP Y-axis bounds @@ -403,7 +403,7 @@ public class OLDLifelineXYLayoutEditPolicy { * * @return a corrected sizeDelta */ - public final static Dimension adaptSizeDeltaToMaxHeight(IFigure figure, Dimension sizeDelta) { + public static final Dimension adaptSizeDeltaToMaxHeight(IFigure figure, Dimension sizeDelta) { Dimension newSizeDelta = new Dimension(sizeDelta); int figureHeight = figure.getBounds().height; int maximunFigureHeight = figure.getMaximumSize().height; @@ -429,7 +429,7 @@ public class OLDLifelineXYLayoutEditPolicy { * @return the list of affixed ExecutionSpecification. If there is no affixed * ExecutionSpecification, then an empty list will be returned */ - public final static List<ShapeNodeEditPart> getAffixedExecutionSpecificationEditParts(ShapeNodeEditPart executionSpecificationEP) { + public static final List<ShapeNodeEditPart> getAffixedExecutionSpecificationEditParts(ShapeNodeEditPart executionSpecificationEP) { List<ShapeNodeEditPart> notToCheckExecutionSpecificationList = new ArrayList<>(); return getAffixedExecutionSpecificationEditParts(executionSpecificationEP, notToCheckExecutionSpecificationList); } @@ -483,7 +483,7 @@ public class OLDLifelineXYLayoutEditPolicy { * @return true if the rectangles of both figures touch and the right figure is really on the * right. False otherwise */ - public final static boolean isAffixedToRight(Rectangle leftFigure, Rectangle rightFigure) { + public static final boolean isAffixedToRight(Rectangle leftFigure, Rectangle rightFigure) { // return leftFigure.touches(rightFigure) && leftFigure.x < rightFigure.x; return leftFigure.contains(rightFigure.getLocation()) && leftFigure.x < rightFigure.x; } @@ -546,7 +546,7 @@ public class OLDLifelineXYLayoutEditPolicy { * * @return The real MoveDelta applied */ - public final static Rectangle getRealMoveDelta(Rectangle oldRelativeBounds, Rectangle newRelativeBounds) { + public static final Rectangle getRealMoveDelta(Rectangle oldRelativeBounds, Rectangle newRelativeBounds) { Rectangle realMoveDelta = new Rectangle(); realMoveDelta.x = newRelativeBounds.x - oldRelativeBounds.x; realMoveDelta.y = newRelativeBounds.y - oldRelativeBounds.y; @@ -563,7 +563,7 @@ public class OLDLifelineXYLayoutEditPolicy { * * @return The relative bounds regarding it's parent figure */ - public final static Rectangle getRelativeBounds(IFigure figure) { + public static final Rectangle getRelativeBounds(IFigure figure) { Rectangle relBounds = figure.getBounds().getCopy(); Rectangle parentRectangle = figure.getParent().getBounds(); relBounds.x -= parentRectangle.x; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java index c1091ad703d..ea8fbda5d12 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java @@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.command.SetResizeAndLocationComm import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class StateInvariantResizableEditPolicy extends BorderItemResizableEditPolicy { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java index e5ded3991d5..b7aa39bb234 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java @@ -9,7 +9,7 @@ * * Contributors: * Atos Origin - Initial API and implementation - * C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 : Label Margin + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 : Label Margin * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java index 82384e700a5..5c8b1501f6b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * C�line Jansens - Initial API and implementation + * Celine Jansens - Initial API and implementation * *****************************************************************************/ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java index 04bc529730c..487f4f84e80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * C�line Janssens (celine.janssens@all4tec.net) - Initial API and implementation + * Celine Janssens (celine.janssens@all4tec.net) - Initial API and implementation * *****************************************************************************/ @@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * This class is used for Duration Constraint (@see {@link LifelineEditPart}) in order to locate it just next to the middle of it's parent (the Lifeline) on the X axe. * The Y Axe is free except if the top is upper than its Parent. */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java index 18c044a697d..4ac2d182f01 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * C�line JANSSENS (All4tec.net) - Initial API and implementation + * Celine JANSSENS (All4tec.net) - Initial API and implementation * *****************************************************************************/ @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class StateInvariantLocator extends CenterLocator { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java index 211693dc471..f0d7b52405f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class CustomCombinedFragmentEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java index a2898a61f3f..a832f9e974b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class CustomInteractionEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java index 1c82ab71707..d54674916a0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public class CustomInteractionUseEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java index c15ef91bec1..82285f5cf70 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 * *****************************************************************************/ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java index 43c408359dd..3830a3e4b67 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java @@ -38,7 +38,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.BoundForEdit public class ExecutionSpecificationUtil { /** The default spacing used between Execution Specification */ - public final static int TOP_SPACING_HEIGHT = 5; + public static final int TOP_SPACING_HEIGHT = 5; /** * Private constructor to avoid initialization. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java index 2a3442fcaa5..8a52c4bcc09 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java @@ -14,16 +14,16 @@ package org.eclipse.papyrus.uml.diagram.sequence.util; /** - * @author C�line JANSSENS + * @author Celine JANSSENS * */ public interface SequenceDiagramConstants { /** Threshold of Y axis to consider a Message as Horizontal */ - public final static int HORIZONTAL_MESSAGE_MAX_Y_DELTA = 65; + public static final int HORIZONTAL_MESSAGE_MAX_Y_DELTA = 65; /** Threshold of Y axis to consider a Message as Horizontal in the precision Mode (Shift key ) */ - public final static int HORIZONTAL_MESSAGE_PRECISION_Y_DELTA = 10; + public static final int HORIZONTAL_MESSAGE_PRECISION_Y_DELTA = 10; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java index 1a9635a3de3..0b758982500 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java @@ -38,9 +38,9 @@ import com.google.common.base.Strings; * @author David Servat */ public class Zone { - public final static int defaultWidth = 200; - public final static int defaultHeight = 100; - public final static int defaultHeader = 13; + public static final int defaultWidth = 200; + public static final int defaultHeight = 100; + public static final int defaultHeader = 13; /** * Key string for EAnnotation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCommentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCommentEditPolicy.java index 00ec72e3e00..d0a49dc857b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCommentEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCommentEditPolicy.java @@ -61,7 +61,7 @@ public class AppliedStereotypeCommentEditPolicy extends AppliedStereotypeNodeLab /** constant for this edit policy role */ - public final static String APPLIED_STEREOTYPE_COMMENT = "AppliedStereotypeComment";//$NON-NLS-1$ + public static final String APPLIED_STEREOTYPE_COMMENT = "AppliedStereotypeComment";//$NON-NLS-1$ /** the comment node associated to the Host EditPart */ private Node comment; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCompartmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCompartmentEditPolicy.java index 28a8dc6b181..ad3ee598e5d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCompartmentEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeCompartmentEditPolicy.java @@ -41,7 +41,7 @@ import org.eclipse.uml2.uml.Stereotype; public class AppliedStereotypeCompartmentEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy { /** constant for this edit policy role */ - public final static String STEREOTYPE_COMPARTMENT_POLICY = "AppliedStereotypeCompartmentEditPolicy"; //$NON-NLS-1$ + public static final String STEREOTYPE_COMPARTMENT_POLICY = "AppliedStereotypeCompartmentEditPolicy"; //$NON-NLS-1$ /** * Creates a new AppliedStereotype display edit policy diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeLabelEditPolicy.java index 56a85d45b70..5b0e408fed1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpolicies/AppliedStereotypeLabelEditPolicy.java @@ -24,7 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode public class AppliedStereotypeLabelEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy { /** constant for this edit policy role */ - public final static String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeLabelEditPolicy"; //$NON-NLS-1$ + public static final String STEREOTYPE_LABEL_POLICY = "AppliedStereotypeLabelEditPolicy"; //$NON-NLS-1$ /** * Creates a new AppliedStereotype display edit policy diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/SwitchLifelineAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/SwitchLifelineAction.java index 45a8be3386f..d2a9174e3d8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/SwitchLifelineAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/SwitchLifelineAction.java @@ -18,7 +18,7 @@ import org.eclipse.ui.IWorkbenchPart; public class SwitchLifelineAction implements IObjectActionDelegate { - public final static String ID = "org.eclipse.papyrus.uml.diagram.timing.custom.SwitchLifelineActionID"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.papyrus.uml.diagram.timing.custom.SwitchLifelineActionID"; //$NON-NLS-1$ @Override public void run(final IAction action) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/AbstractTwoPointCreationTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/AbstractTwoPointCreationTool.java index 55207b4f737..c866814bf5e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/AbstractTwoPointCreationTool.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/AbstractTwoPointCreationTool.java @@ -36,10 +36,10 @@ public abstract class AbstractTwoPointCreationTool extends AspectUnspecifiedType private static final int STATE_FIRST = 1 << 16; /** A request parameter that indicates the first clicked element */ - public final static String FIRST_TARGET = "FIRST_TARGET"; //$NON-NLS-1$ + public static final String FIRST_TARGET = "FIRST_TARGET"; //$NON-NLS-1$ /** A request parameter that indicates the second clicked element */ - public final static String SECOND_TARGET = "SECOND_TARGET"; //$NON-NLS-1$ + public static final String SECOND_TARGET = "SECOND_TARGET"; //$NON-NLS-1$ protected EditPart first = null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/CustomPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/CustomPaletteFactory.java index f05eab29820..d37d7c6f7c6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/CustomPaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/parts/CustomPaletteFactory.java @@ -82,7 +82,7 @@ public class CustomPaletteFactory extends UMLPaletteFactory { private final static String CREATEGENERALORDERINGCREATIONTOOL = "createGeneralOrderingCreationTool"; //$NON-NLS-1$ - public final static String ORIGINAL_TARGET = "ORIGINAL_TARGET"; //$NON-NLS-1$ + public static final String ORIGINAL_TARGET = "ORIGINAL_TARGET"; //$NON-NLS-1$ @Override public Tool createTool(final String toolId) { diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/factory/ModelElementItemFactory.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/factory/ModelElementItemFactory.java index 2aad178e6d7..30e8884749a 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/factory/ModelElementItemFactory.java +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/factory/ModelElementItemFactory.java @@ -1,22 +1,29 @@ -/* +/***************************************************************************** + * Copyright (c) 2011 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) vincent.lorenzo@cea.fr - Initial API and implementation + * + *****************************************************************************/ package org.eclipse.papyrus.uml.modelexplorer.factory; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; public class ModelElementItemFactory implements IAdapterFactory { public Object getAdapter(Object adaptableObject, Class adapterType) { - EObject eobject = EMFHelper.getEObject(adaptableObject); - return eobject; + return EMFHelper.getEObject(adaptableObject); } public Class<?>[] getAdapterList() { - return null; } diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java index 5326beb3d09..50504540a78 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java @@ -18,20 +18,20 @@ package org.eclipse.papyrus.uml.nattable.stereotype.display.utils; */ public class StereotypeDisplayTreeTableConstants { - public final static String NAME_DEPTH = "nameDepth"; //$NON-NLS-1$ - public final static String IS_DISPLAYED = "isDisplayed"; //$NON-NLS-1$ - public final static String IN_COMMENT = "isDisplayedInComment"; //$NON-NLS-1$ - public final static String IN_COMPARTMENT = "isDisplayedInCompartment"; //$NON-NLS-1$ - public final static String IN_BRACE = "isDisplayedInBraces"; //$NON-NLS-1$ - public final static String SELECTION = "selection"; //$NON-NLS-1$ + public static final String NAME_DEPTH = "nameDepth"; //$NON-NLS-1$ + public static final String IS_DISPLAYED = "isDisplayed"; //$NON-NLS-1$ + public static final String IN_COMMENT = "isDisplayedInComment"; //$NON-NLS-1$ + public static final String IN_COMPARTMENT = "isDisplayedInCompartment"; //$NON-NLS-1$ + public static final String IN_BRACE = "isDisplayedInBraces"; //$NON-NLS-1$ + public static final String SELECTION = "selection"; //$NON-NLS-1$ - public final static String PREFIX = "stereotype_display_properties:/"; //$NON-NLS-1$ - public final static String GMF_CUSTOM_PREFIX = "gmf_custom:/"; //$NON-NLS-1$ + public static final String PREFIX = "stereotype_display_properties:/"; //$NON-NLS-1$ + public static final String GMF_CUSTOM_PREFIX = "gmf_custom:/"; //$NON-NLS-1$ - public final static String NAME_DEPTH_LABEL = "Name Depth"; //$NON-NLS-1$ - public final static String IS_DISPLAYED_LABEL = "Visible"; //$NON-NLS-1$ - public final static String IN_COMMENT_LABEL = "In Comment"; //$NON-NLS-1$ - public final static String IN_COMPARTMENT_LABEL = "In Compartment"; //$NON-NLS-1$ - public final static String IN_BRACE_LABEL = "in Brace"; //$NON-NLS-1$ + public static final String NAME_DEPTH_LABEL = "Name Depth"; //$NON-NLS-1$ + public static final String IS_DISPLAYED_LABEL = "Visible"; //$NON-NLS-1$ + public static final String IN_COMMENT_LABEL = "In Comment"; //$NON-NLS-1$ + public static final String IN_COMPARTMENT_LABEL = "In Compartment"; //$NON-NLS-1$ + public static final String IN_BRACE_LABEL = "in Brace"; //$NON-NLS-1$ } diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/src/org/eclipse/papyrus/uml/appearance/helper/UMLVisualInformationPapyrusConstant.java b/plugins/uml/org.eclipse.papyrus.uml.appearance/src/org/eclipse/papyrus/uml/appearance/helper/UMLVisualInformationPapyrusConstant.java index 60610e1a4bc..ba0043e8051 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/src/org/eclipse/papyrus/uml/appearance/helper/UMLVisualInformationPapyrusConstant.java +++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/src/org/eclipse/papyrus/uml/appearance/helper/UMLVisualInformationPapyrusConstant.java @@ -103,12 +103,12 @@ public interface UMLVisualInformationPapyrusConstant { /** * The Constant P_STEREOTYPE_NAME_DISPLAY_USER_CONTROLLED. */ - public final static String P_STEREOTYPE_NAME_DISPLAY_USER_CONTROLLED = "User Controlled"; + public static final String P_STEREOTYPE_NAME_DISPLAY_USER_CONTROLLED = "User Controlled"; /** * The Constant P_STEREOTYPE_NAME_DISPLAY_UML_CONFORM. */ - public final static String P_STEREOTYPE_NAME_DISPLAY_UML_CONFORM = "UML Compatibility (lower case first letter - default)"; + public static final String P_STEREOTYPE_NAME_DISPLAY_UML_CONFORM = "UML Compatibility (lower case first letter - default)"; /** * The Constant P_STEREOTYPE_NAME_APPEARANCE. diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionIds.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionIds.java index 56b3d094323..aadcbd2d211 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionIds.java +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/ExtensionIds.java @@ -26,17 +26,17 @@ public class ExtensionIds { public static final String METAMODEL_EXTENSION_ID = Activator.PLUGIN_ID + "." + "UMLMetamodel"; /** name of the <code>name</code> attribute in the DTD */ - public final static String ATT_NAME = "name"; + public static final String ATT_NAME = "name"; /** name of the <code>path</code> attribute in the DTD */ - public final static String ATT_PATH = "path"; + public static final String ATT_PATH = "path"; /** name of the <code>icon</code> attribute in the DTD */ - public final static String ATT_ICON_PATH = "iconpath"; + public static final String ATT_ICON_PATH = "iconpath"; /** name of the <code>description</code> attribute in the DTD */ - public final static String ATT_DESCRIPTION = "description"; + public static final String ATT_DESCRIPTION = "description"; /** name of the <code>provider</code>attribute in the DTD */ - public final static String ATT_PROVIDER = "provider"; + public static final String ATT_PROVIDER = "provider"; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java index 9751251648f..9c0f04ed24b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java @@ -22,10 +22,10 @@ import org.eclipse.jface.preference.IPreferenceStore; public class ProfileDefinitionPreferenceConstants { /** preference ID for author name */ - public final static String PREF_AUTHOR_NAME = "ProfileDefinitionPreferenceConstants.author.name"; + public static final String PREF_AUTHOR_NAME = "ProfileDefinitionPreferenceConstants.author.name"; /** preference ID for author name */ - public final static String PREF_COPYRIGHT = "ProfileDefinitionPreferenceConstants.copyright"; + public static final String PREF_COPYRIGHT = "ProfileDefinitionPreferenceConstants.copyright"; /** * initialize default preferences diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java index 54a6e2e367c..04a66dcfc81 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java @@ -22,10 +22,10 @@ import org.eclipse.jface.preference.IPreferenceStore; public class ProfilePreferenceConstants { /** Constant for the expand stereotype tree preference */ - public final static String EXPAND_STEREOTYPES_TREE = "StereotypesTree.expandAll"; + public static final String EXPAND_STEREOTYPES_TREE = "StereotypesTree.expandAll"; /** Constant for the use of Stereotype icons in Outline */ - public final static String USE_STEREOTYPE_ICON_IN_OUTLINE = "StereotypesIcon.useInOutline"; + public static final String USE_STEREOTYPE_ICON_IN_OUTLINE = "StereotypesIcon.useInOutline"; /** * this method is used to store default preference of stereotype display. diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java index 3bf462557d1..5a43efa17ea 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java @@ -200,7 +200,7 @@ public class ProfileElementLabelProvider extends LabelProvider { } } - public final static String TAG_PROFILE_CHANGED = TAB + "(has changed, consider re-applying profile)"; //$NON-NLS-1$ + public static final String TAG_PROFILE_CHANGED = TAB + "(has changed, consider re-applying profile)"; //$NON-NLS-1$ /** * Returns the label to show for a property. diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java index 404c2e2e358..77a630719fb 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java @@ -50,7 +50,7 @@ import org.eclipse.uml2.uml.Profile; public class ProfileDefinitionDialog extends TitleAreaDialog { /** path to the banner image */ - public final static String PROFILE_DEFINITION = ImageManager.IMAGE_PATH + "wizban/NewDefinition.gif"; //$NON-NLS-1$ + public static final String PROFILE_DEFINITION = ImageManager.IMAGE_PATH + "wizban/NewDefinition.gif"; //$NON-NLS-1$ /** Text area that displays previous version of the profile definition */ protected Text oldVersionText; diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java index 2a4cdab0954..cde2c6bb8de 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java @@ -41,7 +41,7 @@ public class ParticipantValidator implements IParticipantValidator { super(); } - public final static ParticipantValidator getInstance() { + public static final ParticipantValidator getInstance() { if (ParticipantValidator.instance == null) { synchronized (ParticipantValidator.class) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java index d4aba2460fe..21568e15042 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java @@ -55,7 +55,7 @@ public class StereotypeCollector implements IStereotypeCollector { super(); } - public final static StereotypeCollector getInstance() { + public static final StereotypeCollector getInstance() { return StereotypeCollector.instance; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/util/ExtensionHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/util/ExtensionHelper.java index 706a246947e..410de8a01d4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/util/ExtensionHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/ui/util/ExtensionHelper.java @@ -61,17 +61,17 @@ import org.eclipse.uml2.uml.UMLFactory; public class ExtensionHelper extends ElementHelper { /** constant for this edit policy role */ - public final static String SPECIFIC_EXTENSION_NAME_POLICY = "SpecificExtensionNameEditPolicy"; //$NON-NLS-1$ + public static final String SPECIFIC_EXTENSION_NAME_POLICY = "SpecificExtensionNameEditPolicy"; //$NON-NLS-1$ /** * the extension's name begins by this string */ - final static public String EXTENSION = "Extension_"; //$NON-NLS-1$ + public static final String EXTENSION = "Extension_"; //$NON-NLS-1$ /** * the property's name in the stereotype begins by base_ */ - final static public String BASE = "base_"; //$NON-NLS-1$ + public static final String BASE = "base_"; //$NON-NLS-1$ /** the source position in Extension.getMembersEnds() */ diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java index 4758414fc00..49714414a7d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java @@ -93,7 +93,7 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend * @return * the map linking an element type to a EReference */ - abstract protected Map<String, EReference> getFeatureElementTypeToEReferenceMap(); + protected abstract Map<String, EReference> getFeatureElementTypeToEReferenceMap(); /** * @@ -212,14 +212,14 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend * @return * <code>true</code> if we cross the connector whose the source is connected to the element */ - abstract protected boolean checkSourceEdgeToFindConnectorToDestroy(); + protected abstract boolean checkSourceEdgeToFindConnectorToDestroy(); /** * * @return * <code>true</code> if we cross the connector whose the target is connected to the element */ - abstract protected boolean checkTargetEdgeToFindConnectorToDestroy(); + protected abstract boolean checkTargetEdgeToFindConnectorToDestroy(); /** * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyReferenceCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest) diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java index 4b249ccd592..e4a273dfe8b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java +++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java @@ -77,15 +77,15 @@ public abstract class AbstractUmlRule<T extends RuleConfiguration> extends Abstr return super.approveRequest(request); } - abstract protected boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request); + protected abstract boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request); - abstract protected boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request); + protected abstract boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request); - abstract protected boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request); + protected abstract boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request); - abstract protected boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request); + protected abstract boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request); - abstract protected boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request); + protected abstract boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request); @Override public void init(T invariantRuleConfiguration) { diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java index 9a6f6cd8d0b..00a86638574 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java @@ -38,21 +38,21 @@ public class UMLPrimitiveTypesModel { public Type UMLPrimitiveTypes_REAL; /** constant to identify the type of a Boolean property */ - final static public String UMLPrimitiveTypes_BOOLEAN_NAME = "PrimitiveTypes::Boolean"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_BOOLEAN_NAME = "PrimitiveTypes::Boolean"; //$NON-NLS-1$ /** constant to identify the type of an Integer property */ - final static public String UMLPrimitiveTypes_INTEGER_NAME = "PrimitiveTypes::Integer"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_INTEGER_NAME = "PrimitiveTypes::Integer"; //$NON-NLS-1$ /** constant to identify the type of a String property */ - final static public String UMLPrimitiveTypes_STRING_NAME = "PrimitiveTypes::String"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_STRING_NAME = "PrimitiveTypes::String"; //$NON-NLS-1$ /** constant to identify the type of an Unlimited Natural property */ - final static public String UMLPrimitiveTypes_UNLIMITED_NATURAL_NAME = "PrimitiveTypes::UnlimitedNatural"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_UNLIMITED_NATURAL_NAME = "PrimitiveTypes::UnlimitedNatural"; //$NON-NLS-1$ /** constant to identify the type of an Unlimited Natural property */ - final static public String UMLPrimitiveTypes_REAL_NAME = "PrimitiveTypes::Real"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_REAL_NAME = "PrimitiveTypes::Real"; //$NON-NLS-1$ - final static public String UMLPrimitiveTypes_LIBRARY_NAME = "UMLPrimitiveTypes"; //$NON-NLS-1$ + public static final String UMLPrimitiveTypes_LIBRARY_NAME = "UMLPrimitiveTypes"; //$NON-NLS-1$ private static final Object UMLPrimitiveTypes_PACKAGE_NAME = "PrimitiveTypes"; //$NON-NLS-1$; diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java index 56291f2299e..96133e4fa2e 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java @@ -100,7 +100,7 @@ public abstract class AbstractQVTGenerator implements IGenerator, Listener { * @return the list of in/out/inout ModelExtents (including the OutContextExtent) * Implementors should ensure they add the outContextExtent to the list. */ - abstract protected List<ModelExtent> getModelExtents(); + protected abstract List<ModelExtent> getModelExtents(); /** * @return the ModelExtent containing the generated context @@ -116,7 +116,7 @@ public abstract class AbstractQVTGenerator implements IGenerator, Listener { /** * @return the URI of the QVTO transformation file. */ - abstract protected URI getTransformationURI(); + protected abstract URI getTransformationURI(); /** * Loads the EObject from the given URI. diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java index 7c5d6e15ea5..4f71bd6f662 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java @@ -312,7 +312,7 @@ public class UMLModelElement extends EMFModelElement { /** * The set of all EStructuralFeature representing subsets of {@link Namespace#getOwnedRules()} */ - public final static Set<EStructuralFeature> ownedRuleSubsets = new HashSet<EStructuralFeature>(); + public static final Set<EStructuralFeature> ownedRuleSubsets = new HashSet<EStructuralFeature>(); static { // Behavior diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java index aefc2491313..30f55e2e408 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java @@ -80,7 +80,7 @@ import org.eclipse.uml2.uml.Profile; */ public class AppliedProfileCompositeOnModel extends Composite { - public final static String TAG_PROFILE_CHANGED = " (has changed, consider re-applying profile)"; + public static final String TAG_PROFILE_CHANGED = " (has changed, consider re-applying profile)"; /** * The add registered button. diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java index 124e850ed11..65a0f66828b 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java @@ -25,7 +25,7 @@ import org.eclipse.uml2.uml.CollaborationUse; */ public class CollaborationUseUtil { - public final static String UNDEFINED_TYPE_NAME = "<Undefined>"; + public static final String UNDEFINED_TYPE_NAME = "<Undefined>"; /** * return the full label of the CollaborationUse, given UML2 specification. diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java index 56f05a899f4..392baa7d89c 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java @@ -26,7 +26,7 @@ public interface ICustomAppearance { * key for the appearance property of graph nodes. */ // @unused - public final static String CUSTOM_APPEARENCE_KEY = "custom_disp"; + public static final String CUSTOM_APPEARENCE_KEY = "custom_disp"; // ///////////////////////////////////////////////////////////////////////// // Style constants @@ -34,22 +34,22 @@ public interface ICustomAppearance { /** * Style constant for visibility display in labels. */ - public final static String DISP_VISIBILITY = "visibility"; + public static final String DISP_VISIBILITY = "visibility"; /** * Style constant for isDerive display in labels. */ - public final static String DISP_DERIVE = "derived"; + public static final String DISP_DERIVE = "derived"; /** * Style constant for name display in labels. */ - public final static String DISP_NAME = "name"; + public static final String DISP_NAME = "name"; /** * Style constant for type display in labels. */ - public final static String DISP_TYPE = "type"; + public static final String DISP_TYPE = "type"; /** Style constant for display state in labels*/ public final String DISP_STATE = "state"; @@ -57,28 +57,28 @@ public interface ICustomAppearance { /** * Style constant for multiplicity display in labels. */ - public final static String DISP_MULTIPLICITY = "multiplicity"; + public static final String DISP_MULTIPLICITY = "multiplicity"; /** * Style constant for multiplicity display without brackets in labels. */ - public final static String DISP_MULTIPLICITY_NO_BRACKETS = "multiplicityNoBrackets"; + public static final String DISP_MULTIPLICITY_NO_BRACKETS = "multiplicityNoBrackets"; /** * Style constant for default value display in labels. */ - public final static String DISP_DEFAULT_VALUE = "defaultValue"; + public static final String DISP_DEFAULT_VALUE = "defaultValue"; /** * Style constant for modifiers display in labels. */ - public final static String DISP_MODIFIERS = "modifiers"; + public static final String DISP_MODIFIERS = "modifiers"; /** Style constant for carriage return in labels */ - public final static String DISP_MULTI_LINE = "multiline"; + public static final String DISP_MULTI_LINE = "multiline"; /** Prefix used to distinguish parameter-specific values (e.g. name vs parametersName, for an Operation) */ - public final static String PARAMETERS_PREFIX = "parameters"; + public static final String PARAMETERS_PREFIX = "parameters"; /** Style constant for operation#parameter direction display in labels */ public final String DISP_PARAMETER_DIRECTION = PARAMETERS_PREFIX + "Direction"; @@ -116,59 +116,59 @@ public interface ICustomAppearance { /** * default uml property display in classes edit part. */ - public final static Collection<String> DEFAULT_UML_PROPERTY = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE, DISP_MULTIPLICITY); + public static final Collection<String> DEFAULT_UML_PROPERTY = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE, DISP_MULTIPLICITY); /** * default uml property display in for floating label edit part. */ - public final static Collection<String> DEFAULT_UML_FLOATING_LABEL = Arrays.asList(DISP_NAME); + public static final Collection<String> DEFAULT_UML_FLOATING_LABEL = Arrays.asList(DISP_NAME); /** * default uml property display in classes edit part. */ - public final static Collection<String> DEFAULT_UML_ROLE = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE); + public static final Collection<String> DEFAULT_UML_ROLE = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE); /** * default uml operation display. */ - public final static Collection<String> DEFAULT_UML_OPERATION = Arrays.asList(DISP_VISIBILITY, DISP_NAME, DISP_PARAMETER_DIRECTION, DISP_PARAMETER_TYPE, DISP_RT_TYPE, DISP_PARAMETER_NAME); + public static final Collection<String> DEFAULT_UML_OPERATION = Arrays.asList(DISP_VISIBILITY, DISP_NAME, DISP_PARAMETER_DIRECTION, DISP_PARAMETER_TYPE, DISP_RT_TYPE, DISP_PARAMETER_NAME); /** * default uml Property in composite diagrams. */ // @unused - public final static Collection<String> DEFAULT_UML_COMPO_PROPERTY = Arrays.asList(DISP_NAME, DISP_TYPE); + public static final Collection<String> DEFAULT_UML_COMPO_PROPERTY = Arrays.asList(DISP_NAME, DISP_TYPE); /** * default uml Property in class diagrams as association ends. */ // @unused - public final static Collection<String> DEFAULT_UML_RELATIONEND_PROPERTY = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_MODIFIERS, DISP_MULTI_LINE); + public static final Collection<String> DEFAULT_UML_RELATIONEND_PROPERTY = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_MODIFIERS, DISP_MULTI_LINE); /** * default uml Port ins composite diagrams. */ - public final static Collection<String> DEFAULT_UML_PORT = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE, DISP_MULTIPLICITY, DISP_CONJUGATED); + public static final Collection<String> DEFAULT_UML_PORT = Arrays.asList(DISP_VISIBILITY, DISP_DERIVE, DISP_NAME, DISP_TYPE, DISP_MULTIPLICITY, DISP_CONJUGATED); /** * default uml OpaqueAction in activity diagrams. */ // @unused - public final static Collection<String> DEFAULT_UML_OPAQUE_ACTION = Arrays.asList(DISP_NAME); + public static final Collection<String> DEFAULT_UML_OPAQUE_ACTION = Arrays.asList(DISP_NAME); /** * default uml Parameter in composite diagrams. */ - public final static Collection<String> DEFAULT_UML_PARAMETER = Arrays.asList(DISP_DIRECTION, DISP_NAME, DISP_TYPE); + public static final Collection<String> DEFAULT_UML_PARAMETER = Arrays.asList(DISP_DIRECTION, DISP_NAME, DISP_TYPE); /** * default uml instancespecification . */ - public final static Collection<String> DEFAULT_UML_INSTANCESPECIFICATION = Arrays.asList(DISP_NAME, DISP_TYPE); + public static final Collection<String> DEFAULT_UML_INSTANCESPECIFICATION = Arrays.asList(DISP_NAME, DISP_TYPE); /** * default uml ActivityParameterNode . */ - public final static Collection<String> DEFAULT_UML_ACTIVITYPARAMETERNODE = Arrays.asList(DISP_NAME); + public static final Collection<String> DEFAULT_UML_ACTIVITYPARAMETERNODE = Arrays.asList(DISP_NAME); } diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java index fae53a36979..304fdbe3868 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java @@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Type; */ public class TypeUtil { - public final static String UNDEFINED_TYPE_NAME = "<Undefined>"; + public static final String UNDEFINED_TYPE_NAME = "<Undefined>"; /** * Get a string that displays the name of the type, and then its namespace. diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/helper/EventCreationHelper.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/helper/EventCreationHelper.java index 9f61666e57c..b7ce41b4b0d 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/helper/EventCreationHelper.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/helper/EventCreationHelper.java @@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.ValueSpecification; */ public class EventCreationHelper { public static final String NATURAL_LANGUAGE = "Natural language"; //$NON-NLS-1$ - public final static String EVENTS = "events"; //$NON-NLS-1$ + public static final String EVENTS = "events"; //$NON-NLS-1$ Transition transition; diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/ProfileLabelProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/ProfileLabelProvider.java index 1d1efcabd52..2b9d997f434 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/ProfileLabelProvider.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/ProfileLabelProvider.java @@ -23,9 +23,9 @@ public class ProfileLabelProvider extends EMFLabelProvider implements ILabelProv private Package umlPackage; - public final static String TAG_PROFILE_CHANGED = " (has changed, consider re-applying profile)"; + public static final String TAG_PROFILE_CHANGED = " (has changed, consider re-applying profile)"; - public final static String UNKNOWN_PROFILE = "<Unknown>"; + public static final String UNKNOWN_PROFILE = "<Unknown>"; public ProfileLabelProvider(Package umlPackage) { this.umlPackage = umlPackage; diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/MultiViewPageBookView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/MultiViewPageBookView.java index 673384fe5d6..dd130403168 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/MultiViewPageBookView.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/MultiViewPageBookView.java @@ -75,7 +75,7 @@ public abstract class MultiViewPageBookView extends PageBookView { * @return */ @Override - abstract protected PageRec doCreatePage(IWorkbenchPart part); + protected abstract PageRec doCreatePage(IWorkbenchPart part); /** * @see org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart, org.eclipse.ui.part.PageBookView.PageRec) diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ViewPartPage.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ViewPartPage.java index c622f807c27..e8eb8a7815b 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ViewPartPage.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ViewPartPage.java @@ -93,7 +93,7 @@ public abstract class ViewPartPage extends Page implements IAdaptable { * * @return The Viewer to render in the page. */ - abstract protected IViewPart createViewer(IWorkbenchPart part); + protected abstract IViewPart createViewer(IWorkbenchPart part); /** * Subclass must implement this method. diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java index 2ee94a2ea6a..fa3d590501f 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java @@ -34,7 +34,7 @@ public class PatternHelper { * * @return the helper */ - public final static PatternHelper getInstance() { + public static final PatternHelper getInstance() { synchronized (PatternHelper.class) { if (PatternHelper.instance == null) { diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java index c26d890b076..c00b2668ddb 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java @@ -61,7 +61,7 @@ public class ScopeCollector implements IScopeCollector { scopeProviders = loadScopeProviders(); } - public final static ScopeCollector getInstance() { + public static final ScopeCollector getInstance() { diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/ModelUtils.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/ModelUtils.java index ad6cfbb007e..c45f5b97c4e 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/ModelUtils.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/ModelUtils.java @@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelsReader; public class ModelUtils { - public final static ModelSet openResource(URI resourceURI) throws ModelMultiException { + public static final ModelSet openResource(URI resourceURI) throws ModelMultiException { if (resourceURI != null) { // TODO: Need to be able to create CDOAwareModelSet ModelSet modelSet = new ModelSet(); diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java index 6f46cbeeead..7f4100def81 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java @@ -34,7 +34,7 @@ public class ParticipantValidator implements IParticipantValidator { super(); } - public final static ParticipantValidator getInstance() { + public static final ParticipantValidator getInstance() { synchronized (ParticipantValidator.class) { diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java index 46e4d8bfa57..c642e89823b 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java @@ -40,12 +40,12 @@ public class CustomizationPreferencePage extends FieldEditorPreferencePage imple /** * */ - public final static String OPEN_CUSTOMIZATION_PERSPECTIVE = "openCustomizationPerspective"; //$NON-NLS-1$ + public static final String OPEN_CUSTOMIZATION_PERSPECTIVE = "openCustomizationPerspective"; //$NON-NLS-1$ /** * */ - public final static String ASK_FOR_CONFIRMATION = "askForConfirmation"; //$NON-NLS-1$ + public static final String ASK_FOR_CONFIRMATION = "askForConfirmation"; //$NON-NLS-1$ /** * diff --git a/plugins/views/references/org.eclipse.papyrus.views.references/src/org/eclipse/papyrus/views/references/providers/ReferencesHeaderLabelProvider.java b/plugins/views/references/org.eclipse.papyrus.views.references/src/org/eclipse/papyrus/views/references/providers/ReferencesHeaderLabelProvider.java index 65bbf40b583..eebcb394847 100644 --- a/plugins/views/references/org.eclipse.papyrus.views.references/src/org/eclipse/papyrus/views/references/providers/ReferencesHeaderLabelProvider.java +++ b/plugins/views/references/org.eclipse.papyrus.views.references/src/org/eclipse/papyrus/views/references/providers/ReferencesHeaderLabelProvider.java @@ -33,7 +33,7 @@ public class ReferencesHeaderLabelProvider extends LabelProvider { /** * The {@link LabelProviderService} Context */ - public final static String REFERENCES_HEADER_CONTEXT = "org.eclipse.papyrus.view.references.header.labelProvider.context"; //$NON-NLS-1$ + public static final String REFERENCES_HEADER_CONTEXT = "org.eclipse.papyrus.view.references.header.labelProvider.context"; //$NON-NLS-1$ /** * Constructor. |