Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java29
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java14
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java48
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java17
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java1
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java10
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java10
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/ReconcilerForCompartment.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/AbstractShowHideHandler.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/CustomPopupDialog.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractDistributeAction.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/SubjectNodeEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/UseCaseNodeEditPart.java2
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/model/ModelChangeSupport.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/core/ui/pagebookview/ViewPartPage.java2
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java2
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java2
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractGenericShapeTest.java2
30 files changed, 63 insertions, 126 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
index 7a455fe448f..7d913fa2f53 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
@@ -25,14 +25,14 @@ public abstract class AbstractModel {
*
* @return the parent
*/
- abstract public AbstractModel getParent();
+ public abstract AbstractModel getParent();
/**
* @param parent
* the parent to set
*/
- abstract public void setParent(AbstractModel parent);
+ public abstract void setParent(AbstractModel parent);
/**
* Replace the oldChild by the newChild
@@ -40,6 +40,6 @@ public abstract class AbstractModel {
* @param oldChild
* @param newChild
*/
- abstract public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild);
+ public abstract void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild);
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
index 1f052fa422a..529665bbc69 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.infra.core.sasheditor.internal;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.internal.dnd.IDropTarget;
@@ -49,25 +48,25 @@ public abstract class AbstractPanelPart extends AbstractPart {
*
* @param container
*/
- abstract public void createPartControl(Composite container);
+ public abstract void createPartControl(Composite container);
/**
* Dispose all nested SWT controls.
*/
- abstract public void dispose();
+ public abstract void dispose();
/**
* Dispose this part and all its children.
* The method is called recursively on children of the part.
*/
- abstract public void disposeThisAndChildren();
+ public abstract void disposeThisAndChildren();
/**
* Visit the part.
*
* @param visitor
*/
- abstract public boolean visit(IPartVisitor visitor);
+ public abstract boolean visit(IPartVisitor visitor);
/**
* Synchronize the part and its children with the models in contentProvider.
@@ -75,7 +74,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @param existingParts
* List of already existing part before the synchronization.
*/
- abstract public void synchronize2(PartLists existingParts);
+ public abstract void synchronize2(PartLists existingParts);
/**
* Return true is the part is for the specified raw model.
@@ -84,7 +83,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @param rawModel
* @return
*/
- abstract public boolean isPartFor(Object rawModel);
+ public abstract boolean isPartFor(Object rawModel);
/**
* Orphan this node. The parent is set to null, but control is left unchanged.
@@ -114,7 +113,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
} else {
// Bad state, this is an internal error
// TODO : log a warning ?
- throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden.");
+ throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -125,7 +124,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @param newParent
* The new parent to which the part should be attached.
*/
- abstract public void reparent(IPanelParent newParent, Composite swtParent);
+ public abstract void reparent(IPanelParent newParent, Composite swtParent);
/**
* Collect all the parts. The method is called recursively in the tree of parts.
@@ -133,7 +132,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @param parts
* The list into which parts are added.
*/
- abstract public void fillPartMap(PartLists parts);
+ public abstract void fillPartMap(PartLists parts);
/**
* Traverses the tree to find the part that intersects the given point
@@ -143,7 +142,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @return the part that intersects the given point
* @throws NotFoundException
*/
- abstract public AbstractPart findPart(Point toFind) throws NotFoundException;
+ public abstract AbstractPart findPart(Point toFind) throws NotFoundException;
/**
* Find the part associated to the provided control.
@@ -151,7 +150,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* @param control
* @return
*/
- abstract public AbstractPart findPart(Object control);
+ public abstract AbstractPart findPart(Object control);
/**
* Locates the part that intersects the given point and that have the expected type
@@ -160,7 +159,7 @@ public abstract class AbstractPanelPart extends AbstractPart {
* Position in Display coordinate.
* @return
*/
- abstract public AbstractPart findPartAt(Point toFind, Class<?> expectedTileType);
+ public abstract AbstractPart findPartAt(Point toFind, Class<?> expectedTileType);
/* ***************************************************** */
/* Drag and Drop methods */
@@ -169,13 +168,13 @@ public abstract class AbstractPanelPart extends AbstractPart {
/**
* Return the swt Control associated to this part.
*/
- abstract public Composite getControl();
+ public abstract Composite getControl();
/**
* Get the drop target.
* Used by the drag tab mechanism.
*/
- abstract public IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position);
+ public abstract IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position);
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
index bbb25e21e46..1547ff3b067 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.papyrus.infra.core.sasheditor.Activator;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;
import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -79,8 +80,6 @@ public class ComponentPart extends PagePart implements IComponentPage {
try {
// Initialize it and create its controls.
editorControl = createEditorPartControl(parent);
- // attachListeners(editorControl, true);
-
} catch (PartInitException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getLocalizedMessage()));
}
@@ -112,7 +111,6 @@ public class ComponentPart extends PagePart implements IComponentPage {
public void dispose() {
if( !editorControl.isDisposed() ) {
- // detachListeners(editorControl, true);
// dispose the SWT root control
editorControl.dispose();
}
@@ -226,7 +224,7 @@ public class ComponentPart extends PagePart implements IComponentPage {
} else {
// Bad state, this is an internal error
// TODO : log a warning ?
- throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to REPARENTED. This is forbidden.");
+ throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to REPARENTED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -298,15 +296,7 @@ public class ComponentPart extends PagePart implements IComponentPage {
* Show item status.
*/
protected void showStatus() {
- // System.out.println( "EditorTile: "
- // + " disposed=" + editorControl.isDisposed()
- // + ", visible=" + editorControl.isVisible()
- // + ", garbState=" + garbageState
- // + ", '" + editorPart.getTitle()
- // + "', " + this);
-
System.out.printf("ComponentPart: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, getPageTitle(), this);
-
}
/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
index 1f4855d04ae..03aa1e8e1eb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
@@ -26,7 +26,6 @@ import org.eclipse.papyrus.infra.core.sasheditor.Activator;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;
import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.IMultiPageEditorSite;
import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageEditorSite;
import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
@@ -80,22 +79,11 @@ public class EditorPart extends PagePart implements IEditorPage {
private Composite editorControl;
/**
- * The MultiPageContainer system. This is the manager of all tiles.
- */
- // private SashWindowsContainer tilesContainer;
-
- /**
* The manager used to access main editor properties like site, actionbars, ...
*/
private IMultiEditorManager multiEditorManager;
/**
- * Parent owning this PagePart.
- * Can be null if the Part is orphaned. Even if it is orphaned, the Item still set.
- */
- // protected TabFolderPart parent;
-
- /**
* Listen on mouse enter event.
* Try to get an event indicating that the mouse enter over the editor.
* This can be used to switch the active editor.
@@ -110,8 +98,6 @@ public class EditorPart extends PagePart implements IEditorPage {
*/
@Override
public void handleEvent(Event event) {
- // Point globalPos = new Point(event.x, event.y);
- // System.out.println(this.getClass().getSimpleName() + ".handleEvent(" + eventName(event.type) + ", " + globalPos + ")");
}
};
@@ -134,32 +120,6 @@ public class EditorPart extends PagePart implements IEditorPage {
}
};
- // To be removed
- // private String eventName(int eventType) {
- // switch(eventType) {
- // case SWT.MouseEnter:
- // return "MouseEnter";
- // case SWT.MouseDown:
- // return "MouseDown";
- // case SWT.MouseExit:
- // return "MouseExit";
- // case SWT.MouseHover:
- // return "MouseHover";
- // case SWT.FocusIn:
- // return "FocusIn";
- // case SWT.FocusOut:
- // return "FocusOut";
- // case SWT.MouseMove:
- // return "MouseMove";
- // case SWT.MouseUp:
- // return "MouseUp";
- // case SWT.Activate:
- // return "Activate";
- // default:
- // return Integer.toString(eventType);
- // }
- // }
-
/**
* Constructor.
*
@@ -453,7 +413,6 @@ public class EditorPart extends PagePart implements IEditorPage {
// clean up properties to help GC
editorModel = null;
- // editorPart = null;
rawModel = null;
}
@@ -471,7 +430,6 @@ public class EditorPart extends PagePart implements IEditorPage {
// clean up properties to help GC
editorModel = null;
- // editorPart = null;
rawModel = null;
}
@@ -719,12 +677,6 @@ public class EditorPart extends PagePart implements IEditorPage {
* Show item status.
*/
protected void showStatus() {
- // System.out.println( "EditorTile: "
- // + " disposed=" + editorControl.isDisposed()
- // + ", visible=" + editorControl.isVisible()
- // + ", garbState=" + garbageState
- // + ", '" + editorPart.getTitle()
- // + "', " + this);
String title = (editorPart != null ? editorPart.getTitle() : "no editorPart");
System.out.printf("EditorTile: disposed=%-5b, visible=%-5b, garbState=%-10s, %s, %s\n", editorControl.isDisposed(), (editorControl.isDisposed() ? false : editorControl.isVisible()), garbageState, title, this);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
index 5f40b99dc8f..aa14f4fefb7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
@@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
@@ -109,7 +108,7 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
} else {
// Bad state, this is an internal error
// TODO : log a warning ?
- throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden.");
+ throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -143,7 +142,7 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
*
* @param parent
*/
- abstract public void createPartControl(Composite parent);
+ public abstract void createPartControl(Composite parent);
/**
* Get the control associated to this Part.
@@ -151,7 +150,7 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
* @return
*/
@Override
- abstract public Control getControl();
+ public abstract Control getControl();
/**
* reparent this Part with the specified new parent.
@@ -159,7 +158,7 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
*
* @param parent
*/
- abstract public void reparent(TabFolderPart parent);
+ public abstract void reparent(TabFolderPart parent);
/**
* Return the {@link Widget} of the tab associated to this page.
@@ -239,20 +238,20 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
* Set focus on the SWT control associated to this PagePart.
* Used by the ActivePageTracker.
*/
- abstract public void setFocus();
+ public abstract void setFocus();
/**
* Dispose the part. <br/>
* The part and its associated resource are disposed.
*
*/
- abstract public void dispose();
+ public abstract void dispose();
/**
* Dispose this part and all its children.
* The method is called recursively on children of the part.
*/
- abstract public void disposeThisAndChildren();
+ public abstract void disposeThisAndChildren();
/**
* Garbage the part. <br/>
@@ -261,7 +260,7 @@ public abstract class PagePart extends AbstractPart implements IPage, IAdaptable
* All resources used by this node should be reclaimed, but not its subnodes.
*
*/
- abstract public void garbage();
+ public abstract void garbage();
/**
* Return true if the part is associated to the specified rawModel.
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 5cb507fd969..1e989eed468 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
@@ -80,7 +80,7 @@ public abstract class AbstractTabFolderPart extends AbstractPanelPart {
* The parent in which the editor should be created; must not be <code>null</code>.
*/
@Override
- abstract public void createPartControl(Composite parent);
+ public abstract void createPartControl(Composite parent);
/**
* Returns the active nested editor if there is one.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java
index 47bf47e9ef7..0a14788d477 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/service/IPageManager.java
@@ -18,6 +18,8 @@ package org.eclipse.papyrus.infra.core.sashwindows.di.service;
import java.util.List;
+import org.eclipse.emf.ecore.EObject;
+
/**
* <p>
* Interface providing method to manage pages in the Sash Windows system.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
index aa1b8cc4f44..7b261b3ca63 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
-import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
import org.eclipse.papyrus.infra.core.resource.IModel;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index f6f44d9f54b..54ab1d181a9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -33,9 +33,8 @@ import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.papyrus.infra.core.Activator;
-import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
-import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;
import org.eclipse.papyrus.infra.core.resource.IModel;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -328,10 +327,7 @@ public class SashModel extends EMFLogicalModel implements IModel {
Activator.log.error(ex);
}
}
-
- URI preferenceStoreURI = getSashModelStoreURI(uriWithoutExtension);
-
- return preferenceStoreURI;
+ return getSashModelStoreURI(uriWithoutExtension);
}
protected URI getLegacyURI(URI uriWithoutExtension) {
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
index 978ab4ea5d5..3c9943f69d4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
@@ -54,7 +54,7 @@ public abstract class ServiceStartupEntry {
*
* @throws ServiceException
*/
- abstract public void createService() throws ServiceException;
+ public abstract void createService() throws ServiceException;
/**
* Init the associated service if not a Lazy Service.
@@ -64,14 +64,14 @@ public abstract class ServiceStartupEntry {
*
* @throws ServiceException
*/
- abstract public void initService(ServicesRegistry servicesRegistry) throws ServiceException;
+ public abstract void initService(ServicesRegistry servicesRegistry) throws ServiceException;
/**
* Start the associated service if not a Lazy Service.
*
* @throws ServiceException
*/
- abstract public void startService() throws ServiceException;
+ public abstract void startService() throws ServiceException;
/**
* Get the service instance.
@@ -79,12 +79,12 @@ public abstract class ServiceStartupEntry {
* @return
* @throws ServiceException
*/
- abstract public Object getServiceInstance() throws ServiceException;
+ public abstract Object getServiceInstance() throws ServiceException;
/**
* Dispose associated service.
*/
- abstract public void disposeService() throws ServiceException;
+ public abstract void disposeService() throws ServiceException;
/**
* Return the list of the {@link ServiceStartupEntry} required by this
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
index 5e617e9d46d..83dfda89d5c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
@@ -177,14 +177,14 @@ public abstract class ServiceTypeEntry {
* @return
* @throws ServiceException
*/
- abstract public Object getServiceInstance() throws ServiceException;
+ public abstract Object getServiceInstance() throws ServiceException;
/**
* Create the associated service if not a Lazy Service.
*
* @throws ServiceException
*/
- abstract public void createService() throws ServiceException;
+ public abstract void createService() throws ServiceException;
/**
* Start the associated service if not a Lazy Service.
@@ -194,18 +194,18 @@ public abstract class ServiceTypeEntry {
*
* @throws ServiceException
*/
- abstract public void initService(ServicesRegistry servicesRegistry) throws ServiceException;
+ public abstract void initService(ServicesRegistry servicesRegistry) throws ServiceException;
/**
* Start the associated service if not a Lazy Service.
*
* @throws ServiceException
*/
- abstract public void startService() throws ServiceException;
+ public abstract void startService() throws ServiceException;
/**
* Dispose associated service.
*/
- abstract public void disposeService() throws ServiceException;
+ public abstract void disposeService() throws ServiceException;
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
index 5176b8d88d2..e2823a032d1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
@@ -49,7 +49,7 @@ public abstract class AbstractServiceUtils<T> {
* @param from
* @return
*/
- abstract public ServicesRegistry getServiceRegistry(T from) throws ServiceException;
+ public abstract ServicesRegistry getServiceRegistry(T from) throws ServiceException;
/**
* Obtains the service registry determined automatically from the context of which
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/ReconcilerForCompartment.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/ReconcilerForCompartment.java
index efa862f775c..e045a5da1e5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/ReconcilerForCompartment.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/ReconcilerForCompartment.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
/**
* Class Diagram Reconciler from 1.1.0 to 1.2.0. Migrates all compartments Views from DecorationNode to BasicCompartment.
*/
-abstract public class ReconcilerForCompartment extends DiagramReconciler {
+public abstract class ReconcilerForCompartment extends DiagramReconciler {
/**
@@ -54,7 +54,7 @@ abstract public class ReconcilerForCompartment extends DiagramReconciler {
*
* @return the compartments visual id
*/
- abstract public List<String> getCompartmentsVisualID();
+ public abstract List<String> getCompartmentsVisualID();
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
index 2001d77703b..3ded8a6fb2a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
@@ -59,7 +59,7 @@ import org.eclipse.ui.PlatformUI;
*
* @author Ansgar Radermacher (CEA LIST)
*/
-abstract public class AbstractValidateCommand extends AbstractTransactionalCommand {
+public abstract class AbstractValidateCommand extends AbstractTransactionalCommand {
final String modelValidationViewID = "org.eclipse.papyrus.views.validation.ModelValidationView"; //$NON-NLS-1$
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
index 526b838b7da..dc555055e13 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
@@ -69,5 +69,5 @@ public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindi
* @return an instance of the defined advice binding configuration
* @since 3.0
*/
- abstract public AbstractAdviceBindingConfiguration createAdviceBindingConfiguration();
+ public abstract AbstractAdviceBindingConfiguration createAdviceBindingConfiguration();
}
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 badc5aa8d51..67d8cdfbecb 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
@@ -274,7 +274,7 @@ public abstract class AbstractEditor extends Composite implements DisposeListene
* @param targetToModel
* @param modelToTarget
*/
- abstract public void setConverters(IConverter targetToModel, IConverter modelToTarget);
+ public abstract void setConverters(IConverter targetToModel, IConverter modelToTarget);
/**
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
index 84fc6cb48f8..4cb77312c0c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
@@ -29,6 +29,6 @@ public abstract class AbstractTreeBrowseStrategy implements TreeBrowseStrategy {
}
@Override
- abstract public void revealSemanticElement(List<?> elementsList);
+ public abstract void revealSemanticElement(List<?> elementsList);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/AbstractShowHideHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/AbstractShowHideHandler.java
index f0b6b267171..cd430221da7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/AbstractShowHideHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/AbstractShowHideHandler.java
@@ -35,7 +35,7 @@ import org.eclipse.ui.PlatformUI;
*
*/
-abstract public class AbstractShowHideHandler extends AbstractHandler {
+public abstract class AbstractShowHideHandler extends AbstractHandler {
/** the current action */
private AbstractShowHideAction action = null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
index c95ff196656..ffd5aecb801 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
@@ -222,7 +222,7 @@ public abstract class AbstractMaskManagedEditPolicy extends GraphicalEditPolicyE
* {@inheritDoc}
*/
@Override
- abstract public void refreshDisplay();
+ public abstract void refreshDisplay();
/**
* @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener#notifyChanged(org.eclipse.emf.common.notify.Notification)
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 343645f77bd..0f8f6fee40c 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
@@ -31,7 +31,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
/**
* The Class CustomPopupDialog.
*/
-abstract public class CustomPopupDialog extends PopupDialog {
+public abstract class CustomPopupDialog extends PopupDialog {
/** The anchor. */
private Point fAnchor;
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 4a2afb3d619..f269b0d5227 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
@@ -39,7 +39,7 @@ import org.eclipse.papyrus.uml.diagram.common.layout.DistributionConstants;
/**
* The Class AbstractDistributeAction.
*/
-abstract public class AbstractDistributeAction {
+public abstract class AbstractDistributeAction {
/**
* Indicates if we are in a degraded mode for the vertical distribution
@@ -138,7 +138,7 @@ abstract public class AbstractDistributeAction {
* @return
* the command to do this action
*/
- abstract public Command getCommand();
+ public abstract Command getCommand();
/**
*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java
index ff15b5d0aa6..dfc8186e60a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java
@@ -145,7 +145,7 @@ public abstract class AbstractMessageEditPart extends UMLConnectionNodeEditPart
* @return
*/
@Override
- abstract public MessageFigure getPrimaryShape();
+ public abstract MessageFigure getPrimaryShape();
@Override
public void deactivate() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/SubjectNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/SubjectNodeEditPart.java
index d8a4e2ddbf9..dac3e2372c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/SubjectNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/SubjectNodeEditPart.java
@@ -8,7 +8,7 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPa
* @author Mickael ADAM
*
*/
-abstract public class SubjectNodeEditPart extends RoundedCompartmentEditPart {
+public abstract class SubjectNodeEditPart extends RoundedCompartmentEditPart {
/**
* Constructor.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/UseCaseNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/UseCaseNodeEditPart.java
index 939f4d874cc..a800449f628 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/UseCaseNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/edit/parts/UseCaseNodeEditPart.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierCon
/**
* Abstract EditPart for UseCase nodes.
*/
-abstract public class UseCaseNodeEditPart extends RoundedCompartmentEditPart {
+public abstract class UseCaseNodeEditPart extends RoundedCompartmentEditPart {
/**
* Constructor.
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/model/ModelChangeSupport.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/model/ModelChangeSupport.java
index f0baff0d8bf..f259861de9b 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/model/ModelChangeSupport.java
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/model/ModelChangeSupport.java
@@ -10,7 +10,7 @@ import java.beans.PropertyChangeSupport;
* @author cedric dumoulin
*
*/
-abstract public class ModelChangeSupport {
+public abstract class ModelChangeSupport {
/**
* Event manager
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 8acffacf5cb..a497cbb24e5 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
@@ -103,7 +103,7 @@ public abstract class ViewPartPage extends Page implements IAdaptable {
* @return
*/
@Override
- abstract public Control getControl();
+ public abstract Control getControl();
/**
* @see org.eclipse.ui.part.Page#setFocus()
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java
index b77038d0484..f6961c6ec85 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java
@@ -68,7 +68,7 @@ public abstract class AbstractSash extends PanelTerm {
* @param visitor
* @throws QueryException
*/
- abstract public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException ;
+ public abstract void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException ;
/**
* @return The name used in toString
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java
index 19eb3343010..c75ffc9378e 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java
@@ -64,7 +64,7 @@ public abstract class AbstractSashWindowContentProviderFacadeTest {
*
* @return an instance of {@link ISashWindowsContentProviderFacade};
*/
- abstract public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade();
+ public abstract ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade();
/**
* Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
* @throws PagesModelException
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java
index 57e22ecce0d..3a26bc5d674 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java
@@ -66,7 +66,7 @@ public abstract class AbstractSash extends PanelTerm {
* @param visitor
* @throws PagesModelException
*/
- abstract public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException ;
+ public abstract <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException ;
/**
* @return The name used in toString
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractGenericShapeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractGenericShapeTest.java
index de29fdd4a30..d4c875fb556 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractGenericShapeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractGenericShapeTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
* getRoundedBorderNamedElementEditParts extends respectively RoundedCompartmentEditPart and
* RoundedBorderNamedElementEditPart.
*/
-abstract public class AbstractGenericShapeTest extends AbstractPapyrusTest {
+public abstract class AbstractGenericShapeTest extends AbstractPapyrusTest {
/**
* Test rounded compartment edit parts.

Back to the top