Bug 535643 - Duplicated values in Manifest

 - remove duplicate Bundle-Activator and
Bundle-RequiredExecutionEnvironment in MANIFEST.MF
 - remove unused import
 - add missing override


Change-Id: Ie709da842ed6470dc4fc032c16111dbe107d6bf5
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

3 files changed, 6 insertions, 5 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 3e6b15ba001..d5224cbb99d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -85,10 +85,8 @@ Bundle-ClassPath: .
 Bundle-Version: 3.100.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0",
  com.google.common.util.concurrent;version="21.0.0",
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java
index b2da4999d49..06b254cf70a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java
@@ -21,7 +21,6 @@ import org.eclipse.draw2d.Connection;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.EditPart;
@@ -139,6 +138,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	 * (non-Javadoc)
 	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
 	 */
+	@Override
 	protected boolean handleButtonUp(int button) {
 
 		boolean bExecuteDrag = isInState(STATE_DRAG_IN_PROGRESS) && shouldAllowDrag();
@@ -158,6 +158,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	 * (non-Javadoc)
 	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()
 	 */
+	@Override
 	protected boolean handleDragInProgress() {
 		if (isInState(STATE_DRAG_IN_PROGRESS) && shouldAllowDrag()) {
 			updateSourceRequest();
@@ -179,6 +180,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	 * (non-Javadoc)
 	 * @see org.eclipse.gef.tools.AbstractTool#calculateCursor()
 	 */
+	@Override
 	protected Cursor calculateCursor() {
 		if (getType() == RequestConstants.REQ_MOVE_BENDPOINT) {
 			return Cursors.CURSOR_SEG_MOVE;
@@ -216,6 +218,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	/**
 	 * @see org.eclipse.gef.tools.AbstractTool#createOperationSet()
 	 */
+	@Override
 	protected List createOperationSet() {
 		List list = new ArrayList();
 		list.add(getConnectionEditPart());
@@ -237,7 +240,6 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 				locationRequest.setLocation(location);
 				editPart.showSourceFeedback(locationRequest);
 			}
-			//editPart.showSourceFeedback(getSourceRequest());
 		}
 		setShowingFeedback(true);
 	}
@@ -334,6 +336,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	 * (non-Javadoc)
 	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
 	 */
+	@Override
 	protected String getCommandName() {
 		return getType().toString();
 	}
@@ -357,6 +360,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker {
 	 * (non-Javadoc)
 	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
 	 */
+	@Override
 	protected String getDebugName() {
 		return "Bendpoint Handle Tracker " + getCommandName(); //$NON-NLS-1$
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java
index 8564c0cd987..eb5a2ca8d46 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java
@@ -14,7 +14,6 @@ package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
 import java.io.IOException;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;