[Code style] Apply clean-up and formatter on Main plug-ins

3 files changed, 43 insertions, 26 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
index e233cd78d69..786dec72c52 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
@@ -25,6 +25,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -35,6 +36,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

@@ -42,7 +44,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
index 8f5c010cef4..8f646065bd6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 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

@@ -13,7 +13,6 @@
  */

 package org.eclipse.papyrus.gmf.editpartview.view;

 

-import org.eclipse.gef.ConnectionEditPart;

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IToolBarManager;

@@ -48,9 +47,10 @@ public class EditPartHierarchyView extends ViewPart {
 	 * 

 	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()

 	 */

+	@Override

 	public void setFocus() {

 		Viewer viewer = getViewer();

-		if(viewer != null && !viewer.getControl().isDisposed()) {

+		if (viewer != null && !viewer.getControl().isDisposed()) {

 

 			viewer.getControl().setFocus();

 		}

@@ -58,20 +58,20 @@ public class EditPartHierarchyView extends ViewPart {
 

 	/**

 	 * Create the main tree control

-	 * 

+	 *

 	 * @param parent

 	 * @return Tree

 	 */

 	protected Tree createTree(Composite parent) {

 		Tree tree = new Tree(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI

-			| SWT.FULL_SELECTION);

+				| SWT.FULL_SELECTION);

 		tree.setLinesVisible(true);

 		return tree;

 	}

 

 	/**

 	 * Return the viewer.

-	 * 

+	 *

 	 * @return TreeViewer

 	 */

 	protected TreeViewer getViewer() {

@@ -79,22 +79,23 @@ public class EditPartHierarchyView extends ViewPart {
 	}

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 */

 	public EditPartHierarchyView() {

 		myEditPartlistener = new ISelectionListener() {

 

+			@Override

 			public void selectionChanged(IWorkbenchPart part, ISelection selection) {

 

-				if(selection instanceof IStructuredSelection) {

-					Object selectedobject = ((IStructuredSelection)selection).getFirstElement();

-					if(selectedobject instanceof GraphicalEditPart) {

-						GraphicalEditPart graphicalEP = ((GraphicalEditPart)selectedobject);

+				if (selection instanceof IStructuredSelection) {

+					Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

+					if (selectedobject instanceof GraphicalEditPart) {

+						GraphicalEditPart graphicalEP = ((GraphicalEditPart) selectedobject);

 

-						if(viewer != null) {

-							viewer.setInput(new Object[]{ graphicalEP });

+						if (viewer != null) {

+							viewer.setInput(new Object[] { graphicalEP });

 							viewer.expandAll();

 						}

 					}

@@ -169,33 +170,39 @@ public class EditPartHierarchyView extends ViewPart {
 	protected IContentProvider getContentProvider() {

 		return new ITreeContentProvider() {

 

+			@Override

 			public Object[] getElements(final Object inputElement) {

-				if(inputElement instanceof Object[]) {

-					return (Object[])inputElement;

+				if (inputElement instanceof Object[]) {

+					return (Object[]) inputElement;

 				}

 				return null;

 			}

 

+			@Override

 			public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {

 				// nothing

 			}

 

+			@Override

 			public void dispose() {

 				// nothing

 			}

 

+			@Override

 			public boolean hasChildren(final Object element) {

 

 				return getChildren(element).length != 0;

 			}

 

+			@Override

 			public Object getParent(final Object element) {

 				return null;

 			}

 

+			@Override

 			public Object[] getChildren(final Object parentElement) {

-				if(parentElement instanceof GraphicalEditPart) {

-					return ((GraphicalEditPart)parentElement).getChildren().toArray();

+				if (parentElement instanceof GraphicalEditPart) {

+					return ((GraphicalEditPart) parentElement).getChildren().toArray();

 				}

 				return new Object[0];

 			}

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
index 217cb1513c3..ff1506d108e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 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

@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.NamedElement;
 

 /**

  * This is the label provider to display edit parts

- * 

+ *

  */

 public class EditPartLabelProvider implements ITableLabelProvider, ITableColorProvider {

 

@@ -35,30 +35,35 @@ public class EditPartLabelProvider implements ITableLabelProvider, ITableColorPr
 

 	protected Color customizableDropEditPolicyColor = new Color(Display.getDefault(), 0, 38, 255);

 

+	@Override

 	public void removeListener(ILabelProviderListener listener) {

 	}

 

+	@Override

 	public boolean isLabelProperty(Object element, String property) {

 		return false;

 	}

 

+	@Override

 	public void dispose() {

 	}

 

+	@Override

 	public void addListener(ILabelProviderListener listener) {

 	}

 

+	@Override

 	public String getColumnText(Object element, int columnIndex) {

-		if(element instanceof GraphicalEditPart) {

-			GraphicalEditPart editPart = (GraphicalEditPart)element;

+		if (element instanceof GraphicalEditPart) {

+			GraphicalEditPart editPart = (GraphicalEditPart) element;

 			IFigure figure = editPart.getContentPane();

 			Object model = editPart.getAdapter(EObject.class);

-			switch(columnIndex) {

+			switch (columnIndex) {

 			case 0:

 				return editPart.getClass().getSimpleName();

 			case 1:

-				if(model instanceof NamedElement) {

-					return ((NamedElement)model).getName();

+				if (model instanceof NamedElement) {

+					return ((NamedElement) model).getName();

 				}

 				return "not a named element";

 			case 2:

@@ -70,15 +75,18 @@ public class EditPartLabelProvider implements ITableLabelProvider, ITableColorPr
 		return "cannot display it: " + element;

 	}

 

+	@Override

 	public Image getColumnImage(Object element, int columnIndex) {

 		return null;

 	}

 

+	@Override

 	public Color getForeground(Object element, int columnIndex) {

 		// TODO Auto-generated method stub

 		return null;

 	}

 

+	@Override

 	public Color getBackground(Object element, int columnIndex) {

 		// TODO Auto-generated method stub

 		return null;