Bug 361932: Set compiler settings to Java 1.5, enforce JDK 1.5 installed
and removed override tags for interface method implementations to make
Graphiti truly Java 1.5 compatible
diff --git a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.core.prefs
index 56fd1ca..125843e 100644
--- a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:25:28 CEST 2011

+#Wed Nov 09 14:41:14 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.launching.prefs b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.launching.prefs
index b522c84..fafbee9 100644
--- a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.launching.prefs
+++ b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:25:28 CEST 2011

+#Wed Nov 09 14:41:14 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.pde.api.tools.prefs b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.pde.api.tools.prefs
index a9b771e..77c49f0 100644
--- a/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/org.eclipse.graphiti.doc/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:55:20 CEST 2011

+#Wed Nov 09 14:37:21 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.core.prefs
index 186fee8..194eb62 100644
--- a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:27:57 CEST 2011

+#Wed Nov 09 14:42:52 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.launching.prefs b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.launching.prefs
index 46f43d5..355fefa 100644
--- a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.launching.prefs
+++ b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:57 CEST 2011

+#Wed Nov 09 14:42:52 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.pde.api.tools.prefs b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.pde.api.tools.prefs
index 8aefd5f..cb93ba1 100644
--- a/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/org.eclipse.graphiti.examples.chess/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:57:20 CEST 2011

+#Wed Nov 09 14:37:57 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessBoardFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessBoardFeature.java
index 5421dd3..6a5e0eb 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessBoardFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessBoardFeature.java
@@ -49,7 +49,6 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		if (context.getNewObject() instanceof Board) {
 			if (context.getTargetContainer() instanceof Diagram) {
@@ -60,7 +59,6 @@
 		return false;
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		// Get the Graphiti services
 		ICreateService createService = Graphiti.getCreateService();
diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessMoveFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessMoveFeature.java
index 58012dd..adaf148 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessMoveFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessMoveFeature.java
@@ -36,7 +36,6 @@
 		super(fp);

 	}

 

-	@Override

 	public boolean canAdd(IAddContext context) {

 		// Add the connection in case it is a move connection (indicated by a

 		// property)

@@ -46,7 +45,6 @@
 		return false;

 	}

 

-	@Override

 	public PictogramElement add(IAddContext context) {

 		IAddConnectionContext addConContext = (IAddConnectionContext) context;

 		IPeCreateService peCreateService = Graphiti.getPeCreateService();

diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessPieceFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessPieceFeature.java
index 59f9ed6..249e79d 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessPieceFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/AddChessPieceFeature.java
@@ -36,7 +36,6 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		if (context.getNewObject() instanceof Piece) {
 			return context.getTargetContainer().getChildren().size() < 64;
@@ -44,7 +43,6 @@
 		return false;
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		// Get the Graphiti services
 		ICreateService createService = Graphiti.getCreateService();
diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateAllInitialChessPiecesFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateAllInitialChessPiecesFeature.java
index d3321e1..8383864 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateAllInitialChessPiecesFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateAllInitialChessPiecesFeature.java
@@ -38,10 +38,10 @@
 public class CreateAllInitialChessPiecesFeature extends AbstractCreateFeature {
 
 	public CreateAllInitialChessPiecesFeature(IFeatureProvider fp) {
-		super(fp, Messages.CreateAllInitialChessPiecesFeature_name, Messages.CreateAllInitialChessPiecesFeature_description);
+		super(fp, Messages.CreateAllInitialChessPiecesFeature_name,
+				Messages.CreateAllInitialChessPiecesFeature_description);
 	}
 
-	@Override
 	public boolean canCreate(ICreateContext context) {
 		Board board = getBoard(context);
 		if (board != null) {
@@ -55,7 +55,6 @@
 		return false;
 	}
 
-	@Override
 	public Object[] create(ICreateContext context) {
 		Collection<Piece> addedPieces = new ArrayList<Piece>(32);
 
diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessBoardFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessBoardFeature.java
index ca45925..a4ed953 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessBoardFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessBoardFeature.java
@@ -29,7 +29,6 @@
 		super(fp, Messages.CreateChessBoardFeature_name, Messages.CreateChessBoardFeature_description);
 	}
 
-	@Override
 	public boolean canCreate(ICreateContext context) {
 		if (context.getTargetContainer() instanceof Diagram) {
 			// Add new board only in case of an empty diagram
@@ -38,7 +37,6 @@
 		return false;
 	}
 
-	@Override
 	public Object[] create(ICreateContext context) {
 		Resource resource = context.getTargetContainer().eResource();
 
diff --git a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessMoveFeature.java b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessMoveFeature.java
index 6101c51..ac64c0c 100644
--- a/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessMoveFeature.java
+++ b/examples/org.eclipse.graphiti.examples.chess/src/org/eclipse/graphiti/examples/chess/features/CreateChessMoveFeature.java
@@ -46,7 +46,6 @@
 		super(fp, Messages.CreateChessMoveFeature_name, Messages.CreateChessMoveFeature_description);

 	}

 

-	@Override

 	public boolean canStartConnection(ICreateConnectionContext context) {

 		// We can start a move connection at every anchor that belong to a

 		// square holding a piece or that belongs to a move connection

@@ -54,7 +53,6 @@
 		return piece != null;

 	}

 

-	@Override

 	public boolean canCreate(ICreateConnectionContext context) {

 		// Get the piece to move (potentially follow connection)

 		Piece piece = getPiece(context.getSourceAnchor());

@@ -78,7 +76,6 @@
 		return MoveUtil.isMoveAllowed(piece, sourceSquare, targetSquare);

 	}

 

-	@Override

 	public Connection create(ICreateConnectionContext context) {

 		// Take back the highlighting

 		getDiagramEditor().getEditingDomain().getCommandStack().undo();

diff --git a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.core.prefs
index 793f257..3262fc8 100644
--- a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:26:30 CEST 2011

+#Wed Nov 09 14:43:05 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.launching.prefs b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.launching.prefs
index ec53fcb..68c2479 100644
--- a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.launching.prefs
+++ b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:26:30 CEST 2011

+#Wed Nov 09 14:43:05 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.pde.api.tools.prefs b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.pde.api.tools.prefs
index 7d8256b..6d1f657 100644
--- a/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/org.eclipse.graphiti.examples.common/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:19:09 CEST 2011

+#Wed Nov 09 14:38:04 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ExampleProjectNature.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ExampleProjectNature.java
index 93e1c00..d0a45c7 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ExampleProjectNature.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ExampleProjectNature.java
@@ -25,25 +25,20 @@
 
 	IProject p;
 
-	@Override
 	public void configure() throws CoreException {
 
 	}
 
-	@Override
 	public void deconfigure() throws CoreException {
 
 	}
 
-	@Override
 	public IProject getProject() {
 		return p;
 	}
 
-	@Override
 	public void setProject(IProject project) {
 		p = project;
 
 	}
-
 }
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/FileService.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/FileService.java
index de0bdbf..a2aa60b 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/FileService.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/FileService.java
@@ -74,12 +74,9 @@
 
 		final Map<URI, Throwable> failedSaves = new HashMap<URI, Throwable>();
 		final IWorkspaceRunnable wsRunnable = new IWorkspaceRunnable() {
-			@Override
 			public void run(final IProgressMonitor monitor) throws CoreException {
 
 				final Runnable runnable = new Runnable() {
-
-					@Override
 					public void run() {
 						Transaction parentTx;
 						if (editingDomain != null
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/handler/OpenDiagramFromFileHandler.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/handler/OpenDiagramFromFileHandler.java
index 10077e7..698b16c 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/handler/OpenDiagramFromFileHandler.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/handler/OpenDiagramFromFileHandler.java
@@ -40,7 +40,6 @@
  */
 public final class OpenDiagramFromFileHandler extends AbstractHandler {
 
-	@Override
 	public Object execute(final ExecutionEvent event) throws ExecutionException {
 
 		// Get the current selection
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/GFEmfTreeContentProvider.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/GFEmfTreeContentProvider.java
index 0e630cb..3921146 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/GFEmfTreeContentProvider.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/GFEmfTreeContentProvider.java
@@ -50,7 +50,6 @@
 
 	}
 
-	@Override
 	public Object[] getChildren(Object parentElement) {
 		if (parentElement instanceof IContainerNode) {
 			IContainerNode icn = (IContainerNode) parentElement;
@@ -78,12 +77,10 @@
 		return new Object[0];
 	}
 
-	@Override
 	public Object getParent(Object element) {
 		return null;
 	}
 
-	@Override
 	public boolean hasChildren(Object element) {
 		if (element instanceof IContainerNode) {
 			IContainerNode icn = (IContainerNode) element;
@@ -95,28 +92,22 @@
 		return true;
 	}
 
-	@Override
 	public Object[] getElements(Object inputElement) {
 		return null;
 	}
 
-	@Override
 	public void dispose() {
 		// do nothing 
 	}
 
-	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		this.viewer = viewer;
 	}
 
-	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		IResourceDelta delta = event.getDelta();
 		try {
 			delta.accept(new IResourceDeltaVisitor() {
-
-				@Override
 				public boolean visit(IResourceDelta delta) throws CoreException {
 					IResource resource = delta.getResource();
 					if (resource == null)
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/DiagramsNode.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/DiagramsNode.java
index 6018709..ec75709 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/DiagramsNode.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/DiagramsNode.java
@@ -44,7 +44,6 @@
 		return NAME;
 	}
 
-	@Override
 	public Object[] getChildren() {
 		IProject project = getProject();
 		if (project != null) {
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/EClassesNode.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/EClassesNode.java
index 0c851a3..0d5adca 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/EClassesNode.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/EClassesNode.java
@@ -45,7 +45,6 @@
 		return NAME;
 	}
 
-	@Override
 	public Object[] getChildren() {
 		return Util.getAllClasses(getProject(), rSet);
 	}
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/base/AbstractContainerNode.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/base/AbstractContainerNode.java
index 8380136..5883e8b 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/base/AbstractContainerNode.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/navigator/nodes/base/AbstractContainerNode.java
@@ -31,7 +31,6 @@
 		super();
 	}
 
-	@Override
 	public String getText() {
 		String ret = getContainerName();
 		return ret;
@@ -44,12 +43,10 @@
 	 */
 	abstract protected String getContainerName();
 
-	@Override
 	public boolean hasChildren() {
 			return true;
 	}
 
-	@Override
 	public Image getImage() {
 		String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
 		return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/ContentOutlinePageAdapterFactory.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/ContentOutlinePageAdapterFactory.java
index 91ffff4..b863c42 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/ContentOutlinePageAdapterFactory.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/ContentOutlinePageAdapterFactory.java
@@ -29,7 +29,6 @@
 
 	private static final Class<?>[] ADAPTERS = new Class[] { IContentOutlinePage.class };
 
-	@Override
 	public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) {
 		if (GFPreferences.getInstance().isGenericOutlineActive()) {
 			if (IContentOutlinePage.class.equals(adapterType)) {
@@ -48,7 +47,6 @@
 		return null;
 	}
 
-	@Override
 	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return ADAPTERS;
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/GraphicsEditorOutlinePage.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/GraphicsEditorOutlinePage.java
index a115f11..4a28e0f 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/GraphicsEditorOutlinePage.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/GraphicsEditorOutlinePage.java
@@ -238,7 +238,6 @@
 	 * 
 	 * @see org.eclipse.gef.ui.parts.GraphicalEditor#getAdapter(Class)
 	 */
-	@Override
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class type) {
 		if (type == ZoomManager.class)
 			return _zoomManagerAdapter;
@@ -249,7 +248,6 @@
 	 * Refreshes the outline on any change of the diagram editor. Most
 	 * importantly, there is a property change event editor-dirty.
 	 */
-	@Override
 	public void propertyChanged(Object source, int propId) {
 		refresh();
 	}
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/tree/PictogramsTreeEditPartFactory.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/tree/PictogramsTreeEditPartFactory.java
index 436cd69..035e565 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/tree/PictogramsTreeEditPartFactory.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/outline/tree/PictogramsTreeEditPartFactory.java
@@ -44,7 +44,6 @@
 	 * org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart,
 	 * java.lang.Object)
 	 */
-	@Override
 	public EditPart createEditPart(EditPart context, Object model) {
 		EditPart ret = null;
 		if (model instanceof PictogramElement) {
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/perspective/GFPerspective.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/perspective/GFPerspective.java
index 9fb6355..e828050 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/perspective/GFPerspective.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/perspective/GFPerspective.java
@@ -42,7 +42,6 @@
 	 * org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui
 	 * .IPageLayout)
 	 */
-	@Override
 	public void createInitialLayout(IPageLayout layout) {
 		defineActions(layout);
 		defineLayout(layout);
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/preference/GraphicsTestPreferencePage.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/preference/GraphicsTestPreferencePage.java
index 424c423..8920990 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/preference/GraphicsTestPreferencePage.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/preference/GraphicsTestPreferencePage.java
@@ -106,9 +106,7 @@
 			label.setText(message);
 	}
 
-	@Override
 	public void init(IWorkbench workbench) {
 		// nothing to do
 	}
-
 }
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/property/TypeMapper.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/property/TypeMapper.java
index 105a8ee..e785c2c 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/property/TypeMapper.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/property/TypeMapper.java
@@ -23,7 +23,6 @@
 
 public class TypeMapper implements ITypeMapper {
 
-	@Override
 	public Class<? extends Object> mapType(Object object) {
 
 		Class<? extends Object> type = object.getClass();
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/AbstractWizardPage.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/AbstractWizardPage.java
index dc58c3b..35f9adf 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/AbstractWizardPage.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/AbstractWizardPage.java
@@ -35,7 +35,6 @@
 		super(pageName);
 	}
 
-	@Override
 	public void createControl(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NULL);
 		composite.setFont(parent.getFont());
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramNameWizardPage.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramNameWizardPage.java
index ed316a8..55a96ba 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramNameWizardPage.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramNameWizardPage.java
@@ -40,7 +40,6 @@
 	Text textField;
 
 	private Listener nameModifyListener = new Listener() {
-		@Override
 		public void handleEvent(Event e) {
 			boolean valid = validatePage();
 			setPageComplete(valid);
@@ -79,7 +78,6 @@
 		setControl(composite);
 	}
 
-	@Override
 	public String getText() {
 		if (textField == null) {
 			return getInitialTextFieldValue();
diff --git a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramTypeWizardPage.java b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramTypeWizardPage.java
index dd3f6e4..ad177e8 100644
--- a/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramTypeWizardPage.java
+++ b/examples/org.eclipse.graphiti.examples.common/src/org/eclipse/graphiti/examples/common/ui/DiagramTypeWizardPage.java
@@ -113,7 +113,6 @@
 		return null;
 	}
 
-	@Override
 	public String getText() {
 		return comboBox.getText();
 	}
diff --git a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.core.prefs
index 5eefbc9..4834744 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:26:41 CEST 2011

+#Wed Nov 09 14:43:18 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.launching.prefs b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.launching.prefs
index 1aa2212..0cce4bf 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.launching.prefs
+++ b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:26:41 CEST 2011

+#Wed Nov 09 14:43:18 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.pde.api.tools.prefs b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.pde.api.tools.prefs
index e047dff..e3ab498 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/org.eclipse.graphiti.examples.tutorial/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:21:44 CEST 2011

+#Wed Nov 09 16:09:23 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEClassFeature.java b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEClassFeature.java
index 5352764..d322677 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEClassFeature.java
+++ b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEClassFeature.java
@@ -45,7 +45,6 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		// check if user wants to add a EClass
 		final Object newObject = context.getNewObject();
@@ -58,7 +57,6 @@
 		return false;
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		final EClass addedClass = (EClass) context.getNewObject();
 		final Diagram targetDiagram = (Diagram) context.getTargetContainer();
diff --git a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEReferenceFeature.java b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEReferenceFeature.java
index bdfcf7e..fe54e1c 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEReferenceFeature.java
+++ b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/features/TutorialAddEReferenceFeature.java
@@ -37,7 +37,6 @@
 		super(fp);
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		IAddConnectionContext addConContext = (IAddConnectionContext) context;
 		EReference addedEReference = (EReference) context.getNewObject();
@@ -72,7 +71,6 @@
 		return connection;
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		// return true if given business object is an EReference
 		// note, that the context must be an instance of IAddConnectionContext
diff --git a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/handlers/CreateDiagramWithAllClassesHandler.java b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/handlers/CreateDiagramWithAllClassesHandler.java
index 6905445..2c6edb4 100644
--- a/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/handlers/CreateDiagramWithAllClassesHandler.java
+++ b/examples/org.eclipse.graphiti.examples.tutorial/src/org/eclipse/graphiti/examples/tutorial/handlers/CreateDiagramWithAllClassesHandler.java
@@ -34,7 +34,6 @@
  */
 public final class CreateDiagramWithAllClassesHandler extends AbstractHandler {
 
-	@Override
 	public Object execute(final ExecutionEvent event) throws ExecutionException {
 
 		// Get the current selection
diff --git a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
index fea98f7..41342a5 100644
--- a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:26:52 CEST 2011

+#Wed Nov 09 14:43:33 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.launching.prefs b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.launching.prefs
index c3df566..193d5f2 100644
--- a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.launching.prefs
+++ b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:26:52 CEST 2011

+#Wed Nov 09 14:43:33 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.pde.api.tools.prefs b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.pde.api.tools.prefs
index 925b419..6b5822d 100644
--- a/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/org.eclipse.graphiti.ui.capabilities/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:54:55 CEST 2011

+#Wed Nov 09 14:38:22 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.core.prefs
index 58bd53e..7a2eb96 100644
--- a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:25:39 CEST 2011

+#Wed Nov 09 14:41:53 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.launching.prefs
index 30f6518..47656d4 100644
--- a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:25:39 CEST 2011

+#Wed Nov 09 14:41:53 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.pde.api.tools.prefs
index cdb8f39..fb50930 100644
--- a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:15:57 CEST 2011

+#Wed Nov 09 14:37:30 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/SVGExporter.java b/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/SVGExporter.java
index 950a627..3028d5d 100644
--- a/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/SVGExporter.java
+++ b/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/SVGExporter.java
@@ -34,7 +34,6 @@
  */
 public class SVGExporter implements IDiagramsExporter {
 
-	@Override
 	public void export(Image im, IFigure figure, String fileName, Double scaleFactor) throws Exception {
 		// Get a DOMImplementation.
 		DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation();
diff --git a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.core.prefs
index 43ce168..6c7ace1 100644
--- a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:25:51 CEST 2011

+#Wed Nov 09 14:42:05 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.launching.prefs
index 2ac275a..8037e46 100644
--- a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:25:51 CEST 2011

+#Wed Nov 09 14:42:05 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.pde.api.tools.prefs
index 828d02b..5b05e00 100644
--- a/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.graphiti.mm/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:16:11 CEST 2011

+#Wed Nov 09 14:37:36 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.core.prefs
index 0512007..997f47e 100644
--- a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:26:03 CEST 2011

+#Wed Nov 09 14:42:20 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.launching.prefs
index 5e8d376..f9f32a9 100644
--- a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:26:03 CEST 2011

+#Wed Nov 09 14:42:20 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.pde.api.tools.prefs
index 1f11510..577bf34 100644
--- a/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.graphiti.pattern/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:16:20 CEST 2011

+#Wed Nov 09 14:37:44 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractConnectionPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractConnectionPattern.java
index 32e685e..bc07ccf 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractConnectionPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractConnectionPattern.java
@@ -141,28 +141,24 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void startConnecting() {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void endConnecting() {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void attachedToSource(ICreateConnectionContext context) {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void canceledAttaching(ICreateConnectionContext context) {
 	}
 }
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractPattern.java
index 7c4c441..02247cf 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AbstractPattern.java
@@ -110,7 +110,6 @@
 		setPatternConfiguration(patternConfiguration);
 	}
 
-	@Override
 	public boolean isPaletteApplicable() {
 		return true;
 	}
@@ -604,7 +603,6 @@
 	 * org.eclipse.graphiti.func.IDirectEditing#canDirectEdit(org.eclipse.graphiti
 	 * .features.context.IDirectEditingContext)
 	 */
-	@Override
 	public boolean canDirectEdit(IDirectEditingContext context) {
 		return false;
 	}
@@ -616,7 +614,6 @@
 	 * org.eclipse.graphiti.func.IDirectEditing#checkValueValid(java.lang.String
 	 * , org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String checkValueValid(String value, IDirectEditingContext context) {
 		return null;
 	}
@@ -629,7 +626,6 @@
 	 * int, java.lang.String,
 	 * org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String completeValue(String value, int caretPos, String choosenValue, IDirectEditingContext context) {
 		return choosenValue;
 	}
@@ -641,7 +637,6 @@
 	 * org.eclipse.graphiti.func.IDirectEditing#getPossibleValues(org.eclipse
 	 * .graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String[] getPossibleValues(IDirectEditingContext context) {
 		return EMPTY_STRING_ARRAY;
 	}
@@ -653,7 +648,6 @@
 	 * org.eclipse.graphiti.func.IDirectEditing#getValueProposals(java.lang.
 	 * String, int, org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String[] getValueProposals(String value, int caretPos, IDirectEditingContext context) {
 		return EMPTY_STRING_ARRAY;
 	}
@@ -663,7 +657,6 @@
 	 * 
 	 * @see org.eclipse.graphiti.func.IDirectEditing#isAutoCompletionEnabled()
 	 */
-	@Override
 	public boolean isAutoCompletionEnabled() {
 		return false;
 	}
@@ -673,7 +666,6 @@
 	 * 
 	 * @see org.eclipse.graphiti.func.IDirectEditing#isCompletionAvailable()
 	 */
-	@Override
 	public boolean isCompletionAvailable() {
 		return false;
 	}
@@ -683,7 +675,6 @@
 	 * 
 	 * @see org.eclipse.graphiti.func.IDirectEditing#stretchFieldToFitText()
 	 */
-	@Override
 	public boolean stretchFieldToFitText() {
 		return false;
 	}
@@ -717,7 +708,6 @@
 	public void setValue(String value, IDirectEditingContext context) {
 	}
 
-	@Override
 	public IProposalSupport getProposalSupport() {
 		return null;
 	}
@@ -725,7 +715,6 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public boolean hasDoneChanges(Class<?> actionType) {
 		boolean ret = true;
 		if (IDelete.class.equals(actionType)) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AddFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AddFeatureForPattern.java
index 4cf572d..ec4b392 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AddFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/AddFeatureForPattern.java
@@ -62,7 +62,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) pattern).undo(this, context);
@@ -72,7 +71,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			return ((ICustomUndoablePattern) pattern).canRedo(this, context);
@@ -83,7 +81,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) pattern).redo(this, context);
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateConnectionFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateConnectionFeatureForPattern.java
index de81d3b..6725a35 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateConnectionFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateConnectionFeatureForPattern.java
@@ -78,7 +78,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).undo(this, context);
@@ -88,7 +87,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			return ((ICustomUndoablePattern) delegate).canRedo(this, context);
@@ -99,7 +97,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).redo(this, context);
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateFeatureForPattern.java
index 05b206f..71019c6 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/CreateFeatureForPattern.java
@@ -82,7 +82,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -93,7 +92,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -105,7 +103,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DeleteFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DeleteFeatureForPattern.java
index 78c12f6..d17eea5 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DeleteFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DeleteFeatureForPattern.java
@@ -80,7 +80,6 @@
 		return super.canUndo(context);
 	}
 
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -88,7 +87,6 @@
 		}
 	}
 
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -97,7 +95,6 @@
 		return true;
 	}
 
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DirectEditingFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DirectEditingFeatureForPattern.java
index d2025eb..ca7aa56 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DirectEditingFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/DirectEditingFeatureForPattern.java
@@ -112,7 +112,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).undo(this, context);
@@ -122,7 +121,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			return ((ICustomUndoablePattern) delegate).canRedo(this, context);
@@ -133,7 +131,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).redo(this, context);
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/LayoutFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/LayoutFeatureForPattern.java
index 1191c1f..410c96a 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/LayoutFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/LayoutFeatureForPattern.java
@@ -62,7 +62,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -73,7 +72,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -85,7 +83,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/MoveShapeFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/MoveShapeFeatureForPattern.java
index fd5e3fe..cca81df 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/MoveShapeFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/MoveShapeFeatureForPattern.java
@@ -62,7 +62,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -73,7 +72,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -85,7 +83,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ReconnectionFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ReconnectionFeatureForPattern.java
index d7f176f..eaa9712 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ReconnectionFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ReconnectionFeatureForPattern.java
@@ -67,7 +67,6 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void canceledReconnect(IReconnectionContext context) {
 		delegate.canceledReconnect(context);
 	}
@@ -102,7 +101,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).undo(this, context);
@@ -112,7 +110,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			return ((ICustomUndoablePattern) delegate).canRedo(this, context);
@@ -123,7 +120,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		if (delegate instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) delegate).redo(this, context);
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/RemoveFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/RemoveFeatureForPattern.java
index dadfe6f..ac3de8b 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/RemoveFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/RemoveFeatureForPattern.java
@@ -78,7 +78,6 @@
 		return super.canUndo(context);
 	}
 
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -86,7 +85,6 @@
 		}
 	}
 
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -95,7 +93,6 @@
 		return true;
 	}
 
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ResizeShapeFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ResizeShapeFeatureForPattern.java
index a392c2b..186283e 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ResizeShapeFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/ResizeShapeFeatureForPattern.java
@@ -77,7 +77,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -88,7 +87,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
@@ -100,7 +98,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		IPattern pattern = delegate.getPattern();
 		if (pattern instanceof ICustomUndoablePattern) {
diff --git a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/UpdateFeatureForPattern.java b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/UpdateFeatureForPattern.java
index 873ba0f..1b1e059 100644
--- a/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/UpdateFeatureForPattern.java
+++ b/plugins/org.eclipse.graphiti.pattern/src/org/eclipse/graphiti/pattern/UpdateFeatureForPattern.java
@@ -76,7 +76,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void undo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) pattern).undo(this, context);
@@ -86,7 +85,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public boolean canRedo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			return ((ICustomUndoablePattern) pattern).canRedo(this, context);
@@ -97,7 +95,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void redo(IContext context) {
 		if (pattern instanceof ICustomUndoablePattern) {
 			((ICustomUndoablePattern) pattern).redo(this, context);
diff --git a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.core.prefs
index 8d40ecf..b424a05 100644
--- a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:26:15 CEST 2011

+#Wed Nov 09 14:42:35 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.launching.prefs
index a4c8cca..4f33183 100644
--- a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:26:15 CEST 2011

+#Wed Nov 09 14:42:35 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.pde.api.tools.prefs
index 9732f8a..2fc9c0b 100644
--- a/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.graphiti.ui/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:16:31 CEST 2011

+#Wed Nov 09 14:37:50 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInput.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInput.java
index 1a8e351..9ebec83 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInput.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInput.java
@@ -352,7 +352,6 @@
 	 * 
 	 * @return The ID of the associated factory
 	 */
-	@Override
 	public String getFactoryId() {
 		return DiagramEditorInputFactory.class.getName();
 	}
@@ -379,7 +378,6 @@
 	/**
 	 * @return Simply returns <code>null</code>.
 	 */
-	@Override
 	public ImageDescriptor getImageDescriptor() {
 		return null;
 	}
@@ -388,7 +386,6 @@
 	 * @return The cached name or the input's {@link URI} string
 	 * @see #getLiveName()
 	 */
-	@Override
 	public String getName() {
 		if (this.name != null) {
 			return this.name;
@@ -420,7 +417,6 @@
 	 * @return The cached tooltip or the input's {@link URI} string
 	 * @see #getLiveToolTipText()
 	 */
-	@Override
 	public String getToolTipText() {
 		if (this.tooltip != null) {
 			return this.tooltip;
@@ -503,7 +499,6 @@
 	 * @return A object castable to the given class, or <code>null</code> if
 	 *         this object does not have an adapter for the given class
 	 */
-	@Override
 	@SuppressWarnings("unchecked")
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
 
@@ -542,7 +537,6 @@
 	 * @param memento
 	 *            The memeto to store the information in
 	 */
-	@Override
 	public void saveState(IMemento memento) {
 		// Do not store anything for deleted objects
 		boolean exists = exists();
@@ -617,7 +611,6 @@
 	 * @return <code>true</code> if the input's state denotes a living EMF
 	 *         object <br>
 	 */
-	@Override
 	public boolean exists() {
 		if (this.uriName == null) {
 			return false;
@@ -640,7 +633,6 @@
 	/**
 	 * @return this input if it is persistable, otherwise null
 	 */
-	@Override
 	public IPersistableElement getPersistable() {
 		IPersistableElement element = null;
 		EObject obj = null;
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInputFactory.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInputFactory.java
index 34e72cc..3441779 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInputFactory.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorInputFactory.java
@@ -34,8 +34,6 @@
  */
 public class DiagramEditorInputFactory implements IElementFactory {
 
-
-	@Override
 	public IAdaptable createElement(IMemento memento) {
 		// get diagram URI
 		final String diagramUriString = memento.getString(DiagramEditorInput.KEY_URI);
@@ -51,5 +49,4 @@
 		final TransactionalEditingDomain domain = GraphitiUi.getEmfService().createResourceSetAndEditingDomain();
 		return new DiagramEditorInput(diagramUriString, domain, providerID, true);
 	}
-
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorMatchingStrategy.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorMatchingStrategy.java
index 0ed8b80..897d1c8 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorMatchingStrategy.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorMatchingStrategy.java
@@ -19,7 +19,7 @@
  * @since 0.9

  */

 public final class DiagramEditorMatchingStrategy implements IEditorMatchingStrategy {

-	@Override

+

 	public boolean matches(IEditorReference editorRef, IEditorInput input) {

 		try {

 			IFile file = ReflectionUtil.getFile(input);

diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractDrillDownFeature.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractDrillDownFeature.java
index f5d3d70..9dccfc7 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractDrillDownFeature.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractDrillDownFeature.java
@@ -76,16 +76,10 @@
 			} else {
 				ListDialog dialog = new ListDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
 				dialog.setContentProvider(new IStructuredContentProvider() {
-
-					@Override
 					public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 					}
-
-					@Override
 					public void dispose() {
 					}
-
-					@Override
 					public Object[] getElements(Object inputElement) {
 						return possibleDiagramsList.toArray();
 					}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
index 635685b..3396881 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
@@ -50,7 +50,6 @@
 		setToolTipText(TOOL_TIP);
 	}
 
-	@Override
 	public boolean isAvailable() {
 		PictogramElement pe[] = getSelectedPictogramElements();
 		for (int i = 0; i < pe.length; i++) {
@@ -96,7 +95,6 @@
 		genericRun(this);
 	}
 
-	@Override
 	public IContext createContext(PictogramElement pe) {
 		DeleteContext deleteContext = new DeleteContext(pe);
 		if (getMultiDeleteInfo() != null) {
@@ -105,7 +103,6 @@
 		return deleteContext;
 	}
 
-	@Override
 	public IFeature provideFeatureForContext(IContext context) {
 		return getFeatureProvider().getDeleteFeature((IDeleteContext) context);
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramChangeListener.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramChangeListener.java
index 37f2878..07ec102 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramChangeListener.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramChangeListener.java
@@ -71,27 +71,22 @@
 		this.ed = ed;
 	}
 
-	@Override
 	public NotificationFilter getFilter() {
 		return NotificationFilter.NOT_TOUCH;
 	}
 
-	@Override
 	public boolean isAggregatePrecommitListener() {
 		return false;
 	}
 
-	@Override
 	public boolean isPostcommitOnly() {
 		return true;
 	}
 
-	@Override
 	public boolean isPrecommitOnly() {
 		return false;
 	}
 
-	@Override
 	public void resourceSetChanged(ResourceSetChangeEvent event) {
 		if (!ed.isAutoRefresh()) {
 			return;
@@ -294,7 +289,6 @@
 		return ret;
 	}
 
-	@Override
 	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
 		return null;
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorBehavior.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorBehavior.java
index 58904d0..8e906ea 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorBehavior.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorBehavior.java
@@ -232,7 +232,6 @@
 
 					if (updateProblemIndication) {
 						getShell().getDisplay().asyncExec(new Runnable() {
-							@Override
 							public void run() {
 								updateProblemIndication();
 							}
@@ -276,7 +275,6 @@
 						final IEditorPart activeEditor = editorPart.getSite().getPage().getActiveEditor();
 						if (activeEditor == editorPart) {
 							getShell().getDisplay().asyncExec(new Runnable() {
-								@Override
 								public void run() {
 									handleActivate();
 								}
@@ -307,7 +305,6 @@
 							final IEditorPart activeEditor = editorPart.getSite().getPage().getActiveEditor();
 							if (activeEditor == editorPart) {
 								getShell().getDisplay().asyncExec(new Runnable() {
-									@Override
 									public void run() {
 										handleActivate();
 									}
@@ -322,7 +319,6 @@
 
 		private void startCloseEditorJob() {
 			Display.getDefault().asyncExec(new Runnable() {
-				@Override
 				public void run() {
 					closeEd();
 				}
@@ -441,7 +437,6 @@
 	 * @return The {@link TransactionalEditingDomain} that is used within this
 	 *         editor
 	 */
-	@Override
 	public TransactionalEditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -496,7 +491,6 @@
 		// Do the work within an operation because this is a long running activity that modifies the workbench.
 		final IRunnableWithProgress operation = new IRunnableWithProgress() {
 			// This is the method that gets invoked when the operation runs.
-			@Override
 			public void run(IProgressMonitor monitor) {
 				// Save the resources to the file system.
 				try {
@@ -690,7 +684,6 @@
 				// closing, asynchronous to not block this listener longer than necessary,
 				// which may provoke deadlocks.
 				shell.getDisplay().asyncExec(new Runnable() {
-					@Override
 					public void run() {
 						if (editorPart == null) {
 							return; // disposed
@@ -727,7 +720,6 @@
 		this.handleActivate();
 	}
 
-	@Override
 	public void historyNotification(OperationHistoryEvent event) {
 		switch (event.getEventType()) {
 		case OperationHistoryEvent.DONE:
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorDummy.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorDummy.java
index a20400c..86393c1 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorDummy.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorDummy.java
@@ -45,57 +45,45 @@
 		editingDomain = eDomain;
 	}
 
-	@Override
 	public TransactionalEditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
-	@Override
 	public ResourceSet getResourceSet() {
 		return null;
 	}
 
-	@Override
 	public IDimension getCurrentSize() {
 		return new DimensionImpl(0, 0);
 	}
 
-	@Override
 	public IDiagramTypeProvider getDiagramTypeProvider() {
 		return diagramTypeProvider;
 	}
 
-	@Override
 	public PictogramElement[] getSelectedPictogramElements() {
 		return new PictogramElement[0];
 	}
 
-	@Override
 	public boolean isDirty() {
 		return false;
 	}
 
-	@Override
 	public void refresh() {
 	}
 
-	@Override
 	public void refresh(PictogramElement pe) {
 	}
 
-	@Override
 	public void refreshTitleToolTip() {
 	}
 
-	@Override
 	public void selectPictogramElements(PictogramElement[] pictogramElements) {
 	}
 
-	@Override
 	public void setPictogramElementForSelection(PictogramElement pictogramElement) {
 	}
 
-	@Override
 	public void setPictogramElementsForSelection(PictogramElement[] pictogramElements) {
 	}
 
@@ -103,20 +91,16 @@
 		this.diagramTypeProvider = diagramTypeProvider;
 	}
 
-	@Override
 	public void refreshRenderingDecorators(PictogramElement pe) {
 	}
 
-	@Override
 	public void refreshPalette() {
 	}
 
-	@Override
 	public ILocation getCurrentMouseLocation() {
 		return null;
 	}
 
-	@Override
 	public void executeFeature(IFeature feature, IContext context) {
 	}
 }
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
index e4a6f80..c9b5295 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
@@ -180,7 +180,6 @@
 		ITabbedPropertySheetPageContributor, IResourceRegistryHolder, IEditingDomainProvider {
 
 	private final CommandStackEventListener cmdStackListener = new CommandStackEventListener() {
-		@Override
 		public void stackChanged(CommandStackEvent event) {
 			if (Display.getCurrent() != null) { // Only fire if triggered from
 												// UI thread
@@ -197,11 +196,8 @@
 	};
 
 	protected class FWCommandStackListener implements CommandStackListener {
-
-		@Override
 		public void commandStackChanged(EventObject event) {
 			getEditorSite().getShell().getDisplay().asyncExec(new Runnable() {
-				@Override
 				public void run() {
 					firePropertyChange(IEditorPart.PROP_DIRTY);
 				}
@@ -213,7 +209,6 @@
 	 * Updates the editor's dirty toggle.
 	 */
 	final class DirtyFlagUpdater implements Runnable {
-		@Override
 		public void run() {
 			firePropertyChange(IEditorPart.PROP_DIRTY);
 		}
@@ -731,7 +726,6 @@
 		return keyHandler;
 	}
 
-	@Override
 	public IConfigurationProvider getConfigurationProvider() {
 		return configurationProvider;
 	}
@@ -763,7 +757,6 @@
 	 * 
 	 * @return the contributor id
 	 */
-	@Override
 	public String getContributorId() {
 
 		if (contributorId == null) {
@@ -775,7 +768,6 @@
 		return contributorId;
 	}
 
-	@Override
 	public IDimension getCurrentSize() {
 
 		if (getDiagramScrollingBehavior() == DiagramScrollingBehavior.SCROLLBARS_ALWAYS_VISIBLE) {
@@ -817,7 +809,6 @@
 		return this.diagramScrollingBehavior;
 	}
 
-	@Override
 	public IDiagramTypeProvider getDiagramTypeProvider() {
 		IConfigurationProvider cfgProvider = getConfigurationProvider();
 		if (cfgProvider != null)
@@ -888,7 +879,6 @@
 		return mouseLocation;
 	}
 
-	@Override
 	public ILocation getCurrentMouseLocation() {
 		Point mL = getMouseLocation();
 		return new LocationImpl(mL.x, mL.y);
@@ -897,34 +887,28 @@
 	@Override
 	protected FlyoutPreferences getPalettePreferences() {
 		return new FlyoutPreferences() {
-			@Override
 			public int getDockLocation() {
 				return getPreferenceStore().getInt(PALETTE_DOCK_LOCATION);
 			}
 
-			@Override
 			public int getPaletteState() {
 				if (!getToolBehaviorProvider().isShowFlyoutPalette())
 					return 8;
 				return getPreferenceStore().getInt(PALETTE_STATE);
 			}
 
-			@Override
 			public int getPaletteWidth() {
 				return getPreferenceStore().getInt(PALETTE_SIZE);
 			}
 
-			@Override
 			public void setDockLocation(int location) {
 				getPreferenceStore().setValue(PALETTE_DOCK_LOCATION, location);
 			}
 
-			@Override
 			public void setPaletteState(int state) {
 				getPreferenceStore().setValue(PALETTE_STATE, state);
 			}
 
-			@Override
 			public void setPaletteWidth(int width) {
 				getPreferenceStore().setValue(PALETTE_SIZE, width);
 			}
@@ -953,14 +937,10 @@
 		return pictogramElementsForSelection;
 	}
 
-
-
-	@Override
 	public IResourceRegistry getResourceRegistry() {
 		return resourceRegistry;
 	}
 
-	@Override
 	public PictogramElement[] getSelectedPictogramElements() {
 		PictogramElement pe[] = new PictogramElement[0];
 		ISelectionProvider selectionProvider = getSite().getSelectionProvider();
@@ -1226,7 +1206,6 @@
 		}
 
 		getGraphicalViewer().getControl().addMouseMoveListener(new MouseMoveListener() {
-			@Override
 			public void mouseMove(MouseEvent e) {
 				setMouseLocation(e.x, e.y);
 			}
@@ -1247,7 +1226,6 @@
 	void internalRefreshEditPart(final EditPart editPart) {
 		if (Display.getCurrent() == null) {
 			Display.getDefault().syncExec(new Runnable() {
-				@Override
 				public void run() {
 					internalRefreshEditPart(editPart);
 					// refreshOutline();
@@ -1301,7 +1279,6 @@
 		return autoRefresh;
 	}
 
-	@Override
 	public void refresh() {
 
 		if (!isAlive()) {
@@ -1316,7 +1293,6 @@
 
 		if (Display.getCurrent() == null) {
 			Display.getDefault().asyncExec(new Runnable() {
-				@Override
 				public void run() {
 					refresh();
 				}
@@ -1362,7 +1338,6 @@
 		selectBufferedPictogramElements();
 	}
 
-	@Override
 	public void refresh(PictogramElement pe) {
 		if (pe == null || !pe.isActive()) {
 			return;
@@ -1377,7 +1352,6 @@
 		}
 	}
 
-	@Override
 	public void refreshPalette() {
 		PaletteRoot pr = getPaletteRoot();
 		if (pr instanceof GFPaletteRoot) {
@@ -1386,7 +1360,6 @@
 		}
 	}
 
-	@Override
 	public void refreshRenderingDecorators(PictogramElement pe) {
 		GraphicalEditPart ep = getEditPartForPictogramElement(pe);
 		if (ep instanceof IShapeEditPart) {
@@ -1406,7 +1379,6 @@
 		setPartName(name);
 	}
 
-	@Override
 	public void refreshTitleToolTip() {
 		setTitleToolTip(getTitleToolTip());
 	}
@@ -1545,7 +1517,6 @@
 		super.selectionChanged(part, selection);
 	}
 
-	@Override
 	public void selectPictogramElements(PictogramElement[] pictogramElements) {
 		List<EditPart> editParts = new ArrayList<EditPart>();
 		Map<?, ?> editPartRegistry = getGraphicalViewer().getEditPartRegistry();
@@ -1569,7 +1540,6 @@
 					// reveal
 					// method can't work correctly.
 					Display.getDefault().asyncExec(new Runnable() {
-						@Override
 						public void run() {
 							getGraphicalViewer().reveal(editpart);
 						}
@@ -1629,7 +1599,6 @@
 		getMouseLocation().setLocation(x, y);
 	}
 
-	@Override
 	public void setPictogramElementForSelection(PictogramElement pictogramElementForSelection) {
 		if (pictogramElementForSelection == null)
 			this.pictogramElementsForSelection = null;
@@ -1637,7 +1606,6 @@
 			this.pictogramElementsForSelection = new PictogramElement[] { pictogramElementForSelection };
 	}
 
-	@Override
 	public void setPictogramElementsForSelection(PictogramElement pictogramElementsForSelection[]) {
 		this.pictogramElementsForSelection = pictogramElementsForSelection;
 	}
@@ -1686,7 +1654,6 @@
 
 	}
 
-	@Override
 	public TransactionalEditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -1699,7 +1666,6 @@
 	 * .graphiti.features.IFeature,
 	 * org.eclipse.graphiti.features.context.IContext)
 	 */
-	@Override
 	public void executeFeature(IFeature feature, IContext context) {
 		DefaultEditDomain domain = getEditDomain();
 
@@ -1735,7 +1701,6 @@
 	 * 
 	 * @return the resource set
 	 */
-	@Override
 	public ResourceSet getResourceSet() {
 		ResourceSet ret = null;
 		TransactionalEditingDomain editingDomain = getEditingDomain();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelChangeListener.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelChangeListener.java
index 0eae60f..4e88861 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelChangeListener.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelChangeListener.java
@@ -49,27 +49,22 @@
 		setDiagramEditor(diagramEditor);
 	}
 
-	@Override
 	public NotificationFilter getFilter() {
 		return NotificationFilter.NOT_TOUCH;
 	}
 
-	@Override
 	public boolean isAggregatePrecommitListener() {
 		return false;
 	}
 
-	@Override
 	public boolean isPostcommitOnly() {
 		return true;
 	}
 
-	@Override
 	public boolean isPrecommitOnly() {
 		return false;
 	}
 
-	@Override
 	public void resourceSetChanged(ResourceSetChangeEvent event) {
 
 		// // if there is no diagramLink, we have also no pictogramLinks -> no
@@ -112,8 +107,6 @@
 
 		// Do an asynchronous update in the UI thread.
 		Display.getDefault().asyncExec(new Runnable() {
-
-			@Override
 			public void run() {
 				if (getDiagramTypeProvider().isAutoUpdateAtRuntime()) {
 					// Bug 352109: Enable unconditional auto refresh for case 3)
@@ -134,7 +127,6 @@
 
 	}
 
-	@Override
 	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
 		return null;
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelWorkspaceSynchronizerDelegate.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelWorkspaceSynchronizerDelegate.java
index d4944b6..87ebc7a 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelWorkspaceSynchronizerDelegate.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DomainModelWorkspaceSynchronizerDelegate.java
@@ -36,13 +36,11 @@
 		this.deb = deb;
 	}
 
-	@Override
 	public void dispose() { 
 		deb = null;
 
 	}
 
-	@Override
 	public boolean handleResourceChanged(Resource resource) {
 		IFile file = WorkspaceSynchronizer.getUnderlyingFile(resource);
 		// Since we cannot get timestamp information, we have to be pessimistic
@@ -59,14 +57,12 @@
 		return true;
 	}
 
-	@Override
 	public boolean handleResourceDeleted(Resource resource) {
 		// This will lead to an unload of the resource, which is quite what we want.
 		// As a follow up of the unload the editor is closed.
 		return false;
 	}
 
-	@Override
 	public boolean handleResourceMoved(Resource resource, URI newURI) {
 		// Handle rename or move of resource.
 		// ((ResourceSetImpl)
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/EmfOnGefCommand.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/EmfOnGefCommand.java
index 48f75f6..5a7a1d2 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/EmfOnGefCommand.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/EmfOnGefCommand.java
@@ -32,27 +32,22 @@
 		setGefCommand(gefCommand);
 	}
 
-	@Override
 	public boolean canExecute() {
 		return getGefCommand().canExecute();
 	}
 
-	@Override
 	public boolean canUndo() {
 		return getGefCommand().canUndo();
 	}
 
-	@Override
 	public Command chain(Command command) {
 		throw new IllegalArgumentException();
 	}
 
-	@Override
 	public void dispose() {
 		getGefCommand().dispose();
 	}
 
-	@Override
 	public void execute() {
 		org.eclipse.gef.commands.Command gefCommand = getGefCommand();
 		if (gefCommand != null) {
@@ -60,18 +55,15 @@
 		}
 	}
 
-	@Override
 	public Collection<?> getAffectedObjects() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public String getDescription() {
 		return getLabel();
 	}
 
-	@Override
 	public String getLabel() {
 		String ret = ""; //$NON-NLS-1$
 		org.eclipse.gef.commands.Command gComm = getGefCommand();
@@ -81,17 +73,14 @@
 		return ret;
 	}
 
-	@Override
 	public Collection<?> getResult() {
 		return null;
 	}
 
-	@Override
 	public void redo() {
 		getGefCommand().redo();
 	}
 
-	@Override
 	public void undo() {
 		getGefCommand().undo();
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
index 45f4d44..6737968 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFCommandStack.java
@@ -279,7 +279,6 @@
 		return editingDomain;
 	}
 
-	@Override
 	public void commandStackChanged(EventObject event) {
 		notifyListeners();
 		notifyListeners(null, 0);
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFFigureCanvas.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFFigureCanvas.java
index 6fb4db3..de8176b 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFFigureCanvas.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFFigureCanvas.java
@@ -96,7 +96,6 @@
 
 		double OldZoomlevel = 1D;
 
-		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 
 			/*
@@ -133,7 +132,6 @@
 
 		double OldZoomlevel = 1D;
 
-		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 
 			/*
@@ -1008,7 +1006,6 @@
 		 * org.eclipse.draw2d.UpdateListener#notifyPainting(org.eclipse.draw2d
 		 * .geometry.Rectangle, java.util.Map)
 		 */
-		@Override
 		public void notifyPainting(Rectangle damage, java.util.Map dirtyRegions) {
 		}
 
@@ -1017,7 +1014,6 @@
 		 * 
 		 * @see org.eclipse.draw2d.UpdateListener#notifyValidating()
 		 */
-		@Override
 		public void notifyValidating() {
 			if (!isDisposed()) {
 				layoutViewport();
@@ -1027,7 +1023,6 @@
 
 	}
 
-	@Override
 	public Object getAdapter(Class adapter) {
 		if (LightweightSystem.class == adapter) {
 			return getLightweightSystem();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFMarqueeSelectionTool.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFMarqueeSelectionTool.java
index f091abc..fe9202d 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFMarqueeSelectionTool.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFMarqueeSelectionTool.java
@@ -631,7 +631,6 @@
 
 			if (schedulePaint) {
 				Display.getCurrent().timerExec(DELAY, new Runnable() {
-					@Override
 					public void run() {
 						offset++;
 						if (offset > 5)
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFOnEmfCommand.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFOnEmfCommand.java
index 973003c..48b986a 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFOnEmfCommand.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GFOnEmfCommand.java
@@ -33,36 +33,29 @@
 		this.featureProvider = fp;
 	}
 
-	@Override
 	public boolean canExecute() {
 		return emfCommand.canExecute();
 	}
 
-	@Override
 	public boolean canUndo() {
 		return emfCommand.canUndo();
 	}
 
-	@Override
 	public boolean execute() {
 		emfCommand.execute();
 		return true;
 	}
 
-	@Override
 	public boolean undo() {
 		emfCommand.undo();
 		return true;
 	}
 
-	@Override
 	public String getDescription() {
 		return emfCommand.getDescription();
 	}
 
-	@Override
 	public IFeatureProvider getFeatureProvider() {
 		return featureProvider;
 	}
-
 }
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/ThumbNailView.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/ThumbNailView.java
index a840b0c..d784ac3 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/ThumbNailView.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/ThumbNailView.java
@@ -84,7 +84,6 @@
 		clearThumbnail();
 	}
 
-	@Override
 	public void partActivated(IWorkbenchPart part) {
 		if (!part.equals(_workbenchPart)) {
 			GraphicalViewer viewer = (GraphicalViewer) part.getAdapter(GraphicalViewer.class);
@@ -94,19 +93,16 @@
 		}
 	}
 
-	@Override
 	public void partBroughtToTop(IWorkbenchPart part) {
 		// nothing to do
 	}
 
-	@Override
 	public void partClosed(IWorkbenchPart part) {
 		if (part.equals(_workbenchPart)) {
 			refreshThumbnailViewer();
 		}
 	}
 
-	@Override
 	public void partDeactivated(IWorkbenchPart part) {
 		// clearThumbnail();
 	}
@@ -118,7 +114,6 @@
 		}
 	}
 
-	@Override
 	public void partOpened(IWorkbenchPart part) {
 		GraphicalViewer viewer = (GraphicalViewer) part.getAdapter(GraphicalViewer.class);
 		if (viewer != null) {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/figures/GFAbstractShape.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/figures/GFAbstractShape.java
index d325f65..0df08d4 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/figures/GFAbstractShape.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/figures/GFAbstractShape.java
@@ -586,7 +586,6 @@
 	 * 
 	 * @return The selection handle bounds of this Shape.
 	 */
-	@Override
 	public Rectangle getHandleBounds() {
 		Rectangle ret = null;
 		final GraphicsAlgorithm selectionGa = getSelectionBorder();
@@ -611,7 +610,6 @@
 	 * 
 	 * @return The visual state of this shape.
 	 */
-	@Override
 	public IVisualState getVisualState() {
 		return getPictogramElementDelegate().getVisualState();
 	}
@@ -619,7 +617,6 @@
 	/**
 	 * Is called after the visual state changed.
 	 */
-	@Override
 	public void visualStateChanged(VisualStateChangedEvent e) {
 		// The colors might have changed, so force a repaint()
 		repaint();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/fixed/FixedThumbnail.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/fixed/FixedThumbnail.java
index 3912a46..f805f31 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/fixed/FixedThumbnail.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/fixed/FixedThumbnail.java
@@ -144,7 +144,6 @@
 		 * {@link Display#timerExec(int, Runnable)}. If no more updating is
 		 * required, {@link #stop()} is called.
 		 */
-		@Override
 		public void run() {
 			if (!isActive() || !isRunning())
 				return;
@@ -482,7 +481,6 @@
 	 * 
 	 * @see org.eclipse.draw2d.UpdateListener#notifyPainting(Rectangle, Map)
 	 */
-	@Override
 	public void notifyPainting(Rectangle damage, @SuppressWarnings("rawtypes") Map dirtyRegions) {
 		Iterator<?> dirtyFigures = dirtyRegions.keySet().iterator();
 		while (dirtyFigures.hasNext()) {
@@ -503,7 +501,6 @@
 	 * 
 	 * @see org.eclipse.draw2d.UpdateListener#notifyValidating()
 	 */
-	@Override
 	public void notifyValidating() {
 		// setDirty(true);
 		// revalidate();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ConnectionEditPart.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ConnectionEditPart.java
index d11a3db..64f4293 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ConnectionEditPart.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ConnectionEditPart.java
@@ -104,7 +104,6 @@
 	 * 
 	 * @return The IConfigurationProvider of this EditPart
 	 */
-	@Override
 	public IConfigurationProvider getConfigurationProvider() {
 		return delegate.getConfigurationProvider();
 	}
@@ -122,7 +121,6 @@
 		return ret;
 	}
 
-	@Override
 	public PictogramElement getPictogramElement() {
 		return delegate.getPictogramElement();
 	}
@@ -174,7 +172,6 @@
 		return ret;
 	}
 
-	@Override
 	public IFeatureProvider getFeatureProvider() {
 		IFeatureProvider ret = null;
 		if (delegate != null) {
@@ -183,12 +180,10 @@
 		return ret;
 	}
 
-	@Override
 	public IPictogramElementDelegate getPictogramElementDelegate() {
 		return delegate;
 	}
 
-	@Override
 	public void forceVisualRefresh() {
 		getPictogramElementDelegate().setForceRefresh(true);
 		refreshVisuals();
@@ -200,17 +195,14 @@
 		return getClass().getName() + "@" + Integer.toHexString(hashCode()); //$NON-NLS-1$
 	}
 
-	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart connection) {
 		return null;
 	}
 
-	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart connection) {
 		return null;
 	}
 
-	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
 		if (request instanceof CreateConnectionRequest) {
 			CreateConnectionRequest r = (CreateConnectionRequest) request;
@@ -219,7 +211,6 @@
 		return null;
 	}
 
-	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
 		return null;
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java
index 2b8323f..8010fef 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/PictogramElementDelegate.java
@@ -173,7 +173,6 @@
 	 * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate
 	 * #activate ()
 	 */
-	@Override
 	public void activate() {
 		// register listener for changes in the bo model -> will be done
 		// globally in the DiagramEditorInternal
@@ -185,7 +184,6 @@
 	 * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate#
 	 * createFigure()
 	 */
-	@Override
 	public IFigure createFigure() {
 		PictogramElement pe = getPictogramElement();
 		IFigure ret = createFigureForPictogramElement(pe);
@@ -203,7 +201,6 @@
 	 * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate#
 	 * deactivate()
 	 */
-	@Override
 	public void deactivate() {
 		disposeFonts();
 	}
@@ -213,7 +210,6 @@
 	 * 
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
-	@Override
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
 		Object ret = null;
 		if (key == IGFAdapter.class || key == IWorkbenchAdapter.class || key == IWorkbenchAdapter2.class) {
@@ -231,7 +227,6 @@
 	 * 
 	 * @return Returns the configurationProvider.
 	 */
-	@Override
 	public IConfigurationProvider getConfigurationProvider() {
 		return configurationProvider;
 	}
@@ -243,7 +238,6 @@
 	 * getFigureForGraphicsAlgorithm(org.eclipse.graphiti.mm.pictograms.
 	 * GraphicsAlgorithm)
 	 */
-	@Override
 	public IFigure getFigureForGraphicsAlgorithm(GraphicsAlgorithm graphicsAlgorithm) {
 		IFigure ret = null;
 		if (graphicsAlgorithm == null) {
@@ -262,7 +256,6 @@
 	 * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate#
 	 * getPictogramElement()
 	 */
-	@Override
 	public PictogramElement getPictogramElement() {
 		return pictogramElement;
 	}
@@ -273,7 +266,6 @@
 	 * @param ep
 	 *            the ep
 	 */
-	@Override
 	public void refreshEditPartsForModelChildrenAndSourceConnections(EditPart ep) {
 		if (ep instanceof IPictogramElementEditPart) {
 
@@ -314,7 +306,6 @@
 	 * @see org.eclipse.graphiti.ui.internal.parts.IPictogramElementDelegate#
 	 * refreshFigureForEditPart(org.eclipse.gef.EditPart)
 	 */
-	@Override
 	public void refreshFigureForEditPart() {
 
 		// DR: Avoid multiple refresh of the same edit part
@@ -1387,7 +1378,6 @@
 	 * @see
 	 * org.eclipse.graphiti.features.IFeatureProviderHolder#getFeatureProvider()
 	 */
-	@Override
 	public IFeatureProvider getFeatureProvider() {
 		IConfigurationProvider cp = getConfigurationProvider();
 		IFeatureProvider ret = null;
@@ -1400,7 +1390,6 @@
 		return ret;
 	}
 
-	@Override
 	public void setForceRefresh(boolean forceRefresh) {
 		this.forceRefresh = forceRefresh;
 	}
@@ -1444,7 +1433,6 @@
 		}
 	}
 
-	@Override
 	public boolean isValid() {
 		return valid;
 	}
@@ -1458,7 +1446,6 @@
 	 * 
 	 * @return The visual state of this shape.
 	 */
-	@Override
 	public IVisualState getVisualState() {
 		if (visualState == null) {
 			visualState = new VisualState();
@@ -1476,7 +1463,6 @@
 		return defaultBendPointRenderingActive;
 	}
 
-	@Override
 	public List<IFigure> getMainFiguresFromChildEditparts() {
 		List<IFigure> ret = new ArrayList<IFigure>();
 		List<EditPart> children = GraphitiUiInternal.getGefService().getEditPartChildren(getContainerEditPart());
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ShapeEditPart.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ShapeEditPart.java
index 7972213..7c04400 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ShapeEditPart.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/ShapeEditPart.java
@@ -844,11 +844,8 @@
 	public void delayDirectEditing() {
 		setDirectEditingDelayed(true);
 		Runnable runnable = new Runnable() {
-
-			@Override
 			public void run() {
 				setDirectEditingDelayed(false);
-
 			}
 		};
 		Display.getCurrent().timerExec(600, runnable);
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/ContentProposalListener.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/ContentProposalListener.java
index aa26993..fdeeba5 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/ContentProposalListener.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/ContentProposalListener.java
@@ -34,7 +34,6 @@
 		this.textCellEditor = textCellEditor;
 	}
 
-	@Override
 	public void proposalAccepted(IContentProposal proposal) {
 		if (proposal instanceof ContentProposal) {
 			IProposal acceptedProposal = ((ContentProposal) proposal).getProposal();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFCellEditorValidator.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFCellEditorValidator.java
index 4b4188f..ec01c78 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFCellEditorValidator.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFCellEditorValidator.java
@@ -38,7 +38,6 @@
 		setCellEditor(cellEditor);
 	}
 
-	@Override
 	public String isValid(Object value) {
 		if (!directEditHolder.isSimpleMode()) {
 			return isValidProposal(value);
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFDirectEditManager.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFDirectEditManager.java
index f6eb1af..b43e1c4 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFDirectEditManager.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/GFDirectEditManager.java
@@ -77,7 +77,6 @@
 	private double cachedZoom = -1.0;
 
 	private ZoomListener zoomListener = new ZoomListener() {
-		@Override
 		public void zoomChanged(double newZoom) {
 			updateScaledFont();
 		}
@@ -89,12 +88,10 @@
 		diagramEditor = part.getConfigurationProvider().getDiagramEditor();
 	}
 
-	@Override
 	public IDirectEditingContext getDirectEditingContext() {
 		return directEditingContext;
 	}
 
-	@Override
 	public IDirectEditingFeature getDirectEditingFeature() {
 		return directEditingFeature;
 	}
@@ -107,7 +104,6 @@
 		this.directEditingFeature = directEditingFeature;
 	}
 
-	@Override
 	public boolean isSimpleMode() {
 		boolean ret = true;
 		if (getDirectEditingFeature() != null) {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/TextCellLocator.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/TextCellLocator.java
index 4ff20c3..907829b 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/TextCellLocator.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/parts/directedit/TextCellLocator.java
@@ -50,7 +50,6 @@
 		this.directEditingFeature = directEditingFeature;
 	}
 
-	@Override
 	public void relocate(CellEditor celleditor) {
 
 		Control control = celleditor.getControl();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/platform/ExtensionManager.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/platform/ExtensionManager.java
index c5491cc..cff6189 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/platform/ExtensionManager.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/platform/ExtensionManager.java
@@ -95,7 +95,6 @@
 		return singleton;
 	}
 
-	@Override
 	public String[] getDiagramTypeProviderIds(String diagramTypeId) {
 		String ret[] = new String[0];
 		if (diagramTypeId == null) {
@@ -204,7 +203,6 @@
 		loadImageProvider(PlatformImageProvider.ID);
 	}
 
-	@Override
 	public IDiagramTypeProvider createDiagramTypeProvider(String providerId) {
 		IDiagramTypeProvider diagramTypeProvider = null;
 
@@ -271,7 +269,6 @@
 		return imageProviders;
 	}
 
-	@Override
 	public IDiagramType[] getDiagramTypes() {
 		return diagramTypes;
 	}
@@ -384,7 +381,6 @@
 		return null;
 	}
 
-	@Override
 	public IFeatureProvider createFeatureProvider(Diagram diagram) {
 		Assert.isNotNull(diagram);
 		String providerId = getDiagramTypeProviderId(diagram.getDiagramTypeId());
@@ -395,7 +391,6 @@
 		return null;
 	}
 
-	@Override
 	public IDiagramTypeProvider createDiagramTypeProvider(Diagram diagram, String providerId) {
 		Assert.isNotNull(diagram);
 		IDiagramTypeProvider dtp = createDiagramTypeProvider(providerId);
@@ -407,7 +402,6 @@
 		return dtp;
 	}
 
-	@Override
 	public String getDiagramTypeProviderId(String diagramTypeId) {
 		String diagramTypeProviders[] = getDiagramTypeProviderIds(diagramTypeId);
 		if (diagramTypeProviders != null && diagramTypeProviders.length > 0) {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/CommandService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/CommandService.java
index ec96d16..aac3f44 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/CommandService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/CommandService.java
@@ -45,7 +45,6 @@
  */
 public class CommandService implements ICommandService {
 
-	@Override
 	public org.eclipse.emf.common.command.Command transformFromGefToEmfCommand(org.eclipse.gef.commands.Command gefCommand) {
 		if (gefCommand instanceof GefOnEmfCommand) {
 			GefOnEmfCommand gefOnEmfCommand = (GefOnEmfCommand) gefCommand;
@@ -54,7 +53,6 @@
 		return new EmfOnGefCommand(gefCommand);
 	}
 
-	@Override
 	public org.eclipse.gef.commands.Command transformFromEmfToGefCommand(org.eclipse.emf.common.command.Command emfCommand) {
 		if (emfCommand instanceof EmfOnGefCommand) {
 			EmfOnGefCommand emfOnGefCommand = (EmfOnGefCommand) emfCommand;
@@ -66,7 +64,6 @@
 		return new GefOnEmfCommand(emfCommand);
 	}
 
-	@Override
 	public DefaultExecutionInfo completeExecutionInfo(DefaultExecutionInfo executionInfo, org.eclipse.gef.commands.Command gefCommand) {
 		if (gefCommand instanceof CompoundCommand) {
 			CompoundCommand compoundCommand = (CompoundCommand) gefCommand;
@@ -108,7 +105,6 @@
 		return executionInfo;
 	}
 
-	@Override
 	public DefaultExecutionInfo completeExecutionInfo(DefaultExecutionInfo executionInfo, ICommand gfCommand) {
 		if (gfCommand instanceof CommandContainer) {
 			CommandContainer cc = (CommandContainer) gfCommand;
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/EmfService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/EmfService.java
index 208630f..32a8b69 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/EmfService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/EmfService.java
@@ -72,7 +72,6 @@
 	private final String ATTRIBUTE_OBJ_NAME = "name";//$NON-NLS-1$
 	private final String ATTRIBUTE_OBJ_ID = "id";//$NON-NLS-1$
 
-	@Override
 	public String getObjectName(final Object obj) {
 		if (obj == null) {
 			throw new IllegalArgumentException("Obj must not be null"); //$NON-NLS-1$
@@ -99,7 +98,6 @@
 		return obj.toString();
 	}
 
-	@Override
 	public EObject getEObject(Object object) {
 		EObject eObject = null;
 		if (object != null && object instanceof EObject) {
@@ -160,7 +158,6 @@
 		return null;
 	}
 
-	@Override
 	public IFile getFile(EObject object) {
 		IFile result = null;
 		final Resource resource = object.eResource();
@@ -174,19 +171,16 @@
 	}
 	
 
-	@Override
 	@Deprecated
 	public IFile getFile(URI uri, TransactionalEditingDomain editingDomain) {
 		return getFile(uri);
 	}
 	
-	@Override
 	@Deprecated
 	public IFile getFile(URI uri, ResourceSet resourceSet) {
 		return getFile(uri);
 	}
 
-	@Override
 	public IFile getFile(URI uri) {
 		if (uri == null) {
 			return null;
@@ -219,24 +213,19 @@
 		return null;
 	}
 
-	@Override
 	@SuppressWarnings("unchecked")
 	public Set<Resource> save(TransactionalEditingDomain editingDomain) throws WrappedException {
 		return save(editingDomain, Collections.EMPTY_MAP);
 	}
 
-	@Override
 	public Set<Resource> save(final TransactionalEditingDomain editingDomain, final Map<Resource, Map<?, ?>> options) {
 
 		final Map<URI, Throwable> failedSaves = new HashMap<URI, Throwable>();
 		final Set<Resource> savedResources = new HashSet<Resource>();
 		final IWorkspaceRunnable wsRunnable = new IWorkspaceRunnable() {
-			@Override
 			public void run(final IProgressMonitor monitor) throws CoreException {
 
 				final Runnable runnable = new Runnable() {
-
-					@Override
 					public void run() {
 						Transaction parentTx;
 						if (editingDomain != null
@@ -321,7 +310,6 @@
 		return result;
 	}
 
-	@Override
 	public StringBuilder toString(final EObject o, final StringBuilder result) {
 		final EClass metaObject = o.eClass();
 		// type
@@ -363,7 +351,6 @@
 		return result;
 	}
 
-	@Override
 	public Diagram getDiagramFromFile(IFile file, ResourceSet resourceSet) {
 		// Get the URI of the model file.
 		URI resourceURI = getFileURI(file, resourceSet);
@@ -383,7 +370,6 @@
 		return null;
 	}
 
-	@Override
 	public URI getFileURI(IFile file, ResourceSet resourceSet) {
 		String pathName = file.getFullPath().toString();
 		URI resourceURI = URI.createPlatformResourceURI(pathName, true);
@@ -393,12 +379,10 @@
 		return resourceURI;
 	}
 
-	@Override
 	public URI mapDiagramFileUriToDiagramUri(URI diagramFileUri) {
 		return diagramFileUri.appendFragment("/0"); //$NON-NLS-1$
 	}
 	
-	@Override
 	public TransactionalEditingDomain createResourceSetAndEditingDomain() {
 		final ResourceSet resourceSet = new ResourceSetImpl();
 		final IWorkspaceCommandStack workspaceCommandStack = new GFWorkspaceCommandStackImpl(new DefaultOperationHistory());
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/GefService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/GefService.java
index de754a6..ff86606 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/GefService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/GefService.java
@@ -60,7 +60,6 @@
 
 	protected static final String PE = "*PE* "; //$NON-NLS-1$
 
-	@Override
 	public void selectEditPart(EditPartViewer viewer, Object modelObject) {
 		if (modelObject == null)
 			return;
@@ -73,7 +72,6 @@
 		}
 	}
 
-	@Override
 	public Point calculateTranslation(EditPart source, EditPart target) {
 		if (!(source instanceof GraphicalEditPart && target instanceof GraphicalEditPart))
 			throw new RuntimeException("Both EditParts must be an instance of GraphicalEditPart: " + source + " " + target); //$NON-NLS-1$ //$NON-NLS-2$
@@ -87,7 +85,6 @@
 		return result;
 	}
 
-	@Override
 	public Object getLayoutConstraint(EditPart editPart) {
 		if (editPart instanceof GraphicalEditPart) {
 			IFigure childFigure = ((GraphicalEditPart) editPart).getFigure();
@@ -102,7 +99,6 @@
 		return null;
 	}
 
-	@Override
 	public EditPart findEditPartAt(EditPartViewer viewer, Point location, boolean includeConnections) {
 
 		EditPart editPart = findObjectAt(viewer, location, includeConnections);
@@ -157,7 +153,6 @@
 		return part;
 	}
 
-	@Override
 	public List<EditPart> getConnectionsContainedInEditPart(EditPart ep) {
 		// Compute connections whose start and target are somewhere in the
 		// editpart sub hierarchy of ep
@@ -201,7 +196,6 @@
 		return res;
 	}
 
-	@Override
 	public Point getConnectionPointAt(Connection c, double d) {
 		Point ret = null;
 
@@ -305,7 +299,6 @@
 		return ret;
 	}
 
-	@Override
 	public Point getChopboxLocationOnBox(Point reference, Rectangle box) {
 		Rectangle r = Rectangle.SINGLETON;
 		r.setBounds(box);
@@ -348,7 +341,6 @@
 		return new Point(Math.round(centerX), Math.round(centerY));
 	}
 
-	@Override
 	public Point getAbsolutePointOnConnection(Connection c, double distance) {
 		Point ret = null;
 
@@ -451,13 +443,11 @@
 		return ret;
 	}
 
-	@Override
 	public Point getDistantPoint(Point start, Point end, double distance) {
 		Point ret = getDistantPoint(start.x, start.y, end.x, end.y, distance);
 		return ret;
 	}
 
-	@Override
 	public Point getDistantPoint(int startX, int startY, int endX, int endY, double distance) {
 		Point ret;
 		double completeDistance = Math.sqrt(((endX - startX) * (endX - startX)) + ((endY - startY) * (endY - startY)));
@@ -473,7 +463,6 @@
 		return ret;
 	}
 
-	@Override
 	public Point getPointAt(int startX, int startY, int endX, int endY, double d) {
 		Point ret;
 		int midX = (int) Math.round((startX + d * (endX - startX)));
@@ -482,7 +471,6 @@
 		return ret;
 	}
 
-	@Override
 	public Point getPointAt(Point start, Point end, double d) {
 		Point ret = getPointAt(start.x, start.y, end.x, end.y, d);
 		return ret;
@@ -495,7 +483,6 @@
 	 * org.eclipse.graphiti.ui.internal.util.gef.IGefService#getDistance(org
 	 * .eclipse.draw2d.geometry.Point[])
 	 */
-	@Override
 	public double getDistance(Point[] points) {
 		double ret = 0;
 		for (int i = 0; i < points.length - 1; i++) {
@@ -513,7 +500,6 @@
 		return ret;
 	}
 
-	@Override
 	public IDimension calculateTextSize(String text, Font font) {
 		IDimension dimension = null;
 		if (text == null || font == null || font.getName() == null) {
@@ -533,7 +519,6 @@
 		return dimension;
 	}
 
-	@Override
 	public void mirrorArray(Point[] draw2dPoints) {
 		int length = draw2dPoints.length;
 		for (int i = 0; i < length / 2; i++) {
@@ -543,28 +528,24 @@
 		}
 	}
 
-	@Override
 	public List<EditPart> getEditPartChildren(EditPart editPart) {
 		@SuppressWarnings("unchecked")
 		List<EditPart> ret = editPart.getChildren();
 		return ret;
 	}
 
-	@Override
 	public List<GraphicalEditPart> getSourceConnections(GraphicalEditPart graphicalEditPart) {
 		@SuppressWarnings("unchecked")
 		List<GraphicalEditPart> sourceConnections = graphicalEditPart.getSourceConnections();
 		return sourceConnections;
 	}
 
-	@Override
 	public List<GraphicalEditPart> getTargetConnections(GraphicalEditPart graphicalEditPart) {
 		@SuppressWarnings("unchecked")
 		List<GraphicalEditPart> targetConnections = graphicalEditPart.getTargetConnections();
 		return targetConnections;
 	}
 
-	@Override
 	public List<EditPart> getSelectedEditParts(EditPartViewer editPartViewer) {
 		@SuppressWarnings("unchecked")
 		List<EditPart> selectedEditParts = editPartViewer.getSelectedEditParts();
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/ImageService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/ImageService.java
index ab77c94..af22309 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/ImageService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/ImageService.java
@@ -31,7 +31,6 @@
  */
 public class ImageService implements IImageService {
 
-	@Override
 	public ImageDescriptor getImageDescriptorForId(String imageId) {
 
 		if (imageId == null)
@@ -47,7 +46,6 @@
 		return imageDescriptor;
 	}
 
-	@Override
 	public Image getImageForId(String imageId) {
 
 		if (imageId == null)
@@ -69,7 +67,6 @@
 		return image;
 	}
 
-	@Override
 	public void removeImageFromRegistry(String key) {
 		ImageRegistry imageRegistry = GraphitiUIPlugin.getDefault().getImageRegistry();
 		imageRegistry.remove(key);
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/TraceService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/TraceService.java
index 810469c..9dcc883 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/TraceService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/TraceService.java
@@ -40,7 +40,6 @@
 	private final boolean FULL_QUALIFIED = false;
 	private final boolean ADD_OBJECT_INFO = false;
 
-	@Override
 	public String getStacktrace(Throwable t) {
 		if (t == null)
 			return null;
@@ -49,13 +48,11 @@
 		return writer.toString();
 	}
 
-	@Override
 	public void dumpFigureTree(IFigure figure) {
 		System.out.println("\nFigure Tree"); //$NON-NLS-1$
 		dumpFigureTree(figure, 0);
 	}
 
-	@Override
 	public void dumpFigureTree(IFigure figure, int indent) {
 		String indentString = createIndentString(indent);
 
@@ -85,13 +82,11 @@
 		}
 	}
 
-	@Override
 	public void dumpEditPartTree(EditPart editPart) {
 		System.out.println("\nEdit Part Tree()"); //$NON-NLS-1$
 		dumpEditPartTree(editPart, 0);
 	}
 
-	@Override
 	public void dumpEditPartTree(EditPart editPart, int indent) {
 		String indentString = createIndentString(indent);
 		Object m = editPart.getModel();
@@ -114,13 +109,11 @@
 		}
 	}
 
-	@Override
 	public void dumpPictogramModelTree(PictogramElement pe) {
 		System.out.println("\nPictogram Model Tree()"); //$NON-NLS-1$
 		dumpPictogramModelTree(pe, 0);
 	}
 
-	@Override
 	public void dumpPictogramModelTree(PictogramElement pe, int indent) {
 		String indentString = createIndentString(indent);
 
@@ -138,12 +131,10 @@
 		}
 	}
 
-	@Override
 	public void dumpGATree(GraphicsAlgorithm ga) {
 		dumpGATree(ga, 0);
 	}
 
-	@Override
 	public void dumpGATree(GraphicsAlgorithm ga, int indent) {
 		String indentString = createIndentString(indent);
 		if (ga == null) {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiLayoutService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiLayoutService.java
index 0892eaf..7a50958 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiLayoutService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiLayoutService.java
@@ -36,86 +36,70 @@
 
 	ILayoutService ls = Graphiti.getLayoutService();
 
-	@Override
 	public ILocation getConnectionMidpoint(Connection c, double d) {
 		return ls.getConnectionMidpoint(c, d);
 	}
 
-	@Override
 	public IRectangle getGaBoundsForAnchor(Anchor anchor) {
 		return ls.getGaBoundsForAnchor(anchor);
 	}
 
-	@Override
 	public ILocationInfo getLocationInfo(Shape shape, int x, int y) {
 		return ls.getLocationInfo(shape, x, y);
 	}
 
-	@Override
 	public ILocation getLocationRelativeToDiagram(Anchor anchor) {
 		return ls.getLocationRelativeToDiagram(anchor);
 	}
 
-	@Override
 	public ILocation getLocationRelativeToDiagram(Shape shape) {
 		return ls.getLocationRelativeToDiagram(shape);
 	}
 
-	@Override
 	public IDimension calculateSize(GraphicsAlgorithm ga) {
 		return ls.calculateSize(ga);
 	}
 
-	@Override
 	public IDimension calculateSize(GraphicsAlgorithm ga, boolean considerLineWidth) {
 		return ls.calculateSize(ga, considerLineWidth);
 	}
 
-	@Override
 	public void setHeight(GraphicsAlgorithm ga, int height) {
 		ls.setHeight(ga, height);
 
 	}
 
-	@Override
 	public void setLocationAndSize(GraphicsAlgorithm ga, int x, int y, int width, int height) {
 		ls.setLocationAndSize(ga, x, y, width, height);
 
 	}
 
-	@Override
 	public void setLocationAndSize(GraphicsAlgorithm ga, int x, int y, int width, int height, boolean avoidNegativeCoordinates) {
 		ls.setLocationAndSize(ga, x, y, width, height, avoidNegativeCoordinates);
 
 	}
 
-	@Override
 	public void setLocation(GraphicsAlgorithm ga, int x, int y) {
 		ls.setLocation(ga, x, y);
 
 	}
 
-	@Override
 	public void setLocation(GraphicsAlgorithm ga, int x, int y, boolean avoidNegativeCoordinates) {
 		ls.setLocation(ga, x, y, avoidNegativeCoordinates);
 
 	}
 
-	@Override
 	public void setSize(GraphicsAlgorithm ga, int width, int height) {
 		ls.setSize(ga, width, height);
 
 	}
 
-	@Override
 	public void setWidth(GraphicsAlgorithm ga, int width) {
 		ls.setWidth(ga, width);
 
 	}
 
-	@Override
 	public IDimension calculateTextSize(String text, Font font) {
 		return GraphitiUiInternal.getGefService().calculateTextSize(text, font);
 	}
-
 }
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiService.java
index e0ff03a..c05aa4c 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/UiService.java
@@ -53,7 +53,6 @@
  */
 public class UiService implements IUiService {
 
-	@Override
 	public byte[] createImage(Image image, int format) throws Exception {
 		ByteArrayOutputStream result = new ByteArrayOutputStream();
 
@@ -85,7 +84,6 @@
 		return result.toByteArray();
 	}
 
-	@Override
 	public ImageData create8BitIndexedPaletteImage(Image image) throws Exception {
 		int upperboundWidth = image.getBounds().width;
 		int upperboundHeight = image.getBounds().height;
@@ -134,7 +132,6 @@
 		return newImageData;
 	}
 
-	@Override
 	public void startSaveAsImageDialog(GraphicalViewer graphicalViewer) {
 		final String METHOD = "startSaveAsImageDialog(graphicalViewer)"; //$NON-NLS-1$
 
@@ -193,7 +190,6 @@
 			final String file, final Image im, final IDiagramsExporter exporter) {
 		IRunnableWithProgress operation;
 		operation = new IRunnableWithProgress() {
-			@Override
 			public void run(IProgressMonitor monitor) {
 				try {
 					exporter.export(im, saveAsImageDialog.getFigure(), file, saveAsImageDialog.getImageScaleFactor());
@@ -228,7 +224,6 @@
 	 */
 	private IRunnableWithProgress getSaveToFileOp(final Shell shell, final String filename, final byte contents[]) throws Exception {
 		IRunnableWithProgress operation = new IRunnableWithProgress() {
-			@Override
 			public void run(IProgressMonitor monitor) {
 				FileOutputStream outputStream = null;
 				try {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/WorkbenchService.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/WorkbenchService.java
index f4c992c..8f8f98a 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/WorkbenchService.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/services/impl/WorkbenchService.java
@@ -45,7 +45,6 @@
  */
 public class WorkbenchService implements IWorkbenchService {
 
-	@Override
 	public IStatusLineManager getActiveStatusLineManager() {
 		final IWorkbenchPart activePart = getActiveOrFirstWorkbenchWindow().getActivePage().getActivePart();
 		if (activePart instanceof IViewPart) {
@@ -64,7 +63,6 @@
 		return new StatusLineManager();
 	}
 
-	@Override
 	public IWorkbenchWindow getActiveOrFirstWorkbenchWindow() {
 		IWorkbenchWindow result = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (result == null) {
@@ -84,7 +82,6 @@
 	 * @param domain
 	 * @return the editor instance
 	 */
-	@Override
 	public IDiagramEditor openDiagramEditor(Diagram diagram, TransactionalEditingDomain domain, boolean disposeEditingDomain) {
 		IDiagramEditor ret = null;
 
@@ -105,7 +102,6 @@
 	 *            be used by the editor.
 	 * @return the editor instance
 	 */
-	@Override
 	public IDiagramEditor openDiagramEditor(Diagram diagram, TransactionalEditingDomain domain, String providerId,
 			boolean disposeEditingDomain) {
 		return openDiagramEditor(diagram, domain, providerId, DiagramEditor.DIAGRAM_EDITOR_ID, disposeEditingDomain);
@@ -126,7 +122,6 @@
 	 * @return the editor instance
 	 * @since 0.8.0
 	 */
-	@Override
 	public IDiagramEditor openDiagramEditor(Diagram diagram, TransactionalEditingDomain domain, String providerId, String editorId,
 			boolean disposeEditingDomain) {
 		IDiagramEditor ret = null;
@@ -158,7 +153,6 @@
 		return null;
 	}
 
-	@Override
 	public Shell getShell() {
 		return GraphitiUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
index ed33498..aa6bed2 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
@@ -55,6 +55,7 @@
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.part.ResourceTransfer;
 
 /**
  * Provides a clipboard-like storage of EMF-related data based on SWT
@@ -254,7 +255,6 @@
 		// in the case of a UI
 		if (canUseUI()) {
 			BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-				@Override
 				public void run() {
 					final Copier copier = new Copier(true, true);
 					result[0] = copier.copyAll(Arrays.asList(srcObjects));
@@ -449,8 +449,6 @@
 	private void rollback(final TransactionalEditingDomain targetTED) {
 		try {
 			targetTED.runExclusive(new Runnable() {
-
-				@Override
 				public void run() {
 					final EList<Resource> resources = targetTED.getResourceSet().getResources();
 					for (final Iterator<Resource> iterator = resources.iterator(); iterator.hasNext();) {
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleField.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleField.java
index 555a732..5868a8e 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleField.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleField.java
@@ -119,7 +119,6 @@
 		_text.addModifyListener(listener);
 	}
 
-	@Override
 	public void modifyText(ModifyEvent e) {
 		if (_internalModify)
 			return;
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleFieldWithDropDown.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleFieldWithDropDown.java
index e327991..14a75e2 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleFieldWithDropDown.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/DoubleFieldWithDropDown.java
@@ -112,7 +112,6 @@
 		_text.addModifyListener(listener);
 	}
 
-	@Override
 	public void modifyText(ModifyEvent e) {
 		if (_internalModify)
 			return;
@@ -134,7 +133,6 @@
 		}
 	}
 
-	@Override
 	public void widgetSelected(SelectionEvent e) {
 		if (_internalModify)
 			return;
@@ -149,7 +147,6 @@
 		}
 	}
 
-	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 		widgetSelected(e);
 	}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/AbstractFigureSelectionDialog.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/AbstractFigureSelectionDialog.java
index 29d9ca2..ace71cb 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/AbstractFigureSelectionDialog.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/AbstractFigureSelectionDialog.java
@@ -166,7 +166,6 @@
 	 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse
 	 * .swt.events.SelectionEvent)
 	 */
-	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 		widgetSelected(e);
 	}
@@ -178,7 +177,6 @@
 	 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
 	 * .events.SelectionEvent)
 	 */
-	@Override
 	public void widgetSelected(SelectionEvent e) {
 		if (_insideInternalModify) // avoid endless-loops
 			return;
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/ExportDiagramDialog.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/ExportDiagramDialog.java
index 66ef9dc..f4e9ccb 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/ExportDiagramDialog.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/ExportDiagramDialog.java
@@ -185,7 +185,6 @@
 	 * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events
 	 * .ModifyEvent)
 	 */
-	@Override
 	public void modifyText(ModifyEvent e) {
 		if (_insideInternalModify) // avoid endless-loops
 			return;
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/PrintFigureDialog.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/PrintFigureDialog.java
index 1344965..81d8623 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/PrintFigureDialog.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/ui/print/PrintFigureDialog.java
@@ -232,7 +232,6 @@
 		}
 	}
 
-	@Override
 	public void paintControl(PaintEvent e) {
 		Rectangle printRegion = getPrintRegion();
 		org.eclipse.swt.graphics.Rectangle previewRegion = _preview.getClientArea();
@@ -458,7 +457,6 @@
 		}
 	}
 
-	@Override
 	public void modifyText(ModifyEvent e) {
 		if (_insideInternalModify) // avoid endless-loops
 			return;
diff --git a/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.core.prefs
index 9a6db1b..92bf135 100644
--- a/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:25:05 CEST 2011

+#Wed Nov 09 14:31:36 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.launching.prefs
index d6f7281..8b7e88c 100644
--- a/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.graphiti/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:25:05 CEST 2011

+#Wed Nov 09 14:32:40 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/plugins/org.eclipse.graphiti/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.graphiti/.settings/org.eclipse.pde.api.tools.prefs
index 2420d42..7732d74 100644
--- a/plugins/org.eclipse.graphiti/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.graphiti/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:13:36 CEST 2011

+#Wed Nov 09 14:33:45 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/PropertyBag.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/PropertyBag.java
index b5a461f..c4b6e90 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/PropertyBag.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/PropertyBag.java
@@ -23,12 +23,10 @@
 public class PropertyBag implements IPropertyBag {
 	private HashMap<Object, Object> propertyMap;
 
-	@Override
 	public Object getProperty(Object key) {
 		return getPropertyMap().get(key);
 	}
 
-	@Override
 	public Object putProperty(Object key, Object value) {
 		return getPropertyMap().put(key, value);
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java
index f3fc0b4..b43df09 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java
@@ -60,7 +60,6 @@
 	 * 
 	 * @return An array of all registered tool behavior providers
 	 */
-	@Override
 	public IToolBehaviorProvider[] getAvailableToolBehaviorProviders() {
 		if (this.availableToolBehaviorProviders == null) {
 			this.availableToolBehaviorProviders = new IToolBehaviorProvider[] { new DefaultToolBehaviorProvider(this) };
@@ -68,7 +67,6 @@
 		return this.availableToolBehaviorProviders;
 	}
 
-	@Override
 	public IToolBehaviorProvider getCurrentToolBehaviorProvider() {
 		IToolBehaviorProvider ret = null;
 		if (getAvailableToolBehaviorProviders().length > 0) {
@@ -77,12 +75,10 @@
 		return ret;
 	}
 
-	@Override
 	public int getCurrentToolBehaviorIndex() {
 		return this.currentToolBehaviorIndex;
 	}
 
-	@Override
 	public void setCurrentToolBehaviorIndex(int index) {
 		if (this.currentToolBehaviorIndex != index) {
 			if (index < 0 || index >= getAvailableToolBehaviorProviders().length) {
@@ -96,12 +92,10 @@
 		}
 	}
 
-	@Override
 	public Diagram getDiagram() {
 		return this.diagram;
 	}
 
-	@Override
 	public String getDiagramTitle() {
 		String name = ""; //$NON-NLS-1$
 		if (getDiagram() != null) {
@@ -110,12 +104,10 @@
 		return name;
 	}
 
-	@Override
 	public IDiagramEditor getDiagramEditor() {
 		return this.diagramEditor;
 	}
 
-	@Override
 	public IFeatureProvider getFeatureProvider() {
 		if (this.featureProvider == null) {
 			T.racer().error("featureProvider is null"); //$NON-NLS-1$
@@ -123,7 +115,6 @@
 		return this.featureProvider;
 	}
 
-	@Override
 	public void init(Diagram diagram, IDiagramEditor diagramEditor) {
 		setDiagram(diagram);
 		GraphitiInternal.getEmfService().wireDTPToDiagram(diagram, this);
@@ -152,7 +143,6 @@
 		this.featureProvider = featureProvider;
 	}
 
-	@Override
 	public boolean isAutoUpdateAtRuntime() {
 		return true;
 	}
@@ -160,22 +150,18 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public boolean isAutoUpdateAtRuntimeWhenEditorIsSaved() {
 		return false;
 	}
 
-	@Override
 	public boolean isAutoUpdateAtStartup() {
 		return false;
 	}
 
-	@Override
 	public boolean isAutoUpdateAtReset() {
 		return true;
 	}
 
-	@Override
 	public void dispose() {
 		if (getCurrentToolBehaviorProvider() != null) {
 			getCurrentToolBehaviorProvider().dispose();
@@ -185,7 +171,6 @@
 		}
 	}
 
-	@Override
 	public INotificationService getNotificationService() {
 		if (this.notificationService == null) {
 			this.notificationService = new DefaultNotificationService(this);
@@ -193,26 +178,21 @@
 		return this.notificationService;
 	}
 
-	@Override
 	public Object[] getRelatedBusinessObjects(Object[] bos) {
 		return new Object[0];
 	}
 
-	@Override
 	public IGraphicsAlgorithmRendererFactory getGraphicsAlgorithmRendererFactory() {
 		return null;
 	}
 
-	@Override
 	public void postInit() {
 	}
 
-	@Override
 	public void resourceReloaded(Diagram diagram) {
 		setDiagram(diagram);
 	}
 
-	@Override
 	public void resourcesSaved(Diagram diagram, Resource[] savedResources) {
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/DefaultFeatureProviderWrapper.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/DefaultFeatureProviderWrapper.java
index 6de45f4..50dd7e8 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/DefaultFeatureProviderWrapper.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/DefaultFeatureProviderWrapper.java
@@ -223,7 +223,6 @@
 		return getInnerFeatureProvider().updateNeeded(context);
 	}
 
-	@Override
 	public void dispose() {
 	}
 }
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/DeleteContext.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/DeleteContext.java
index 3c79137..7ca8fe0 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/DeleteContext.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/DeleteContext.java
@@ -48,7 +48,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public IMultiDeleteInfo getMultiDeleteInfo() {
 		return multiDeleteInfo;
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/PasteContext.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/PasteContext.java
index a3a56ba..ea3341d 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/PasteContext.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/context/impl/PasteContext.java
@@ -66,7 +66,6 @@
 	 * 
 	 * @since 0.9
 	 */
-	@Override
 	public int getX() {
 		return locationContext.getX();
 	}
@@ -88,7 +87,6 @@
 	 * @return an integer representing the y location
 	 * @since 0.9
 	 */
-	@Override
 	public int getY() {
 		return locationContext.getY();
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/custom/AbstractCustomFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/custom/AbstractCustomFeature.java
index 2ae4124..8373d9d 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/custom/AbstractCustomFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/custom/AbstractCustomFeature.java
@@ -69,6 +69,14 @@
 	}
 
 	public void execute(IContext context) {
+		if (context instanceof ICustomContext) {
+			execute((ICustomContext) context);
+		}
+	}
+	/**
+	 * @since 0.9
+	 */
+	public void execute(ICustomContext context) {
 		final String SIGNATURE = "execute(IContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
 		if (info) {
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractCreateConnectionFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractCreateConnectionFeature.java
index c53b639..95a20e7 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractCreateConnectionFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractCreateConnectionFeature.java
@@ -113,29 +113,24 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void startConnecting() {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void endConnecting() {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void attachedToSource(ICreateConnectionContext context) {
 	}
 
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void canceledAttaching(ICreateConnectionContext context) {
 	}
-
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractDirectEditingFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractDirectEditingFeature.java
index 4a60653..89873cb 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractDirectEditingFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractDirectEditingFeature.java
@@ -110,7 +110,6 @@
 		return choosenValue;
 	}
 
-	@Override
 	public boolean stretchFieldToFitText() {
 		return false;
 	}
@@ -131,7 +130,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public IProposalSupport getProposalSupport() {
 		return null;
 	}
@@ -141,7 +139,6 @@
 	/**
 	 * @since 0.8
 	 */
-	@Override
 	public void setValue(String value, IDirectEditingContext context) {
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeature.java
index d8e0264..574843c 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeature.java
@@ -61,7 +61,6 @@
 		return true;
 	}
 
-	@Override
 	public boolean hasDoneChanges() {
 		return true;
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java
index 80feff7..b512646 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/AbstractFeatureProvider.java
@@ -116,92 +116,74 @@
 		this.dtp = diagramTypeProvider;
 	}
 
-	@Override
 	public IAddFeature getAddFeature(IAddContext context) {
 		return null;
 	}
 
-	@Override
 	public ICreateConnectionFeature[] getCreateConnectionFeatures() {
 		return new ICreateConnectionFeature[0];
 	}
 
-	@Override
 	public ICreateFeature[] getCreateFeatures() {
 		return new ICreateFeature[0];
 	}
 
-	@Override
 	public ICustomFeature[] getCustomFeatures(ICustomContext context) {
 		return ZERO_CUSTOM_FEATURES;
 	}
 
-	@Override
 	public IDeleteFeature getDeleteFeature(IDeleteContext context) {
 		return null;
 	}
 
-	@Override
 	public IDiagramTypeProvider getDiagramTypeProvider() {
 		return this.dtp;
 	}
 
-	@Override
 	public IMoveAnchorFeature getMoveAnchorFeature(IMoveAnchorContext context) {
 		return null;
 	}
 
-	@Override
 	public IRemoveFeature getRemoveFeature(IRemoveContext context) {
 		return null;
 	}
 
-	@Override
 	public IUpdateFeature getUpdateFeature(IUpdateContext context) {
 		return null;
 	}
 
-	@Override
 	public ILayoutFeature getLayoutFeature(ILayoutContext context) {
 		return null;
 	}
 
-	@Override
 	public IMoveShapeFeature getMoveShapeFeature(IMoveShapeContext context) {
 		return null;
 	}
 
-	@Override
 	public IMoveConnectionDecoratorFeature getMoveConnectionDecoratorFeature(IMoveConnectionDecoratorContext context) {
 		return null;
 	}
 
-	@Override
 	public IMoveBendpointFeature getMoveBendpointFeature(IMoveBendpointContext context) {
 		return null;
 	}
 
-	@Override
 	public IResizeShapeFeature getResizeShapeFeature(IResizeShapeContext context) {
 		return null;
 	}
 
-	@Override
 	public IAddBendpointFeature getAddBendpointFeature(IAddBendpointContext context) {
 		return null;
 	}
 
-	@Override
 	public IRemoveBendpointFeature getRemoveBendpointFeature(IRemoveBendpointContext context) {
 		return null;
 	}
 
-	@Override
 	public IDirectEditingFeature getDirectEditingFeature(IDirectEditingContext context) {
 		return null;
 	}
 
-	@Override
 	public IReason canUpdate(IUpdateContext context) {
 		final String SIGNATURE = "canUpdate(IUpdateContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -220,7 +202,6 @@
 		return ret;
 	}
 
-	@Override
 	public IReason canLayout(ILayoutContext context) {
 		final String SIGNATURE = "canLayout(ILayoutContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -239,7 +220,6 @@
 		return ret;
 	}
 
-	@Override
 	public IReason updateIfPossible(IUpdateContext context) {
 		final String SIGNATURE = "updateIfPossible(IUpdateContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -268,7 +248,6 @@
 		return reason;
 	}
 
-	@Override
 	public IReason layoutIfPossible(ILayoutContext context) {
 		final String SIGNATURE = "layoutIfPossible(ILayoutContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -298,7 +277,6 @@
 		return res;
 	}
 
-	@Override
 	public IReason updateNeeded(IUpdateContext context) {
 		final String SIGNATURE = "updateNeeded(IUpdateContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -319,7 +297,6 @@
 		return ret;
 	}
 
-	@Override
 	public IReason updateIfPossibleAndNeeded(IUpdateContext context) {
 		final String SIGNATURE = "updateIfPossibleAndNeeded(IUpdateContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -339,7 +316,6 @@
 		return ret;
 	}
 
-	@Override
 	public PictogramElement addIfPossible(IAddContext context) {
 		final String SIGNATURE = "addIfPossible(IAddContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -367,7 +343,6 @@
 		return ret;
 	}
 
-	@Override
 	public IReason canAdd(IAddContext context) {
 		final String SIGNATURE = "canAdd(IAddContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -386,27 +361,22 @@
 		return ret;
 	}
 
-	@Override
 	final public IDirectEditingInfo getDirectEditingInfo() {
 		return this.directEditingInfo;
 	}
 
-	@Override
 	public IReconnectionFeature getReconnectionFeature(IReconnectionContext context) {
 		return new DefaultReconnectionFeature(this);
 	}
 
-	@Override
 	public IPrintFeature getPrintFeature() {
 		return new DefaultPrintFeature(this);
 	}
 
-	@Override
 	public ISaveImageFeature getSaveImageFeature() {
 		return new DefaultSaveImageFeature(this);
 	}
 
-	@Override
 	public IFeature[] getDragAndDropFeatures(IPictogramElementContext context) {
 		return new IFeature[0];
 	}
@@ -438,7 +408,6 @@
 
 	StringTransformer st = new StringTransformer();
 
-	@Override
 	public Object[] getAllBusinessObjectsForPictogramElement(PictogramElement pictogramElement) {
 		final String SIGNATURE = "getAllBusinessObjectsForPictogramElement(PictogramElement)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -477,7 +446,6 @@
 		}
 	}
 
-	@Override
 	public Object getBusinessObjectForPictogramElement(PictogramElement pictogramElement) {
 		final String SIGNATURE = "getBusinessObjectForPictogramElement(PictogramElement)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -508,7 +476,6 @@
 		return ret;
 	}
 
-	@Override
 	public PictogramElement[] getAllPictogramElementsForBusinessObject(Object businessObject) {
 		final String SIGNATURE = "getAllPictogramElementsForBusinessObject(Object)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -566,7 +533,6 @@
 	 *            the business object
 	 * @return the pictogram element for business object
 	 */
-	@Override
 	public PictogramElement getPictogramElementForBusinessObject(Object businessObject) {
 		final String SIGNATURE = "getPictogramElementForBusinessObject(Object)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -626,17 +592,14 @@
 	 * @return true when at least one pictogram element is linked, otherwise
 	 *         return false.
 	 */
-	@Override
 	public boolean hasPictogramElementForBusinessObject(Object businessObject) {
 		return getPictogramElementForBusinessObject(businessObject) != null;
 	}
 
-	@Override
 	public void link(PictogramElement pictogramElement, Object businessObject) {
 		link(pictogramElement, new Object[] { businessObject });
 	}
 
-	@Override
 	public void link(PictogramElement pictogramElement, Object[] businessObjects) {
 		final String SIGNATURE = "link(PictogramElement, Object[])"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -724,7 +687,6 @@
 		this.independenceSolver = independenceSolver;
 	}
 
-	@Override
 	public void dispose() {
 	}
 
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultPrintFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultPrintFeature.java
index 219c3ba..c6321ba 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultPrintFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultPrintFeature.java
@@ -41,20 +41,16 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canPrint(IPrintContext context) {
 		return true;
 	}
 
-	@Override
 	public void postPrint(IPrintContext context) {
 	}
 
-	@Override
 	public void prePrint(IPrintContext context) {
 	}
 
-	@Override
 	public boolean canExecute(IContext context) {
 		boolean ret = false;
 		if (context instanceof IPrintContext) {
@@ -63,7 +59,6 @@
 		return ret;
 	}
 
-	@Override
 	final public void execute(IContext context) {
 		// not relevant (actual work is done in PrintGraphicalViewerAction)
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultReconnectionFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultReconnectionFeature.java
index dbc3f3f..cbd76a3 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultReconnectionFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultReconnectionFeature.java
@@ -110,7 +110,6 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public void canceledReconnect(IReconnectionContext context) {
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultSaveImageFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultSaveImageFeature.java
index 906c1d4..e7610fb 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultSaveImageFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultSaveImageFeature.java
@@ -41,20 +41,16 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canSave(ISaveImageContext context) {
 		return true;
 	}
 
-	@Override
 	public void postSave(ISaveImageContext context) {
 	}
 
-	@Override
 	public void preSave(ISaveImageContext context) {
 	}
 
-	@Override
 	public boolean canExecute(IContext context) {
 		boolean ret = false;
 		if (context instanceof ISaveImageContext) {
@@ -63,7 +59,6 @@
 		return ret;
 	}
 
-	@Override
 	public final void execute(IContext context) {
 		// not relevant (actual work is done in SaveImageAction)
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultUpdateDiagramFeature.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultUpdateDiagramFeature.java
index 711d4c2..9318efa 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultUpdateDiagramFeature.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/features/impl/DefaultUpdateDiagramFeature.java
@@ -51,12 +51,10 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canUpdate(IUpdateContext context) {
 		return context.getPictogramElement() instanceof Diagram;
 	}
 
-	@Override
 	public boolean update(IUpdateContext context) {
 		PictogramElement pe = context.getPictogramElement();
 		if (pe instanceof Diagram) {
@@ -87,7 +85,6 @@
 		return true;
 	}
 
-	@Override
 	public IReason updateNeeded(IUpdateContext context) {
 		PictogramElement pe = context.getPictogramElement();
 		if (pe instanceof Diagram) {
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/AbstractProposalSupport.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/AbstractProposalSupport.java
index dd2965e..bf597f1 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/AbstractProposalSupport.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/AbstractProposalSupport.java
@@ -15,7 +15,6 @@
 	 * org.eclipse.graphiti.func.IProposalSupport#getPossibleValues(org.eclipse
 	 * .graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public IProposal[] getPossibleValues(IDirectEditingContext context) {
 		return EMPTY_PROPOSAL_ARRAY;
 	}
@@ -28,7 +27,6 @@
 	 * , int, org.eclipse.graphiti.func.IProposal,
 	 * org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String completeValue(String value, int caretPosition, IProposal choosenValue, IDirectEditingContext context) {
 		return choosenValue.getText();
 	}
@@ -41,7 +39,6 @@
 	 * String, org.eclipse.graphiti.func.IProposal,
 	 * org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public String checkValueValid(String text, IProposal proposal, IDirectEditingContext context) {
 		return null;
 	}
@@ -54,7 +51,6 @@
 	 * .String, int,
 	 * org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public IProposal[] getValueProposals(String value, int caretPosition, IDirectEditingContext context) {
 		return EMPTY_PROPOSAL_ARRAY;
 	}
@@ -67,7 +63,6 @@
 	 * org.eclipse.graphiti.func.IProposal,
 	 * org.eclipse.graphiti.features.context.IDirectEditingContext)
 	 */
-	@Override
 	public void setValue(String text, IProposal proposal, IDirectEditingContext context) {
 	}
 
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/Proposal.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/Proposal.java
index 6a3916e..b71fb0d 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/Proposal.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/func/Proposal.java
@@ -31,12 +31,10 @@
 		setObject(object);
 	}
 
-	@Override
 	public Object getObject() {
 		return object;
 	}
 
-	@Override
 	public String getText() {
 		return text; // + " - " + getObject(); // for tests
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/ExternalPictogramLink.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/ExternalPictogramLink.java
index 97f34df..e72de71 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/ExternalPictogramLink.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/ExternalPictogramLink.java
@@ -71,7 +71,6 @@
 		pictogramElement = newValue;
 	}
 
-	@Override
 	public EList<Property> getProperties() {
 		return new BasicEList<Property>();
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/CreateServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/CreateServiceImpl.java
index b2d7218..c163536 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/CreateServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/CreateServiceImpl.java
@@ -68,7 +68,6 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public MultiText createDefaultMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createDefaultMultiText(diagram, gaContainer, value);
 	}
@@ -80,7 +79,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createDefaultMultiText
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public MultiText createDefaultMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createDefaultMultiText(diagram, gaContainer);
 	}
@@ -94,7 +92,6 @@
 	 * eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public Text createDefaultText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createDefaultText(diagram, gaContainer, value);
 	}
@@ -106,7 +103,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createDefaultText(org.
 	 * eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Text createDefaultText(Diagram diagram, GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createDefaultText(diagram, gaContainer);
 	}
@@ -118,12 +114,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createEllipse(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Ellipse createEllipse(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createEllipse(gaContainer);
 	}
 	
-	@Override
 	public Ellipse createPlainEllipse(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainEllipse(gaContainer);
 	}
@@ -135,12 +129,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createImage(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public Image createImage(GraphicsAlgorithmContainer gaContainer, String imageId) {
 		return getGaService().createImage(gaContainer, imageId);
 	}
 	
-	@Override
 	public Image createPlainImage(GraphicsAlgorithmContainer gaContainer, String imageId) {
 		return getGaService().createPlainImage(gaContainer, imageId);
 	}
@@ -152,7 +144,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createInvisibleRectangle
 	 * (org.eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public Rectangle createInvisibleRectangle(PictogramElement pe) {
 		return getGaService().createInvisibleRectangle(pe);
 	}
@@ -164,12 +155,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createMultiText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public MultiText createMultiText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createMultiText(gaContainer, value);
 	}
 	
-	@Override
 	public MultiText createPlainMultiText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createPlainMultiText(gaContainer, value);
 	}
@@ -181,12 +170,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createMultiText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public MultiText createMultiText(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createMultiText(gaContainer);
 	}
 	
-	@Override
 	public MultiText createPlainMultiText(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainMultiText(gaContainer);
 	}
@@ -200,7 +187,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int)
 	 */
-	@Override
 	public MultiText createMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize) {
 		return getGaService().createMultiText(diagram, gaContainer, value, fontName, fontSize);
 	}
@@ -214,7 +200,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int, boolean, boolean)
 	 */
-	@Override
 	public MultiText createMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize,
 			boolean isFontItalic, boolean isFontBold) {
 		return getGaService().createMultiText(diagram, gaContainer, value, fontName, fontSize, isFontItalic, isFontBold);
@@ -228,12 +213,10 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public PlatformGraphicsAlgorithm createPlatformGraphicsAlgorithm(GraphicsAlgorithmContainer gaContainer, String id) {
 		return getGaService().createPlatformGraphicsAlgorithm(gaContainer, id);
 	}
 	
-	@Override
 	public PlatformGraphicsAlgorithm createPlainPlatformGraphicsAlgorithm(GraphicsAlgorithmContainer gaContainer, String id) {
 		return getGaService().createPlainPlatformGraphicsAlgorithm(gaContainer, id);
 	}
@@ -245,7 +228,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPoint(org.eclipse
 	 * .emf.ecore.EObject, int, int, int, int)
 	 */
-	@Override
 	public Point createPoint(int x, int y, int before, int after) {
 		return getGaService().createPoint(x, y, before, after);
 	}
@@ -257,7 +239,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPoint(org.eclipse
 	 * .emf.ecore.EObject, int, int)
 	 */
-	@Override
 	public Point createPoint(int x, int y) {
 		return getGaService().createPoint(x, y);
 	}
@@ -269,7 +250,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPointList(org.eclipse
 	 * .emf.ecore.EObject, int[], int[])
 	 */
-	@Override
 	public List<Point> createPointList(int[] xy, int[] beforeAfter) {
 		return getGaService().createPointList(xy, beforeAfter);
 	}
@@ -281,7 +261,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPointList(org.eclipse
 	 * .emf.ecore.EObject, int[])
 	 */
-	@Override
 	public List<Point> createPointList(int[] xy) {
 		return getGaService().createPointList(xy);
 	}
@@ -293,12 +272,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.util.Collection)
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		return getGaService().createPolygon(gaContainer, points);
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		return getGaService().createPlainPolygon(gaContainer, points);
 	}
@@ -310,12 +287,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[], int[])
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy, int[] beforeAfter) {
 		return getGaService().createPolygon(gaContainer, xy, beforeAfter);
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy, int[] beforeAfter) {
 		return getGaService().createPlainPolygon(gaContainer, xy, beforeAfter);
 	}
@@ -328,12 +303,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[])
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		return getGaService().createPolygon(gaContainer, xy);
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		return getGaService().createPolygon(gaContainer, xy);
 	}
@@ -345,12 +318,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPolygon(gaContainer);
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainPolygon(gaContainer);
 	}
@@ -363,12 +334,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.util.Collection)
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		return getGaService().createPolyline(gaContainer, points);
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		return getGaService().createPlainPolyline(gaContainer, points);
 	}
@@ -380,12 +349,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[], int[])
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy, int[] beforeAfter) {
 		return getGaService().createPolyline(gaContainer, xy, beforeAfter);
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy, int[] beforeAfter) {
 		return getGaService().createPlainPolyline(gaContainer, xy, beforeAfter);
 	}
@@ -397,12 +364,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[])
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		return getGaService().createPolyline(gaContainer, xy);
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		return getGaService().createPlainPolyline(gaContainer, xy);
 	}
@@ -414,12 +379,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPolyline(gaContainer);
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainPolyline(gaContainer);
 	}
@@ -431,12 +394,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createRectangle(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Rectangle createRectangle(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createRectangle(gaContainer);
 	}
 	
-	@Override
 	public Rectangle createPlainRectangle(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainRectangle(gaContainer);
 	}
@@ -448,12 +409,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createRoundedRectangle
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer, int, int)
 	 */
-	@Override
 	public RoundedRectangle createRoundedRectangle(GraphicsAlgorithmContainer gaContainer, int cornerWidth, int cornerHeight) {
 		return getGaService().createRoundedRectangle(gaContainer, cornerWidth, cornerHeight);
 	}
 	
-	@Override
 	public RoundedRectangle createPlainRoundedRectangle(GraphicsAlgorithmContainer gaContainer, int cornerWidth, int cornerHeight) {
 		return getGaService().createPlainRoundedRectangle(gaContainer, cornerWidth, cornerHeight);
 	}
@@ -466,7 +425,6 @@
 	 * .eclipse.graphiti.mm.datatypes.Color, int,
 	 * org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public Color createShiftedColor(Color color, int shift, Diagram diagram) {
 		return getGaService().createShiftedColor(color, shift, diagram);
 	}
@@ -478,7 +436,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createShiftedColor(org
 	 * .eclipse.graphiti.util.IColorConstant, int)
 	 */
-	@Override
 	public IColorConstant createShiftedColor(IColorConstant colorConstant, int shift) {
 		return getGaService().createShiftedColor(colorConstant, shift);
 	}
@@ -490,12 +447,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createStyle(org.eclipse
 	 * .graphiti.mm.pictograms.StyleContainer, java.lang.String)
 	 */
-	@Override
 	public Style createStyle(StyleContainer styleContainer, String id) {
 		return getGaService().createStyle(styleContainer, id);
 	}
 	
-	@Override
 	public Style createPlainStyle(StyleContainer styleContainer, String id) {
 		return getGaService().createStyle(styleContainer, id);
 	}
@@ -507,12 +462,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public Text createText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createText(gaContainer, value);
 	}
 	
-	@Override
 	public Text createPlainText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return getGaService().createPlainText(gaContainer, value);
 	}
@@ -524,12 +477,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Text createText(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createText(gaContainer);
 	}
 	
-	@Override
 	public Text createPlainText(GraphicsAlgorithmContainer gaContainer) {
 		return getGaService().createPlainText(gaContainer);
 	}
@@ -543,7 +494,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int)
 	 */
-	@Override
 	public Text createText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize) {
 		return getGaService().createText(diagram, gaContainer, value, fontName, fontSize);
 	}
@@ -557,7 +507,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int, boolean, boolean)
 	 */
-	@Override
 	public Text createText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize,
 			boolean isFontItalic, boolean isFontBold) {
 		return getGaService().createText(diagram, gaContainer, value, fontName, fontSize, isFontItalic, isFontBold);
@@ -570,7 +519,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createBoxRelativeAnchor
 	 * (org.eclipse.graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public BoxRelativeAnchor createBoxRelativeAnchor(AnchorContainer anchorContainer) {
 		return getPeService().createBoxRelativeAnchor(anchorContainer);
 	}
@@ -582,7 +530,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createChopboxAnchor(org
 	 * .eclipse.graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public ChopboxAnchor createChopboxAnchor(AnchorContainer anchorContainer) {
 		return getPeService().createChopboxAnchor(anchorContainer);
 	}
@@ -594,7 +541,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createConnectionDecorator
 	 * (org.eclipse.graphiti.mm.pictograms.Connection, boolean, double, boolean)
 	 */
-	@Override
 	public ConnectionDecorator createConnectionDecorator(Connection connection, boolean active, double location, boolean isRelative) {
 		return getPeService().createConnectionDecorator(connection, active, location, isRelative);
 	}
@@ -606,7 +552,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createContainerShape(org
 	 * .eclipse.graphiti.mm.pictograms.ContainerShape, boolean)
 	 */
-	@Override
 	public ContainerShape createContainerShape(ContainerShape parentContainerShape, boolean active) {
 		return getPeService().createContainerShape(parentContainerShape, active);
 	}
@@ -618,7 +563,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createDiagram(java.lang
 	 * .String, java.lang.String, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, boolean snap) {
 		return getPeService().createDiagram(diagramTypeId, diagramName, snap);
 	}
@@ -630,7 +574,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createDiagram(java.lang
 	 * .String, java.lang.String, int, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, int gridUnit, boolean snap) {
 		return getPeService().createDiagram(diagramTypeId, diagramName, gridUnit, snap);
 	}
@@ -642,7 +585,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createDiagram(java.lang
 	 * .String, java.lang.String, int, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, int horizontalGridUnit, int verticalGridUint, boolean snap) {
 		return getPeService().createDiagram(diagramTypeId, diagramName, horizontalGridUnit, verticalGridUint, snap);
 	}
@@ -654,7 +596,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createFixPointAnchor(org
 	 * .eclipse.graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public FixPointAnchor createFixPointAnchor(AnchorContainer anchorContainer) {
 		return getPeService().createFixPointAnchor(anchorContainer);
 	}
@@ -666,7 +607,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createFreeFormConnection
 	 * (org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public FreeFormConnection createFreeFormConnection(Diagram diagram) {
 		return getPeService().createFreeFormConnection(diagram);
 	}
@@ -678,7 +618,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createManhattanConnection
 	 * (org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public ManhattanConnection createManhattanConnection(Diagram diagram) {
 		return getPeService().createManhattanConnection(diagram);
 	}
@@ -690,7 +629,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createShape(org.eclipse
 	 * .graphiti.mm.pictograms.ContainerShape, boolean)
 	 */
-	@Override
 	public Shape createShape(ContainerShape parentContainerShape, boolean active) {
 		return getPeService().createShape(parentContainerShape, active);
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/EmfService.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/EmfService.java
index 112a96c..b67c96a 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/EmfService.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/EmfService.java
@@ -32,12 +32,10 @@
 
 	private WeakHashMap<Diagram, WeakReference<IDiagramTypeProvider>> diagToProvider = new WeakHashMap<Diagram, WeakReference<IDiagramTypeProvider>>();
 
-	@Override
 	public boolean isObjectAlive(EObject obj) {
 		return obj != null && obj.eResource() != null;
 	}
 
-	@Override
 	public IDiagramTypeProvider getDTPForDiagram(Diagram d) {
 		WeakReference<IDiagramTypeProvider> weakReference = diagToProvider.get(d);
 		if (weakReference == null || weakReference.get() == null) {
@@ -47,7 +45,6 @@
 		return weakReference.get();
 	}
 
-	@Override
 	public void wireDTPToDiagram(Diagram d, IDiagramTypeProvider provider) {
 		diagToProvider.put(d, new WeakReference<IDiagramTypeProvider>(provider));
 
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
index a2f3b0f..716cea6 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
@@ -377,7 +377,6 @@
 	 * calculateSizeOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm)
 	 */
-	@Override
 	public IDimension calculateSize(GraphicsAlgorithm ga) {
 		IDimension ret = null;
 		if (ga instanceof Polyline) {
@@ -396,7 +395,6 @@
 	 * calculateSizeOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public IDimension calculateSize(GraphicsAlgorithm ga, boolean considerLineWidth) {
 		IDimension ret = calculateSize(ga);
 		if (considerLineWidth) {
@@ -417,7 +415,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createDefaultMultiText
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public MultiText createDefaultMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer) {
 		return createDefaultMultiText(diagram, gaContainer, ""); //$NON-NLS-1$
 	}
@@ -430,7 +427,6 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public MultiText createDefaultMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value) {
 		return (MultiText) createText(diagram, gaContainer, true, value, true);
 	}
@@ -442,7 +438,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createDefaultText(org.
 	 * eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Text createDefaultText(Diagram diagram, GraphicsAlgorithmContainer gaContainer) {
 		return createDefaultText(diagram, gaContainer, ""); //$NON-NLS-1$
 	}
@@ -455,7 +450,6 @@
 	 * eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public Text createDefaultText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value) {
 		return (Text) createText(diagram, gaContainer, false, value, true);
 	}
@@ -467,7 +461,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createEllipse(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Ellipse createEllipse(GraphicsAlgorithmContainer gaContainer) {
 		Ellipse ret = AlgorithmsFactory.eINSTANCE.createEllipse();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -475,7 +468,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Ellipse createPlainEllipse(GraphicsAlgorithmContainer gaContainer) {
 		Ellipse ret = AlgorithmsFactory.eINSTANCE.createEllipse();
 		resetAll(ret);
@@ -490,7 +482,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createImage(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public Image createImage(GraphicsAlgorithmContainer gaContainer, String imageId) {
 		Image ret = AlgorithmsFactory.eINSTANCE.createImage();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -502,7 +493,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Image createPlainImage(GraphicsAlgorithmContainer gaContainer, String imageId) {
 		Image ret = AlgorithmsFactory.eINSTANCE.createImage();
 		resetAll(ret);
@@ -518,7 +508,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createInvisibleRectangle
 	 * (org.eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public Rectangle createInvisibleRectangle(PictogramElement pe) {
 		final Rectangle ret = createRectangle(pe);
 		if (GFPreferences.getInstance().areInvisibleRectanglesShown()) {
@@ -543,12 +532,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createMultiText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public MultiText createMultiText(GraphicsAlgorithmContainer gaContainer) {
 		return createMultiText(gaContainer, ""); //$NON-NLS-1$
 	}
 	
-	@Override
 	public MultiText createPlainMultiText(GraphicsAlgorithmContainer gaContainer) {
 		return createPlainMultiText(gaContainer, ""); //$NON-NLS-1$
 	}
@@ -560,12 +547,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createMultiText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public MultiText createMultiText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return (MultiText) createText(null, gaContainer, true, value, false);
 	}
 	
-	@Override
 	public MultiText createPlainMultiText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return (MultiText) createPlainText(null, gaContainer, true, value);
 	}
@@ -580,7 +565,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int)
 	 */
-	@Override
 	public MultiText createMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize) {
 		return createMultiText(diagram, gaContainer, value, fontName, fontSize, false, false);
 	}
@@ -594,7 +578,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int, boolean, boolean)
 	 */
-	@Override
 	public MultiText createMultiText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize,
 			boolean isFontItalic, boolean isFontBold) {
 		MultiText text = createMultiText(gaContainer, value);
@@ -611,7 +594,6 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer,
 	 * java.lang.String)
 	 */
-	@Override
 	public PlatformGraphicsAlgorithm createPlatformGraphicsAlgorithm(GraphicsAlgorithmContainer gaContainer, String id) {
 		PlatformGraphicsAlgorithm ret = AlgorithmsFactory.eINSTANCE.createPlatformGraphicsAlgorithm();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -620,7 +602,6 @@
 		return ret;
 	}
 	
-	@Override
 	public PlatformGraphicsAlgorithm createPlainPlatformGraphicsAlgorithm(GraphicsAlgorithmContainer gaContainer, String id) {
 		PlatformGraphicsAlgorithm ret = AlgorithmsFactory.eINSTANCE.createPlatformGraphicsAlgorithm();
 		resetAll(ret);
@@ -636,7 +617,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPoint(org.eclipse
 	 * .emf.ecore.EObject, int, int)
 	 */
-	@Override
 	public Point createPoint(int x, int y) {
 		return createPoint(x, y, 0, 0);
 	}
@@ -648,7 +628,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPoint(org.eclipse
 	 * .emf.ecore.EObject, int, int, int, int)
 	 */
-	@Override
 	public Point createPoint(int x, int y, int before, int after) {
 		// StructureFieldContainer<Point> container = new StructureFieldContainer<Point>();
 		// container.put(Point.DESCRIPTORS.X(), x);
@@ -670,7 +649,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPointList(org.eclipse
 	 * .emf.ecore.EObject, int[])
 	 */
-	@Override
 	public List<Point> createPointList(int[] xy) {
 		assert (xy != null && xy.length % 2 == 0);
 		List<Point> points = new ArrayList<Point>(xy.length / 2);
@@ -687,7 +665,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPointList(org.eclipse
 	 * .emf.ecore.EObject, int[], int[])
 	 */
-	@Override
 	public List<Point> createPointList(int[] xy, int beforeAfter[]) {
 		assert (xy != null && xy.length % 2 == 0);
 		assert (beforeAfter != null && beforeAfter.length == xy.length);
@@ -705,7 +682,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer) {
 		Polygon ret = AlgorithmsFactory.eINSTANCE.createPolygon();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -714,7 +690,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer) {
 		Polygon ret = AlgorithmsFactory.eINSTANCE.createPolygon();
 		resetAll(ret);
@@ -729,14 +704,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.util.Collection)
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		Polygon ret = createPolygon(gaContainer);
 		ret.getPoints().addAll(points);
 		return ret;
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		Polygon ret = createPlainPolygon(gaContainer);
 		ret.getPoints().addAll(points);
@@ -750,14 +723,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[])
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		List<Point> points = createPointList(xy);
 		Polygon ret = createPolygon(gaContainer, points);
 		return ret;
 	}
 	
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		List<Point> points = createPointList(xy);
 		Polygon ret = createPlainPolygon(gaContainer, points);
@@ -771,14 +742,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolygon(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[], int[])
 	 */
-	@Override
 	public Polygon createPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy, int beforeAfter[]) {
 		List<Point> points = createPointList(xy, beforeAfter);
 		Polygon ret = createPolygon(gaContainer, points);
 		return ret;
 	}
 
-	@Override
 	public Polygon createPlainPolygon(GraphicsAlgorithmContainer gaContainer, int[] xy, int beforeAfter[]) {
 		List<Point> points = createPointList(xy, beforeAfter);
 		Polygon ret = createPlainPolygon(gaContainer, points);
@@ -792,7 +761,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer) {
 		Polyline ret = AlgorithmsFactory.eINSTANCE.createPolyline();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -801,7 +769,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer) {
 		Polyline ret = AlgorithmsFactory.eINSTANCE.createPolyline();
 		resetAll(ret);
@@ -816,14 +783,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.util.Collection)
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		Polyline ret = createPolyline(gaContainer);
 		ret.getPoints().addAll(points);
 		return ret;
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, Collection<Point> points) {
 		Polyline ret = createPlainPolyline(gaContainer);
 		ret.getPoints().addAll(points);
@@ -837,14 +802,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[])
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		List<Point> points = createPointList(xy);
 		Polyline ret = createPolyline(gaContainer, points);
 		return ret;
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy) {
 		List<Point> points = createPointList(xy);
 		Polyline ret = createPlainPolyline(gaContainer, points);
@@ -858,14 +821,12 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createPolyline(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, int[], int[])
 	 */
-	@Override
 	public Polyline createPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy, int beforeAfter[]) {
 		List<Point> points = createPointList(xy, beforeAfter);
 		Polyline ret = createPolyline(gaContainer, points);
 		return ret;
 	}
 	
-	@Override
 	public Polyline createPlainPolyline(GraphicsAlgorithmContainer gaContainer, int[] xy, int beforeAfter[]) {
 		List<Point> points = createPointList(xy, beforeAfter);
 		Polyline ret = createPlainPolyline(gaContainer, points);
@@ -879,7 +840,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createRectangle(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Rectangle createRectangle(GraphicsAlgorithmContainer gaContainer) {
 		Rectangle ret = AlgorithmsFactory.eINSTANCE.createRectangle();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -887,7 +847,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Rectangle createPlainRectangle(GraphicsAlgorithmContainer gaContainer) {
 		Rectangle ret = AlgorithmsFactory.eINSTANCE.createRectangle();
 		resetAll(ret);
@@ -902,7 +861,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createRoundedRectangle
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithmContainer, int, int)
 	 */
-	@Override
 	public RoundedRectangle createRoundedRectangle(GraphicsAlgorithmContainer gaContainer, int cornerWidth, int cornerHeight) {
 		RoundedRectangle ret = AlgorithmsFactory.eINSTANCE.createRoundedRectangle();
 		setDefaultGraphicsAlgorithmValues(ret);
@@ -912,7 +870,6 @@
 		return ret;
 	}
 	
-	@Override
 	public RoundedRectangle createPlainRoundedRectangle(GraphicsAlgorithmContainer gaContainer, int cornerWidth, int cornerHeight) {
 		RoundedRectangle ret = AlgorithmsFactory.eINSTANCE.createRoundedRectangle();
 		resetAll(ret);
@@ -930,7 +887,6 @@
 	 * .eclipse.graphiti.mm.datatypes.Color, int,
 	 * org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public Color createShiftedColor(Color color, int shift, Diagram diagram) {
 		if (color == null) {
 			throw new IllegalArgumentException("color must not be null"); //$NON-NLS-1$
@@ -954,7 +910,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createShiftedColor(org
 	 * .eclipse.graphiti.util.IColorConstant, int)
 	 */
-	@Override
 	public IColorConstant createShiftedColor(IColorConstant colorConstant, int shift) {
 		int red = colorConstant.getRed();
 		int green = colorConstant.getGreen();
@@ -975,7 +930,6 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createStyle(org.eclipse
 	 * .graphiti.mm.pictograms.StyleContainer, java.lang.String)
 	 */
-	@Override
 	public Style createStyle(StyleContainer styleContainer, String id) {
 		Style ret = StylesFactory.eINSTANCE.createStyle();
 		ret.setId(id);
@@ -983,7 +937,6 @@
 		return ret;
 	}
 	
-	@Override
 	public Style createPlainStyle(StyleContainer styleContainer, String id) {
 		Style ret = StylesFactory.eINSTANCE.createStyle();
 		resetAll(ret);
@@ -999,12 +952,10 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer)
 	 */
-	@Override
 	public Text createText(GraphicsAlgorithmContainer gaContainer) {
 		return createText(gaContainer, ""); //$NON-NLS-1$
 	}
 	
-	@Override
 	public Text createPlainText(GraphicsAlgorithmContainer gaContainer) {
 		return createPlainText(gaContainer, ""); //$NON-NLS-1$
 	}
@@ -1035,7 +986,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int)
 	 */
-	@Override
 	public Text createText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize) {
 		return createText(diagram, gaContainer, value, fontName, fontSize, false, false);
 	}
@@ -1049,7 +999,6 @@
 	 * org.eclipse.graphiti.mm.GraphicsAlgorithmContainer, java.lang.String,
 	 * java.lang.String, int, boolean, boolean)
 	 */
-	@Override
 	public Text createText(Diagram diagram, GraphicsAlgorithmContainer gaContainer, String value, String fontName, int fontSize,
 			boolean isFontItalic, boolean isFontBold) {
 		Text text = createText(gaContainer, value);
@@ -1065,13 +1014,11 @@
 	 * org.eclipse.graphiti.services.IGaCreateService#createText(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithmContainer, java.lang.String)
 	 */
-	@Override
 	public Text createText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return (Text) createText(null, gaContainer, false, value, false);
 	}
 	
 
-	@Override
 	public Text createPlainText(GraphicsAlgorithmContainer gaContainer, String value) {
 		return (Text) createPlainText(null, gaContainer, false, value);
 	}
@@ -1083,18 +1030,15 @@
 	 * org.eclipse.graphiti.services.IGaService#deleteFont(org.eclipse.graphiti
 	 * .mm.pictograms.AbstractText)
 	 */
-	@Override
 	public void deleteFont(AbstractText abstractText) {
 		final Font oldFont = abstractText.getFont();
 		deleteEObject(oldFont);
 	}
 
-	@Override
 	public void deleteFont(Font font) {
 		deleteEObject(font);
 	}
 
-	@Override
 	public void deleteColor(Color color) {
 		deleteEObject(color);
 	}
@@ -1112,7 +1056,6 @@
 	 * org.eclipse.graphiti.services.IGaService#deleteRenderingStyle(org.eclipse
 	 * .graphiti.mm.pictograms.AbstractStyle)
 	 */
-	@Override
 	public void deleteRenderingStyle(AbstractStyle abstractStyle) {
 		// it is not sufficient to call abstractStyle.setRenderingStyle(null),
 		// because then the old RenderingStyle would be left as garbage in the
@@ -1127,7 +1070,6 @@
 	 * org.eclipse.graphiti.services.IGaService#findStyle(org.eclipse.graphiti
 	 * .mm.pictograms.StyleContainer, java.lang.String)
 	 */
-	@Override
 	public Style findStyle(StyleContainer styleContainer, String id) {
 		Collection<Style> styles = styleContainer.getStyles();
 		for (Style childStyle : styles) {
@@ -1149,7 +1091,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getAngle(org.eclipse.graphiti
 	 * .mm.pictograms.AbstractText, boolean)
 	 */
-	@Override
 	public int getAngle(AbstractText at, boolean checkStyles) {
 		Integer angle = at.getAngle();
 		if (angle == null) {
@@ -1174,7 +1115,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getBackgroundColor(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public Color getBackgroundColor(GraphicsAlgorithm ga, boolean checkStyles) {
 		Color bc = ga.getBackground();
 		if (bc == null) {
@@ -1199,7 +1139,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getFont(org.eclipse.graphiti
 	 * .mm.pictograms.AbstractText, boolean)
 	 */
-	@Override
 	public Font getFont(AbstractText at, boolean checkStyles) {
 		Font font = at.getFont();
 		if (font == null) {
@@ -1224,7 +1163,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getForegroundColor(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public Color getForegroundColor(GraphicsAlgorithm ga, boolean checkStyles) {
 		Color fc = ga.getForeground();
 		if (fc == null) {
@@ -1249,7 +1187,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getHorizontalAlignment(org.eclipse
 	 * .graphiti.mm.pictograms.AbstractText, boolean)
 	 */
-	@Override
 	public Orientation getHorizontalAlignment(AbstractText at, boolean checkStyles) {
 		Orientation ha = at.getHorizontalAlignment();
 		if (ha == Orientation.UNSPECIFIED) {
@@ -1274,7 +1211,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getLineStyle(org.eclipse.graphiti
 	 * .mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public LineStyle getLineStyle(GraphicsAlgorithm ga, boolean checkStyles) {
 		LineStyle ls = ga.getLineStyle();
 		if (ls == LineStyle.UNSPECIFIED) {
@@ -1299,7 +1235,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getLineWidth(org.eclipse.graphiti
 	 * .mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public int getLineWidth(GraphicsAlgorithm ga, boolean checkStyles) {
 		Integer lw = ga.getLineWidth();
 		if (lw == null) {
@@ -1324,7 +1259,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getRenderingStyle(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public RenderingStyle getRenderingStyle(GraphicsAlgorithm ga, boolean checkStyles) {
 		RenderingStyle rs = ga.getRenderingStyle();
 		if (rs == null) {
@@ -1349,7 +1283,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getTransparency(org.eclipse.
 	 * graphiti.mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public double getTransparency(GraphicsAlgorithm ga, boolean checkStyles) {
 		Double transparency = ga.getTransparency();
 		if (transparency == null) {
@@ -1374,7 +1307,6 @@
 	 * org.eclipse.graphiti.services.IGaService#getVerticalAlignment(org.eclipse
 	 * .graphiti.mm.pictograms.AbstractText, boolean)
 	 */
-	@Override
 	public Orientation getVerticalAlignment(AbstractText at, boolean checkStyles) {
 		Orientation va = at.getVerticalAlignment();
 		if (va == Orientation.UNSPECIFIED) {
@@ -1399,7 +1331,6 @@
 	 * org.eclipse.graphiti.services.IGaService#ResetAll(org.eclipse.graphiti
 	 * .mm.pictograms.AbstractStyle)
 	 */
-	@Override
 	public void resetAll(AbstractStyle abstractStyle) {
 		abstractStyle.setBackground(null);
 		// Boolean filled is set to unsettable (not to null)
@@ -1441,7 +1372,6 @@
 	 * org.eclipse.graphiti.services.IGaService#isFilled(org.eclipse.graphiti
 	 * .mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public boolean isFilled(GraphicsAlgorithm ga, boolean checkStyles) {
 		// Check if Boolean filled is unsettable
 		if (!ga.isSetFilled()) {
@@ -1466,7 +1396,6 @@
 	 * org.eclipse.graphiti.services.IGaService#isLineVisible(org.eclipse.graphiti
 	 * .mm.pictograms.GraphicsAlgorithm, boolean)
 	 */
-	@Override
 	public boolean isLineVisible(GraphicsAlgorithm ga, boolean checkStyles) {
 		// Check if Boolean lineVisible is unsettable
 		if (!ga.isSetLineVisible()) {
@@ -1491,7 +1420,6 @@
 	 * org.eclipse.graphiti.services.IGaService#isProportional(org.eclipse.graphiti
 	 * .mm.pictograms.Image, boolean)
 	 */
-	@Override
 	public boolean isProportional(Image image, boolean checkStyles) {
 		Boolean prop = image.getProportional();
 		if (prop == null) {
@@ -1516,7 +1444,6 @@
 	 * org.eclipse.graphiti.services.IGaService#isStretchH(org.eclipse.graphiti
 	 * .mm.pictograms.Image, boolean)
 	 */
-	@Override
 	public boolean isStretchH(Image image, boolean checkStyles) {
 		Boolean sh = image.getStretchH();
 		if (sh == null) {
@@ -1541,7 +1468,6 @@
 	 * org.eclipse.graphiti.services.IGaService#isStretchV(org.eclipse.graphiti
 	 * .mm.pictograms.Image, boolean)
 	 */
-	@Override
 	public boolean isStretchV(Image image, boolean checkStyles) {
 		Boolean sv = image.getStretchV();
 		if (sv == null) {
@@ -1566,7 +1492,6 @@
 	 * org.eclipse.graphiti.services.IGaService#manageColor(org.eclipse.graphiti
 	 * .mm.pictograms.Diagram, org.eclipse.graphiti.util.IColorConstant)
 	 */
-	@Override
 	public Color manageColor(Diagram diagram, IColorConstant colorConstant) {
 		return manageColor(diagram, colorConstant.getRed(), colorConstant.getGreen(), colorConstant.getBlue());
 	}
@@ -1578,7 +1503,6 @@
 	 * org.eclipse.graphiti.services.IGaService#manageColor(org.eclipse.graphiti
 	 * .mm.pictograms.Diagram, int, int, int)
 	 */
-	@Override
 	public Color manageColor(Diagram diagram, int red, int green, int blue) {
 		Collection<Color> colors = diagram.getColors();
 		for (Color existingColor : colors) {
@@ -1595,22 +1519,18 @@
 		return newColor;
 	}
 
-	@Override
 	public Font manageDefaultFont(Diagram diagram) {
 		return manageDefaultFont(diagram, false, false);
 	}
 
-	@Override
 	public Font manageDefaultFont(Diagram diagram, boolean isItalic, boolean isBold) {
 		return manageFont(diagram, DEFAULT_FONT, DEFAULT_FONT_SIZE, isItalic, isBold);
 	}
 
-	@Override
 	public Font manageFont(Diagram diagram, String name, int size) {
 		return manageFont(diagram, name, size, false, false);
 	}
 
-	@Override
 	public Font manageFont(Diagram diagram, String name, int size, boolean isItalic, boolean isBold) {
 		EList<Font> fonts = diagram.getFonts();
 		for (Font font : fonts) {
@@ -1633,7 +1553,6 @@
 	 * org.eclipse.graphiti.services.IGaService#movePolylinePoint(org.eclipse
 	 * .graphiti.mm.pictograms.Polyline, int, int, int)
 	 */
-	@Override
 	public void movePolylinePoint(Polyline polyline, int index, int deltaX, int deltaY) {
 		Point point = polyline.getPoints().get(index);
 		int oldX = point.getX();
@@ -1666,7 +1585,6 @@
 	 * org.eclipse.graphiti.services.IGaLayoutService#setHeightOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int)
 	 */
-	@Override
 	public void setHeight(GraphicsAlgorithm ga, int height) {
 		ga.setHeight(height);
 	}
@@ -1679,7 +1597,6 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int, int, int,
 	 * int)
 	 */
-	@Override
 	public void setLocationAndSize(GraphicsAlgorithm ga, int x, int y, int width, int height) {
 		setLocationAndSize(ga, x, y, width, height, false);
 	}
@@ -1692,7 +1609,6 @@
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int, int, int,
 	 * int, boolean)
 	 */
-	@Override
 	public void setLocationAndSize(GraphicsAlgorithm ga, int x, int y, int width, int height, boolean avoidNegativeCoordinates) {
 		setLocation(ga, x, y, avoidNegativeCoordinates);
 		setSize(ga, width, height);
@@ -1705,7 +1621,6 @@
 	 * org.eclipse.graphiti.services.IGaLayoutService#setLocationOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int, int)
 	 */
-	@Override
 	public void setLocation(GraphicsAlgorithm ga, int x, int y) {
 		setLocation(ga, x, y, false);
 	}
@@ -1717,7 +1632,6 @@
 	 * org.eclipse.graphiti.services.IGaLayoutService#setLocationOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int, int, boolean)
 	 */
-	@Override
 	public void setLocation(GraphicsAlgorithm ga, int x, int y, boolean avoidNegativeCoordinates) {
 
 		if (ga == null) {
@@ -1747,7 +1661,6 @@
 	 * org.eclipse.graphiti.services.IGaLayoutService#setSizeOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int, int)
 	 */
-	@Override
 	public void setSize(GraphicsAlgorithm ga, int width, int height) {
 		setWidth(ga, width);
 		setHeight(ga, height);
@@ -1760,7 +1673,6 @@
 	 * org.eclipse.graphiti.services.IGaLayoutService#setWidthOfGraphicsAlgorithm
 	 * (org.eclipse.graphiti.mm.pictograms.GraphicsAlgorithm, int)
 	 */
-	@Override
 	public void setWidth(GraphicsAlgorithm ga, int width) {
 		ga.setWidth(width);
 	}
@@ -1773,7 +1685,6 @@
 	 * .graphiti.mm.pictograms.AbstractStyle,
 	 * org.eclipse.graphiti.mm.pictograms.AdaptedGradientColoredAreas)
 	 */
-	@Override
 	public void setRenderingStyle(AbstractStyle abstractStyle, AdaptedGradientColoredAreas adaptedGradientColoredAreas) {
 		if (adaptedGradientColoredAreas != null && adaptedGradientColoredAreas.getAdaptedGradientColoredAreas() != null
 				&& !adaptedGradientColoredAreas.getAdaptedGradientColoredAreas().isEmpty()
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/LinkServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/LinkServiceImpl.java
index f208ad3..49b37c2 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/LinkServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/LinkServiceImpl.java
@@ -54,7 +54,6 @@
 	 * @return The business objects which are linked to the given pictogram
 	 *         element. Can be empty but not null.
 	 */
-	@Override
 	public EObject[] getAllBusinessObjectsForLinkedPictogramElement(PictogramElement pictogramElement) {
 		EObject[] ret = new EObject[0];
 		if (pictogramElement != null && GraphitiInternal.getEmfService().isObjectAlive(pictogramElement)) {
@@ -81,7 +80,6 @@
 	 * @return The first of possibly several business objects which are linked
 	 *         to the given pictogram element. Can be null.
 	 */
-	@Override
 	public EObject getBusinessObjectForLinkedPictogramElement(PictogramElement pictogramElement) {
 		EObject ret = null;
 		EObject eObject[] = getAllBusinessObjectsForLinkedPictogramElement(pictogramElement);
@@ -98,7 +96,6 @@
 	 *            the pictogram element
 	 * @return the pictogram link referencing the given pictogram element
 	 */
-	@Override
 	public PictogramLink getLinkForPictogramElement(PictogramElement pictogramElement) {
 		long start = System.currentTimeMillis();
 
@@ -141,7 +138,6 @@
 	 *            the diagram
 	 * @return the pictogram elements
 	 */
-	@Override
 	public List<PictogramElement> getPictogramElements(Diagram diagram, EObject eObject) {
 		List<PictogramElement> ret = new ArrayList<PictogramElement>();
 		if (eObject != null && GraphitiInternal.getEmfService().isObjectAlive(eObject)) {
@@ -174,7 +170,6 @@
 	 * @return all (active) pictogram elements in the diagram, which have at
 	 *         least one reference to one of the business objects
 	 */
-	@Override
 	public List<PictogramElement> getPictogramElements(Diagram diagram, List<EObject> eObjects, boolean onlyActive) {
 		List<PictogramElement> ret = new ArrayList<PictogramElement>();
 		if (diagram != null && eObjects != null && eObjects.size() > 0) {
@@ -207,7 +202,6 @@
 	 * @return true if link property exists and has the given value; false if
 	 *         not
 	 */
-	@Override
 	public boolean hasLinkProperty(PictogramElement pictogramElement, String propertyValue) {
 		boolean ret = false;
 		if (pictogramElement != null && propertyValue != null) {
@@ -231,7 +225,6 @@
 	 * @param propertyValue
 	 *            the new value for the link property
 	 */
-	@Override
 	public void setLinkProperty(PictogramElement pictogramElement, String propertyValue) {
 		Graphiti.getPeService().setPropertyValue(pictogramElement, KEY_LINK_PROPERTY, propertyValue);
 	}
@@ -243,7 +236,6 @@
 	 *            the pictogram element
 	 * @return the link property
 	 */
-	@Override
 	public Property getLinkProperty(PictogramElement pictogramElement) {
 		return Graphiti.getPeService().getProperty(pictogramElement, KEY_LINK_PROPERTY);
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java
index d252e56..808a271 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/MigrationServiceImpl.java
@@ -32,7 +32,6 @@
 
 public class MigrationServiceImpl implements IMigrationService {
 
-	@Override
 	public void migrate070To080(Diagram d) {
 
 		// Traverse model and collect fonts
@@ -68,7 +67,6 @@
 		}
 	}
 
-	@Override
 	public void migrate080To090(Diagram d) {
 		// Traverse model and and set unfilled texts to filled
 		Resource eResource = d.eResource();
@@ -84,7 +82,6 @@
 		}
 	}
 
-	@Override
 	public boolean shouldMigrate080To090(Diagram d) {
 		String version = d.getVersion();
 		if (version == null || version.length() == 0) {
@@ -110,7 +107,6 @@
 		}
 	}
 
-	@Override
 	public boolean shouldMigrate070To080(Diagram d) {
 		// Traverse model and collect fonts
 		HashSet<Font> fonts = new HashSet<Font>();
@@ -138,5 +134,4 @@
 		}
 		return false;
 	}
-
 }
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/PeServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/PeServiceImpl.java
index 5e587e5..7f000ca 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/PeServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/PeServiceImpl.java
@@ -87,7 +87,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createBoxRelativeAnchor(org.
 	 * eclipse.graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public BoxRelativeAnchor createBoxRelativeAnchor(AnchorContainer anchorContainer) {
 
 		BoxRelativeAnchor ret = PictogramsFactory.eINSTANCE.createBoxRelativeAnchor();
@@ -106,7 +105,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createChopboxAnchor(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public ChopboxAnchor createChopboxAnchor(AnchorContainer anchorContainer) {
 
 		ChopboxAnchor ret = PictogramsFactory.eINSTANCE.createChopboxAnchor();
@@ -123,7 +121,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createConnectionDecorator(org
 	 * .eclipse.graphiti.mm.pictograms.Connection, boolean, double, boolean)
 	 */
-	@Override
 	public ConnectionDecorator createConnectionDecorator(Connection connection, boolean active, double location, boolean isRelative) {
 		ConnectionDecorator ret = PictogramsFactory.eINSTANCE.createConnectionDecorator();
 		ret.setActive(active);
@@ -141,7 +138,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createContainerShape(org.eclipse
 	 * .graphiti.mm.pictograms.ContainerShape, boolean)
 	 */
-	@Override
 	public ContainerShape createContainerShape(ContainerShape parentContainerShape, boolean active) {
 		ContainerShape ret = PictogramsFactory.eINSTANCE.createContainerShape();
 		ret.getProperties().addAll(EMPTY_PROPERTIES_LIST);
@@ -158,7 +154,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createDiagram(java.lang.String,
 	 * java.lang.String, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, boolean snap) {
 		return createDiagram(diagramTypeId, diagramName, LookManager.getLook().getMinorGridLineDistance(), snap);
 	}
@@ -170,7 +165,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createDiagram(java.lang.String,
 	 * java.lang.String, int, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, int gridUnit, boolean snap) {
 		// Reduce file footprint: use default -1 to avoid storing of verticalGridUnit attribute
 		return createDiagram(diagramTypeId, diagramName, gridUnit, -1, snap);
@@ -183,7 +177,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createDiagram(java.lang.String,
 	 * java.lang.String, int, boolean)
 	 */
-	@Override
 	public Diagram createDiagram(String diagramTypeId, String diagramName, int horizontalGridUnit, int verticalGridUnit, boolean snap) {
 
 		if (diagramTypeId == null || diagramName == null) {
@@ -221,7 +214,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createFixPointAnchor(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public FixPointAnchor createFixPointAnchor(AnchorContainer anchorContainer) {
 		FixPointAnchor ret = PictogramsFactory.eINSTANCE.createFixPointAnchor();
 		ret.setVisible(true);
@@ -237,7 +229,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createFreeFormConnection(org
 	 * .eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public FreeFormConnection createFreeFormConnection(Diagram diagram) {
 		FreeFormConnection ret = PictogramsFactory.eINSTANCE.createFreeFormConnection();
 		ret.setVisible(true);
@@ -253,7 +244,6 @@
 	 * org.eclipse.graphiti.services.IPeCreateService#createManhattanConnection
 	 * (org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public ManhattanConnection createManhattanConnection(Diagram diagram) {
 		ManhattanConnection ret = PictogramsFactory.eINSTANCE.createManhattanConnection();
 		ret.setVisible(true);
@@ -269,7 +259,6 @@
 	 * org.eclipse.graphiti.services.IPeService#createShape(org.eclipse.graphiti
 	 * .mm.pictograms.ContainerShape, boolean)
 	 */
-	@Override
 	public Shape createShape(ContainerShape parentContainerShape, boolean active) {
 		Shape ret = PictogramsFactory.eINSTANCE.createShape();
 		ret.getProperties().addAll(EMPTY_PROPERTIES_LIST);
@@ -287,7 +276,6 @@
 	 * org.eclipse.graphiti.services.IPeService#deletePictogramElement(org.eclipse
 	 * .graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public void deletePictogramElement(PictogramElement pe) {
 		if (pe instanceof ContainerShape) {
 			ContainerShape cs = (ContainerShape) pe;
@@ -329,7 +317,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getActiveContainerPe(org.eclipse
 	 * .graphiti.mm.pictograms.GraphicsAlgorithm)
 	 */
-	@Override
 	public PictogramElement getActiveContainerPe(GraphicsAlgorithm ga) {
 		if (ga == null) {
 			throw new IllegalArgumentException("Parameter must not be null"); //$NON-NLS-1$
@@ -357,7 +344,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getActiveContainerPe(org.eclipse
 	 * .graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public PictogramElement getActiveContainerPe(PictogramElement pictogramElement) {
 		PictogramElement pe = getPictogramElementParent(pictogramElement);
 		while ((pe != null) && !pe.isActive()) {
@@ -373,7 +359,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getAllConnections(org.eclipse
 	 * .graphiti.mm.pictograms.Anchor)
 	 */
-	@Override
 	public List<Connection> getAllConnections(Anchor anchor) {
 		List<Connection> connections = new ArrayList<Connection>();
 		connections.addAll(anchor.getIncomingConnections());
@@ -388,7 +373,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getAllConnections(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public List<Connection> getAllConnections(AnchorContainer anchorContainer) {
 		List<Connection> connections = new ArrayList<Connection>();
 		Collection<Anchor> anchors = anchorContainer.getAnchors();
@@ -406,7 +390,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getAllContainedPictogramElements
 	 * (org.eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public Collection<PictogramElement> getAllContainedPictogramElements(PictogramElement pe) {
 		List<PictogramElement> ret = new ArrayList<PictogramElement>();
 		Collection<PictogramElement> peChildren = getPictogramElementChildren(pe);
@@ -424,7 +407,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getAllContainedShapes(org.eclipse
 	 * .graphiti.mm.pictograms.ContainerShape)
 	 */
-	@Override
 	public Collection<Shape> getAllContainedShapes(ContainerShape cs) {
 		ArrayList<Shape> ret = new ArrayList<Shape>();
 		Collection<Shape> children = cs.getChildren();
@@ -445,7 +427,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getChopboxAnchor(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public Anchor getChopboxAnchor(AnchorContainer anchorContainer) {
 		Collection<Anchor> existingAnchors = anchorContainer.getAnchors();
 		for (Anchor anchor : existingAnchors) {
@@ -488,7 +469,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getConnectionMidpoint(org.eclipse
 	 * .graphiti.mm.pictograms.Connection, double)
 	 */
-	@Override
 	public ILocation getConnectionMidpoint(Connection c, double d) {
 		ILocation ret = null;
 
@@ -598,7 +578,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getDiagramForAnchor(org.eclipse
 	 * .graphiti.mm.pictograms.Anchor)
 	 */
-	@Override
 	public Diagram getDiagramForAnchor(Anchor anchor) {
 		Diagram ret = null;
 		AnchorContainer ac = anchor.getParent();
@@ -619,7 +598,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getDiagramForPictogramElement
 	 * (org.eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public Diagram getDiagramForPictogramElement(PictogramElement pe) {
 		Diagram ret = null;
 		if (pe instanceof Diagram) {
@@ -643,7 +621,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getDiagramForShape(org.eclipse
 	 * .graphiti.mm.pictograms.Shape)
 	 */
-	@Override
 	public Diagram getDiagramForShape(Shape shape) {
 		Diagram ret = null;
 		if (shape instanceof Diagram) {
@@ -680,7 +657,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getElementsNotInDiagram(org.
 	 * eclipse.emf.ecore.EObject[], org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public EObject[] getElementsNotInDiagram(EObject[] elements, Diagram diagram) {
 		final String SIGNATURE = "getElementsNotInDiagram(EObject[] elements, Diagram diag)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -788,7 +764,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getGaBoundsForAnchor(org.eclipse
 	 * .graphiti.mm.pictograms.Anchor)
 	 */
-	@Override
 	public IRectangle getGaBoundsForAnchor(Anchor anchor) {
 		IRectangle ret = new RectangleImpl(0, 0);
 
@@ -854,7 +829,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getIncomingConnections(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public List<Connection> getIncomingConnections(AnchorContainer anchorContainer) {
 		List<Connection> connections = new ArrayList<Connection>();
 		Collection<Anchor> anchors = anchorContainer.getAnchors();
@@ -872,7 +846,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getLinkedPictogramElements(org
 	 * .eclipse.emf.ecore.EObject[], org.eclipse.graphiti.mm.pictograms.Diagram)
 	 */
-	@Override
 	public Object[] getLinkedPictogramElements(EObject[] elements, Diagram diagram) {
 		final String SIGNATURE = "getLinkedPictogramElements(EObject[] elements, Diagram diag)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -918,7 +891,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getLocationInfo(org.eclipse.
 	 * graphiti.mm.pictograms.Shape, int, int)
 	 */
-	@Override
 	public ILocationInfo getLocationInfo(Shape shape, int x, int y) {
 		if (shape instanceof ContainerShape) {
 			ContainerShape containerShape = (ContainerShape) shape;
@@ -951,7 +923,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getLocationRelativeToDiagram
 	 * (org.eclipse.graphiti.mm.pictograms.Anchor)
 	 */
-	@Override
 	public ILocation getLocationRelativeToDiagram(Anchor anchor) {
 		int x = getRelativeToDiagramX(anchor);
 		int y = getRelativeToDiagramY(anchor);
@@ -966,7 +937,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getLocationRelativeToDiagram
 	 * (org.eclipse.graphiti.mm.pictograms.Shape)
 	 */
-	@Override
 	public ILocation getLocationRelativeToDiagram(Shape shape) {
 		int x = getRelativeToDiagramX(shape);
 		int y = getRelativeToDiagramY(shape);
@@ -987,7 +957,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getOutgoingConnections(org.eclipse
 	 * .graphiti.mm.pictograms.AnchorContainer)
 	 */
-	@Override
 	public List<Connection> getOutgoingConnections(AnchorContainer anchorContainer) {
 		List<Connection> connections = new ArrayList<Connection>();
 		Collection<Anchor> anchors = anchorContainer.getAnchors();
@@ -1005,7 +974,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getPictogramElementChildren(
 	 * org.eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public Collection<PictogramElement> getPictogramElementChildren(PictogramElement pe) {
 		List<PictogramElement> retList = new ArrayList<PictogramElement>();
 
@@ -1036,7 +1004,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getPictogramElementParent(org
 	 * .eclipse.graphiti.mm.pictograms.PictogramElement)
 	 */
-	@Override
 	public PictogramElement getPictogramElementParent(PictogramElement pe) {
 		if (pe instanceof ConnectionDecorator) {
 			return ((ConnectionDecorator) pe).getConnection();
@@ -1058,7 +1025,6 @@
 	 * org.eclipse.graphiti.services.IPeService#getProperty(org.eclipse.graphiti
 	 * .mm.pictograms.PropertyContainer, java.lang.String)
 	 */
-	@Override
 	public Property getProperty(PropertyContainer propertyContainer, String key) {
 		if (propertyContainer == null || key == null || !GraphitiInternal.getEmfService().isObjectAlive(propertyContainer)) {
 			return null;
@@ -1073,7 +1039,6 @@
 		return null;
 	}
 
-	@Override
 	public String getPropertyValue(PropertyContainer propertyContainer, String key) {
 		Property property = getProperty(propertyContainer, key);
 		if (property != null) {
@@ -1253,7 +1218,6 @@
 	 * org.eclipse.graphiti.services.IPeService#moveBendpoints(org.eclipse.graphiti
 	 * .ei.IExecutionInfo)
 	 */
-	@Override
 	public void moveBendpoints(IExecutionInfo executionInfo) {
 		Set<FreeFormConnection> connections = new HashSet<FreeFormConnection>();
 		Set<AnchorContainer> anchorContainers = new HashSet<AnchorContainer>();
@@ -1335,7 +1299,6 @@
 	 * org.eclipse.graphiti.services.IPeService#removeProperty(org.eclipse.graphiti
 	 * .mm.pictograms.PropertyContainer, java.lang.String)
 	 */
-	@Override
 	public boolean removeProperty(PropertyContainer propertyContainer, String key) {
 		Property property = getProperty(propertyContainer, key);
 		if (property != null) {
@@ -1352,7 +1315,6 @@
 	 * org.eclipse.graphiti.services.IPeService#sendToBack(org.eclipse.graphiti
 	 * .mm.pictograms.Shape)
 	 */
-	@Override
 	public void sendToBack(Shape shape) {
 		ContainerShape parentContainerShape = shape.getContainer();
 		List<Shape> brotherAndSisterList = parentContainerShape.getChildren();
@@ -1367,7 +1329,6 @@
 	 * org.eclipse.graphiti.services.IPeService#sendToFront(org.eclipse.graphiti
 	 * .mm.pictograms.Shape)
 	 */
-	@Override
 	public void sendToFront(Shape shape) {
 		ContainerShape parentContainerShape = shape.getContainer();
 		List<Shape> brotherAndSisterList = parentContainerShape.getChildren();
@@ -1375,7 +1336,6 @@
 		brotherAndSisterList.add(shape);
 	}
 
-	@Override
 	public void setPropertyValue(PropertyContainer propertyContainer, String key, String value) {
 		if (propertyContainer == null) {
 			throw new InvalidParameterException("propertyContainer must not be null"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DefaultLook.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DefaultLook.java
index 4204aae..c3e162e 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DefaultLook.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DefaultLook.java
@@ -44,7 +44,6 @@
 		return fieldErrorBackgroundColor;
 	}
 
-	@Override
 	public IColorConstant getFieldErrorForegroundColor() {
 		if (fieldErrorForegroundColor == null) {
 			fieldErrorForegroundColor = new ColorConstant("B00017"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DynamicLook.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DynamicLook.java
index 5746c02..f9057e7 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DynamicLook.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/util/DynamicLook.java
@@ -33,7 +33,6 @@
 		return randomColorConstant();
 	}
 
-	@Override
 	public IColorConstant getFieldErrorForegroundColor() {
 		return randomColorConstant();
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultContextButtonPadData.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultContextButtonPadData.java
index 97a845f..9d95e1b 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultContextButtonPadData.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultContextButtonPadData.java
@@ -53,27 +53,22 @@
 		this.location = new RectangleImpl(0, 0, 0, 0);
 	}
 
-	@Override
 	public List<IContextButtonEntry> getGenericContextButtons() {
 		return this.genericContextButtons;
 	}
 
-	@Override
 	public List<IContextButtonEntry> getDomainSpecificContextButtons() {
 		return this.domainSpecificContextButtons;
 	}
 
-	@Override
 	public IContextButtonEntry getCollapseContextButton() {
 		return this.collapseContextButton;
 	}
 
-	@Override
 	public void setCollapseContextButton(IContextButtonEntry collapseContextButton) {
 		this.collapseContextButton = collapseContextButton;
 	}
 
-	@Override
 	public IRectangle getPadLocation() {
 		return this.location;
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultToolBehaviorProvider.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultToolBehaviorProvider.java
index 3950c3e..a8d6be0 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultToolBehaviorProvider.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/DefaultToolBehaviorProvider.java
@@ -103,28 +103,23 @@
 		setDiagramTypeProvider(diagramTypeProvider);
 	}
 
-	@Override
 	public void dispose() {
 	}
 
-	@Override
 	public Object getAdapter(Class<?> type) {
 		return null;
 	}
 
-	@Override
 	public PictogramElement getSelection(PictogramElement originalPe, PictogramElement[] oldSelection) {
 		return null;
 	}
 
-	@Override
 	public ISelectionInfo getSelectionInfoForConnection(Connection connection) {
 		ISelectionInfo si = new SelectionInfoImpl(IColorConstant.CONNECTION_SELECTION_FG, IColorConstant.HANDLE_FG,
 				IColorConstant.HANDLE_BG, LineStyle.DASH);
 		return si;
 	}
 
-	@Override
 	public IContextButtonPadData getContextButtonPad(IPictogramElementContext context) {
 		final String SIGNATURE = "getContextButtonPadData(IPictogramElementContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -244,7 +239,6 @@
 		return ret;
 	}
 
-	@Override
 	public IContextMenuEntry[] getContextMenu(ICustomContext context) {
 		final String SIGNATURE = "getContextMenu(IContext)"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -267,12 +261,10 @@
 		return ret;
 	}
 
-	@Override
 	public ILocationInfo getLocationInfo(PictogramElement pe, ILocationInfo locationInfo) {
 		return locationInfo;
 	}
 
-	@Override
 	public ICustomFeature getDoubleClickFeature(IDoubleClickContext context) {
 		return null;
 	}
@@ -283,7 +275,6 @@
 	 * 
 	 * @return the palette entries
 	 */
-	@Override
 	public IPaletteCompartmentEntry[] getPalette() {
 		final String SIGNATURE = "getPaletteCompartments()"; //$NON-NLS-1$
 		boolean info = T.racer().info();
@@ -340,19 +331,16 @@
 		return res;
 	}
 
-	@Override
 	public IDecorator[] getDecorators(PictogramElement pe) {
 		return NO_RENDERING_DECORATORS;
 	}
 
-	@Override
 	public ISelectionInfo getSelectionInfoForShape(Shape shape) {
 		ISelectionInfo si = new SelectionInfoImpl(IColorConstant.SHAPE_SELECTION_FG, IColorConstant.HANDLE_FG, IColorConstant.HANDLE_BG,
 				LineStyle.DASH);
 		return si;
 	}
 
-	@Override
 	public double[] getZoomLevels() {
 		return ZOOM_LEVELS;
 	}
@@ -362,7 +350,6 @@
 	 *             195527 and can be harmed by GEF modifications. It will be
 	 *             removed then
 	 */
-	@Override
 	@Deprecated
 	public DiagramScrollingBehavior getDiagramScrollingBehavior() {
 		return DiagramScrollingBehavior.GEF_DEFAULT;
@@ -390,25 +377,20 @@
 		return getDiagramTypeProvider().getFeatureProvider();
 	}
 
-	@Override
 	public void preExecute(IExecutionInfo executionInfo) {
 	}
 
-	@Override
 	public void postExecute(IExecutionInfo executionInfo) {
 	}
 
-	@Override
 	public String getToolTip(GraphicsAlgorithm ga) {
 		return null;
 	}
 
-	@Override
 	public GraphicsAlgorithm getSelectionBorder(PictogramElement pe) {
 		return null;
 	}
 
-	@Override
 	public GraphicsAlgorithm[] getClickArea(PictogramElement pe) {
 		GraphicsAlgorithm graphicsAlgorithm = pe.getGraphicsAlgorithm();
 		if (graphicsAlgorithm != null) {
@@ -417,27 +399,22 @@
 		return new GraphicsAlgorithm[0];
 	}
 
-	@Override
 	public GraphicsAlgorithm getChopboxAnchorArea(PictogramElement pe) {
 		return pe.getGraphicsAlgorithm();
 	}
 
-	@Override
 	public String getTitleToolTip() {
 		return null;
 	}
 
-	@Override
 	public boolean isShowGuides() {
 		return true;
 	}
 
-	@Override
 	public GraphicsAlgorithm getContentArea(ContainerShape cs) {
 		return null;
 	}
 
-	@Override
 	public String getContributorId() {
 		String diagramTypeId = getDiagramTypeProvider().getDiagram().getDiagramTypeId();
 		return diagramTypeId + DIAGRAM_PROPERTY_CONTRIBUTOR_SUFFIX;
@@ -447,12 +424,10 @@
 		return true;
 	}
 
-	@Override
 	public boolean isMultiSelectionEnabled() {
 		return true;
 	}
 
-	@Override
 	public boolean isConnectionSelectionEnabled() {
 		return true;
 	}
@@ -461,7 +436,6 @@
 	 * Default Implementation. Customers requested the possibility to plug in
 	 * equality decision based on object identity.
 	 */
-	@Override
 	public boolean equalsBusinessObjects(Object o1, Object o2) {
 		if (o1 instanceof EObject && o2 instanceof EObject) {
 			return EcoreUtil.equals((EObject) o1, (EObject) o2);
@@ -474,7 +448,6 @@
 	/**
 	 * @since 0.9
 	 */
-	@Override
 	public boolean isShowFlyoutPalette() {
 		return true;
 	}
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/SelectionInfoImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/SelectionInfoImpl.java
index 7702532..25f4797 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/SelectionInfoImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/tb/SelectionInfoImpl.java
@@ -88,90 +88,73 @@
 	public SelectionInfoImpl() {
 	}
 
-	@Override
 	public IColorConstant getColor() {
 		return this.color;
 	}
 
-	@Override
 	public IColorConstant getHandleForegroundColor() {
 		return this.handleForegroundColor;
 	}
 
-	@Override
 	public void setHandleForegroundColor(IColorConstant handleForegroundColor) {
 		this.handleForegroundColor = handleForegroundColor;
 	}
 
-	@Override
 	public IColorConstant getHandleBackgroundColor() {
 		return this.handleBackgroundColor;
 	}
 
-	@Override
 	public void setHandleBackgroundColor(IColorConstant handleBackgroundColor) {
 		this.handleBackgroundColor = handleBackgroundColor;
 	}
 
-	@Override
 	public LineStyle getLineStyle() {
 		return this.lineStyle;
 	}
 
-	@Override
 	public void setLineStyle(LineStyle lineStyle) {
 		this.lineStyle = lineStyle;
 	}
 
-	@Override
 	public void setColor(IColorConstant color) {
 		this.color = color;
 	}
 
-	@Override
 	public IColorConstant getHoverColor() {
 		return this.hoverColor;
 	}
 
-	@Override
 	public void setLineStyle(IColorConstant color) {
 
 	}
 
-	@Override
 	public void setHoverColor(IColorConstant hoverColor) {
 		this.hoverColor = hoverColor;
 
 	}
 
-	@Override
 	public IColorConstant getHoverColorParentSelected() {
 		return this.hoverColorParentSelected;
 	}
 
-	@Override
 	public void setHoverColorParentSelected(IColorConstant hoverColor) {
 		this.hoverColorParentSelected = hoverColor;
 
 	}
 
-	@Override
 	public IColorConstant getPrimarySelectionBackGroundColor() {
 		return this.primarySelectionBackgroundColor;
 	}
 
-	@Override
 	public IColorConstant getSecondarySelectionBackGroundColor() {
 		return this.secondarySelectionBackgroundColor;
 
 	}
 
-	@Override
 	public void setPrimarySelectionBackgroundColor(IColorConstant color) {
 		this.primarySelectionBackgroundColor = color;
 	}
 
-	@Override
 	public void setSecondarySelectionBackgroundColor(IColorConstant color) {
 		this.secondarySelectionBackgroundColor = color;
 	}
diff --git a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.core.prefs
index 7c3505b..d440037 100644
--- a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:27:04 CEST 2011

+#Wed Nov 09 14:43:46 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.launching.prefs
index 93ef902..2b49e7b 100644
--- a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.launching.prefs
+++ b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:04 CEST 2011

+#Wed Nov 09 14:43:46 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.pde.api.tools.prefs
index 43edf63..95f1d1a 100644
--- a/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ b/tests/org.eclipse.graphiti.bot.tests/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:56:29 CEST 2011

+#Wed Nov 09 14:39:41 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoDiagramEditor.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoDiagramEditor.java
index 955e8fe..26c55ad 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoDiagramEditor.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoDiagramEditor.java
@@ -40,7 +40,6 @@
 	

 	public boolean isVisible() {

 		return syncExec(new Result<Boolean>() {

-			@Override

 			public Boolean run() {

 				Widget widget = getGefEditor().getWidget();

 				if (widget == null)

@@ -53,8 +52,6 @@
 	public void dirtify() {

 		final DiagramEditor diagramEditor = getActiveDiagramEditor();

 		AbstractGFTests.executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {

-			

-			@Override

 			public void run() {

 				ContainerShape cs1 = Graphiti.getPeService()

 						.createContainerShape(diagramEditor.getDiagramTypeProvider().getDiagram(), true);

@@ -143,8 +140,6 @@
 

 	public void drag(final int fromXPosition, final int fromYPosition, final int toXPosition, final int toYPosition){

 		syncExec(new VoidResult() {

-			

-			@Override

 			public void run() {

 				getGefEditor().drag(fromXPosition, fromYPosition, toXPosition, toYPosition);

 				

@@ -154,8 +149,6 @@
 	

 	public void drag(final String label, final int toXPosition, final int toYPosition){

 		syncExec(new VoidResult() {

-			

-			@Override

 			public void run() {

 				getGefEditor().drag(label, toXPosition, toYPosition);

 				

diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoWorkbenchPage.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoWorkbenchPage.java
index b9f5a20..2c47d38 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoWorkbenchPage.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/pageobjects/PoWorkbenchPage.java
@@ -1,7 +1,11 @@
 package org.eclipse.graphiti.bot.pageobjects;

 

-import java.awt.AWTException;

+import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertTrue;

+import static org.junit.Assert.fail;

 

+import java.awt.AWTException;

 import java.awt.Robot;

 

 import org.eclipse.core.resources.IFile;

@@ -27,10 +31,6 @@
 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.ide.IDE;

-import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

 

 /**

  * Encapsulates SWTBot for operations on the active workbench page.

@@ -50,7 +50,6 @@
 	

 	public int openDiagramEditorFromFile(final IFile diagFile) {

 		return syncExec(new IntResult() {

-			@Override

 			public Integer run() {

 				try {

 					IEditorPart ed = IDE.openEditor(getWorkbenchPage(), diagFile, org.eclipse.graphiti.ui.editor.DiagramEditor.DIAGRAM_EDITOR_ID);

@@ -68,7 +67,6 @@
 		assertNotNull(resource);

 

 		return syncExec(new IntResult() {

-			@Override

 			public Integer run() {

 				IWorkbenchPage page = getWorkbenchPage();

 				try {

@@ -92,7 +90,6 @@
 	public void shutdownEditor(final SWTBotGefEditor diagramEditor) {

 		// Close popups.

 		syncExec(new VoidResult() {

-			@Override

 			public void run() {

 				// Using SWTBot yields an exception since a keyboard layout file for DE is not available.

 				//				bot.activeShell().pressShortcut(SWT.NONE, SWT.ESC);

@@ -111,7 +108,6 @@
 	public void shutdownEditor(final DiagramEditor diagramEditor) {

 		// Close popups.

 		syncExec(new VoidResult() {

-			@Override

 			public void run() {

 				// Using SWTBot yields an exception since a keyboard layout file for DE is not available.

 				//				bot.activeShell().pressShortcut(SWT.NONE, SWT.ESC);

@@ -130,7 +126,6 @@
 	

 	public void closeAllEditors() {

 		syncExec(new VoidResult() {

-			@Override

 			public void run() {

 				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

 				page.closeAllEditors(false);

@@ -145,7 +140,6 @@
 

 	public void openGraphitiTestPerspective() {

 		syncExec(new VoidResult() {

-			@Override

 			public void run() {

 				SWTBotPerspective p = bot.perspectiveById("org.eclipse.graphiti.examples.common.perspective.GFPerspective");

 				p.activate();

diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
index 1dc590b..512eaba 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
@@ -136,7 +136,6 @@
 	
 	public static void executeInRecordingCommandInUIThread(final IDiagramEditor diagramEditor, final Runnable run){
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				executeInRecordingCommand(diagramEditor, run);
 			}
@@ -264,7 +263,6 @@
 
 	protected DiagramEditor openDiagram(final String type) {
 		DiagramEditor diagramEditor = syncExec(new Result<DiagramEditor>() {
-			@Override
 			public DiagramEditor run() {
 
 				/**/
@@ -304,7 +302,6 @@
 		// exceptions
 		// see http://www.eclipse.org/forums/index.php?t=msg&goto=484090&
 		UIThreadRunnable.syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().forceActive();
 			}
@@ -422,12 +419,10 @@
 
 	protected void createClassesAndConnection(final int x, final int y, final IDiagramTypeProvider diagramTypeProvider, final String toolToActivate, final String shapename) {
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramTypeProvider.getDiagramEditor(), new Runnable() {
-					@Override
 					public void run() {
 						addClassesAndReferenceToDiagram(fp, currentDiagram, x, y, shapename, x, y + 300, "ConnectionDecorator");
 					}
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFDialogTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFDialogTests.java
index becb6f2..bc638b5 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFDialogTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFDialogTests.java
@@ -46,7 +46,6 @@
 		final boolean[] enabled = new boolean[1];
 		final CountDownLatch signal = new CountDownLatch(1);
 		asyncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -82,7 +81,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		asyncExec(new VoidResult() {
-			@Override
 			public void run() {
 				GraphitiUiInternal.getUiService().startSaveAsImageDialog(diagramEditor.getGraphicalViewer());
 			}
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFInteractionComponentTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFInteractionComponentTests.java
index 1f17674..b9dab1b 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFInteractionComponentTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFInteractionComponentTests.java
@@ -99,7 +99,6 @@
 		createClassesAndConnection(x, y, diagramEditor.getDiagramTypeProvider(), null, SHAPE_NAME);
 		Thread.sleep(DELAY);
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().drag(SHAPE_NAME, 200, 50);
 				ed.getGefEditor().drag("ConnectionDecorator", 200, 400);
@@ -132,7 +131,6 @@
 		Thread.sleep(DELAY);
 		// Select the newly added shapes with the marquee tool.
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.drag(x - 10, y - 10, x + SHORT_DELAY, y + SHORT_DELAY);
 			}
@@ -140,7 +138,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().activateTool("Select");
 				ed.getGefEditor().drag(x + 50, y + 50, x + 200, y + 50);
@@ -159,14 +156,12 @@
 		final int y = 100;
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_ECORE);
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// find diagram
 				IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						// add a class to the diagram
 						addClassToDiagram(fp, currentDiagram, x, y, SHAPE_NAME);
@@ -177,7 +172,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// move class-shape to origin
 				ed.getGefEditor().drag(SHAPE_NAME, -100, -100);
@@ -186,7 +180,6 @@
 		Thread.sleep(SHORT_DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// get instance of GFFigureCanvas
 				GFFigureCanvas gfFigureCanvas = ed.getGFCanvas();
@@ -216,7 +209,6 @@
 		Thread.sleep(SHORT_DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				Event event = new Event();
 				event.type = SWT.KeyDown;
@@ -229,7 +221,6 @@
 		Thread.sleep(SHORT_DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				Event event = new Event();
 				event.type = SWT.KeyDown;
@@ -242,7 +233,6 @@
 		Thread.sleep(SHORT_DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				GFFigureCanvas gfFigureCanvas = ed.getGFCanvas();
 				// regain space
@@ -263,14 +253,12 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_ECORE);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// find diagram
 				IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						// add a class to the diagram
 						addClassToDiagram(fp, currentDiagram, x, y, SHAPE_NAME);
@@ -283,7 +271,6 @@
 		ed.drag(SHAPE_NAME, 0, 0);
 		Thread.sleep(DELAY);
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// get instance of GFFigureCanvas
 				GFFigureCanvas gfFigureCanvas = ed.getGFCanvas();
@@ -302,7 +289,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				Point p = ed.getOrigin();
 				Display display = GraphitiUiInternal.getWorkbenchService().getShell().getDisplay();
@@ -339,13 +325,11 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_ECORE);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						addClassToDiagram(fp, currentDiagram, x, y, SHAPE_NAME);
 					}
@@ -355,7 +339,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				Robot r;
 				try {
@@ -370,7 +353,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				try {
 					final Robot robot = new Robot();
@@ -390,7 +372,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				try {
 					final Robot robot = new Robot();
@@ -411,7 +392,6 @@
 		});
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				try {
 					final Robot robot = new Robot();
@@ -451,7 +431,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -492,7 +471,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().activateTool("free");
 				ed.getGefEditor().drag(xOfShape1 + DIL, yOfShape1 + DIL, xOfShape3 + DIL, yOfShape3 + DIL);
@@ -505,7 +483,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().activateTool("Rectangle");
 				// click on connection to insert rectangle between two other rectangles
@@ -527,7 +504,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -550,7 +526,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				diagramEditor.getMouseLocation().x = 150;
 				diagramEditor.getMouseLocation().y = 150;
@@ -575,7 +550,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -598,7 +572,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				diagramEditor.getMouseLocation().x = 150;
 				diagramEditor.getMouseLocation().y = 150;
@@ -612,7 +585,6 @@
 		robot.setAutoDelay(50);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				robot.keyPress(KeyEvent.VK_CONTROL);
 				robot.keyPress(KeyEvent.VK_SPACE);
@@ -633,7 +605,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -679,7 +650,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -727,7 +697,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				int currX = xContainer1 + containerSize + rectangleSize / 2;
 				int currY = yContainer1 + containerSize + rectangleSize / 2;
@@ -740,7 +709,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().activateTool("free");
 				ed.getGefEditor().click(100 + containerSize / 2, 100 + containerSize / 2);
@@ -750,7 +718,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().activateDefaultTool();
 				// move to connection start point
@@ -772,7 +739,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -798,7 +764,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// activate create-freeform-connection tool
 				ed.getGefEditor().activateTool("free");
@@ -809,7 +774,6 @@
 		Thread.sleep(DELAY);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// activate selection tool
 				ed.getGefEditor().activateDefaultTool();
@@ -829,7 +793,6 @@
 
 		// remove the connection via context menu
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().click(250, 195);
 				ed.getGefEditor().clickContextMenu("Remove");
@@ -846,14 +809,12 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_ECORE);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// find diagram
 				IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						addClassToDiagram(fp, currentDiagram, x, y, SHAPE_NAME);
 					}
@@ -863,7 +824,6 @@
 		Thread.sleep(DELAY);
 		// select shape
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ed.getGefEditor().select(SHAPE_NAME);
 			}
@@ -885,7 +845,6 @@
 		PaletteFinder paletteFinder = new PaletteFinder(diagramEditor.getEditDomain());
 		List<PaletteEntry> objectCreationTools = paletteFinder.findEntries(new AbstractToolEntryMatcher() {
 
-			@Override
 			public void describeTo(Description description) {
 				// Do nothing
 			}
@@ -904,7 +863,6 @@
 			if (o instanceof ToolEntry) {
 				final ToolEntry toolEntry = (ToolEntry) o;
 				syncExec(new VoidResult() {
-					@Override
 					public void run() {
 						ed.getGefEditor().activateTool(toolEntry.getLabel());
 						int currX = x + (counter[0] * 5);
@@ -932,7 +890,6 @@
 
 		// Preparation work
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 
 				// Create an outer container
@@ -973,7 +930,6 @@
 				ccc.setSourceAnchor(sourceAnchor);
 				ccc.setTargetAnchor(targetAnchor);
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						for (ICreateConnectionFeature ccf : ccfs) {
 							if (ccf.canCreate(ccc)) {
@@ -1010,7 +966,6 @@
 
 		// Set zoom level to next zoom level (150%)
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				SWTBotMenu viewMenu = new SWTWorkbenchBot().menu("View");
 				viewMenu.click();
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
index f7161c7..9f74e0e 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
@@ -111,8 +111,8 @@
 import org.eclipse.graphiti.services.Graphiti;
 import org.eclipse.graphiti.services.IGaService;
 import org.eclipse.graphiti.ui.editor.DiagramEditor;
-import org.eclipse.graphiti.ui.editor.DiagramEditorInputFactory;
 import org.eclipse.graphiti.ui.editor.DiagramEditorInput;
+import org.eclipse.graphiti.ui.editor.DiagramEditorInputFactory;
 import org.eclipse.graphiti.ui.features.AbstractDrillDownFeature;
 import org.eclipse.graphiti.ui.internal.IResourceRegistry;
 import org.eclipse.graphiti.ui.internal.IResourceRegistryHolder;
@@ -157,14 +157,12 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_ECORE);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 
 				final IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						addClassesAndReferenceToDiagram(fp, currentDiagram, 100, 100, "Connection", 700, 200, "ConnectionDecorator");
 					}
@@ -181,7 +179,6 @@
 				// waitForRefresh();
 				diagramEditor.selectPictogramElements(new PictogramElement[] { shape });
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						moveClassShape(fp, currentDiagram, 10, 30, "Connection");
 						removeClassShape(fp, currentDiagram, "ConnectionDecorator");
@@ -221,7 +218,6 @@
 		final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 		final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 		executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {
-			@Override
 			public void run() {
 				/*
 				 * Reuse of functionality originally written to add classes for
@@ -251,7 +247,6 @@
 			final EClass eClass = (EClass) bo;
 			// Change the tooltip to something else and check it
 			executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {
-				@Override
 				public void run() {
 					eClass.setName("Changed");
 					Text text = (Text) tooltipShape.getChildren().get(1).getGraphicsAlgorithm();
@@ -282,7 +277,6 @@
 		if (bo instanceof EClass) {
 			final EClass eClass = (EClass) bo;
 			executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {
-				@Override
 				public void run() {
 					// Change the tooltip to null and check it
 					eClass.setName(""); // Empty name means no tooltip
@@ -310,10 +304,8 @@
 		final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 		final Diagram diagram = diagramTypeProvider.getDiagram();
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						addClassToDiagram(fp, diagram, 500, 500, "Shape");
 						addClassToDiagram(fp, diagram, 100, 100, "ContainerShape");
@@ -352,7 +344,6 @@
 		final IFeatureProvider fp = diagramEditor.getDiagramTypeProvider().getFeatureProvider();
 		final Diagram diagram = fp.getDiagramTypeProvider().getDiagram();
 		executeInRecordingCommand(diagramEditor, new Runnable() {
-			@Override
 			public void run() {
 				addClassToDiagram(fp, diagram, 500, 500, "Shape");
 				// enforce roll-back
@@ -374,7 +365,6 @@
 		IDiagramTypeProvider diagramTypeProvider = diagramEditor.getConfigurationProvider().getDiagramTypeProvider();
 		IFeatureProvider featureProvider = diagramTypeProvider.getFeatureProvider();
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -451,7 +441,6 @@
 	@Test
 	public void testPlatformUtil() throws Exception {
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				final Diagram newDiagram = createDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 				assertTrue("create diagram does not work", newDiagram != null);
@@ -466,7 +455,6 @@
 		final DiagramEditor diagramEditor = openDiagram(ITestConstants.DIAGRAM_TYPE_ID_SKETCH);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider dtp = diagramEditor.getDiagramTypeProvider();
 				IFeatureProvider fp = dtp.getFeatureProvider();
@@ -544,32 +532,26 @@
 		assertFalse(container.containsCommands());
 		assertNotNull(container.getDescription());
 		container.add(new ICommand() {
-			@Override
 			public boolean canExecute() {
 				return false;
 			}
 
-			@Override
 			public boolean canUndo() {
 				return false;
 			}
 
-			@Override
 			public boolean execute() {
 				return false;
 			}
 
-			@Override
 			public IFeatureProvider getFeatureProvider() {
 				return null;
 			}
 
-			@Override
 			public boolean undo() {
 				return false;
 			}
 
-			@Override
 			public String getDescription() {
 				return new String("Test Description");
 			}
@@ -646,7 +628,6 @@
 	public void testGaUtil() throws Exception {
 		final Diagram diagram = createDiagram("test_gautil");
 		executeInRecordingCommand(ed.getTransactionalEditingDomain(), new Runnable() {
-			@Override
 			public void run() {
 				ContainerShape cs1 = getPeService().createContainerShape(diagram, true);
 				Shape shape1 = getPeService().createShape(cs1, true);
@@ -681,7 +662,6 @@
 		final EClass c4 = (EClass) diagramResource.getEObject("/5");
 
 		executeInRecordingCommand(ed.getTransactionalEditingDomain(), new Runnable() {
-			@Override
 			public void run() {
 				ContainerShape cs1 = getPeService().createContainerShape(diagram, true);
 				ContainerShape cs2 = getPeService().createContainerShape(diagram, true);
@@ -733,8 +713,6 @@
 	public void testUtils2() throws Exception {
 		final Diagram diagram = createDiagram("test_peutil");
 		executeInRecordingCommand(ed.getTransactionalEditingDomain(), new Runnable() {
-
-			@Override
 			public void run() {
 				// Build Pictograms model
 				IGaService gaService = Graphiti.getGaService();
@@ -817,7 +795,6 @@
 		class RegistryHolder implements IResourceRegistryHolder {
 			IResourceRegistry resourceRegistry = new ResourceRegistry();
 
-			@Override
 			public IResourceRegistry getResourceRegistry() {
 				return resourceRegistry;
 			}
@@ -843,7 +820,6 @@
 		final Diagram diagram = createDiagram("test_peutil");
 
 		executeInRecordingCommand(ed.getTransactionalEditingDomain(), new Runnable() {
-			@Override
 			public void run() {
 				ContainerShape cs1 = getPeService().createContainerShape(diagram, true);
 				int[] intArray = new int[] { 1, 2, 3, 4, 5, 6, 7, 8 };
@@ -873,7 +849,6 @@
 		final PopupMenu popupMenu = new PopupMenu(content, labelProvider);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				// Shell activeShell = Display.getCurrent().getActiveShell();
 				// popupMenu.show(activeShell);
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
index d0ef625..65e51fa 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
@@ -159,7 +159,6 @@
 				this.diagram = diagram;
 			}
 
-			@Override
 			public boolean canPaste(IPasteContext context) {
 				this.copy = context.getPictogramElements();
 				if (this.copy.length == 1) {
@@ -170,7 +169,6 @@
 				return false;
 			}
 
-			@Override
 			public void paste(IPasteContext context) {
 				Object[] obs = getCopiesFromClipBoard(this.diagram);
 				assertTrue((obs != null && obs.length > 0 && obs[0] instanceof PictogramElement));
@@ -208,7 +206,6 @@
 		assertEquals(true, myDefaultCopyFeature.canExecute(copyContext));
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				myDefaultCopyFeature.execute(copyContext);
 			}
@@ -223,7 +220,6 @@
 		pasteContext.setLocation(100, 200);
 
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				assertEquals(true, myPasteFeature.canExecute(pasteContext));
 
@@ -244,7 +240,6 @@
 		final Diagram dia = myDiagramTypeProvider.getDiagram();
 		final EObject[] objs = new EObject[] { dia };
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				ModelClipboard.getDefault().setContent(objs);
 				Collection<EObject> copy = ModelClipboard.getDefault().duplicateAndPaste(null, ed.getTransactionalEditingDomain());
@@ -319,7 +314,6 @@
 			final EList<EObject> businessObject = linkForPictogramElement.getBusinessObjects();
 			if (businessObject != null && !businessObject.isEmpty()) {
 				executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						businessObject.removeAll(businessObject);
 					}
@@ -350,13 +344,11 @@
 
 	private void addClassesAndReferencesToDiagram(final DiagramEditor diagramEditor) {
 		syncExec(new VoidResult() {
-			@Override
 			public void run() {
 				IDiagramTypeProvider diagramTypeProvider = diagramEditor.getDiagramTypeProvider();
 				final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 				final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 				executeInRecordingCommand(diagramEditor, new Runnable() {
-					@Override
 					public void run() {
 						addClassesAndReferenceToDiagram(fp, currentDiagram, -100, -100, "Connection", -700, -200, "ConnectionDecorator");
 					}
@@ -470,7 +462,6 @@
 		final IFeatureProvider fp = diagramTypeProvider.getFeatureProvider();
 		final Diagram currentDiagram = diagramTypeProvider.getDiagram();
 		executeInRecordingCommandInUIThread(diagramEditor, new Runnable() {
-			@Override
 			public void run() {
 				addClassesAndReferenceToDiagram(fp, currentDiagram, -100, -100, "Connection", -700, -200, "ConnectionDecorator");
 				moveClassShape(fp, currentDiagram, 300, 300, "Connection");
diff --git a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.core.prefs
index b4e3772..3401341 100644
--- a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:27:15 CEST 2011

+#Wed Nov 09 14:43:58 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.launching.prefs
index 934f7ca..0c51b3e 100644
--- a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.launching.prefs
+++ b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:15 CEST 2011

+#Wed Nov 09 14:43:58 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.pde.api.tools.prefs
index 55a9bff..87922cb 100644
--- a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:56:40 CEST 2011

+#Wed Nov 09 14:39:47 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/DefaultFeaturesTest.java b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/DefaultFeaturesTest.java
index 0789e86..e20fc72 100644
--- a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/DefaultFeaturesTest.java
+++ b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/DefaultFeaturesTest.java
@@ -326,17 +326,14 @@
 			super(fp);
 		}
 
-		@Override
 		public IReason updateNeeded(IUpdateContext context) {
 			return Reason.createTrueReason();
 		}
 
-		@Override
 		public boolean update(IUpdateContext context) {
 			return true;
 		}
 
-		@Override
 		public boolean canUpdate(IUpdateContext context) {
 			return true;
 		}
diff --git a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.core.prefs
index f38285f..444a860 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:27:24 CEST 2011

+#Wed Nov 09 14:44:10 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.launching.prefs
index 5294458..b493dd7 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.launching.prefs
+++ b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:25 CEST 2011

+#Wed Nov 09 14:44:10 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.pde.api.tools.prefs
index db514c8..af95448 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.pde.api.tools.prefs
+++ b/tests/org.eclipse.graphiti.testtool.ecore/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:56:48 CEST 2011

+#Wed Nov 09 14:39:54 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/association/TestAddAssociationFeature.java b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/association/TestAddAssociationFeature.java
index 218b31f..b51f81f 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/association/TestAddAssociationFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/association/TestAddAssociationFeature.java
@@ -48,7 +48,6 @@
 		super(fp);
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 
 		IAddConnectionContext addConnectionContext = (IAddConnectionContext) context;
@@ -83,7 +82,6 @@
 		return newConnection;
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		// return true if given business object is of instance association
 		if (context instanceof IAddConnectionContext && context.getNewObject() instanceof EReference) {
diff --git a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/clazz/TestAddClassFeature.java b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/clazz/TestAddClassFeature.java
index 76c3cf2..6b0282d 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/clazz/TestAddClassFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/clazz/TestAddClassFeature.java
@@ -65,7 +65,6 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		// check if user wants to add a EClass
 		if (context.getNewObject() instanceof EClass) {
@@ -83,7 +82,6 @@
 		return false;
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		EClass addedClass = (EClass) context.getNewObject();
 		ContainerShape targetContainer = context.getTargetContainer();
diff --git a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/pack/TestAddPackageFeature.java b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/pack/TestAddPackageFeature.java
index 05f14d7..5fd492c 100644
--- a/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/pack/TestAddPackageFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.ecore/src/org/eclipse/graphiti/testtool/ecore/features/pack/TestAddPackageFeature.java
@@ -55,7 +55,6 @@
 		super(fp);
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		// check if user wants to add a package
 		if (context.getNewObject() instanceof EPackage) {
@@ -68,7 +67,6 @@
 		return false;
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		EPackage addedPackage = (EPackage) context.getNewObject();
 		Diagram targetDiagram = (Diagram) context.getTargetContainer();
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.core.prefs
index 68916de..49448f7 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 12:27:35 CEST 2011

+#Wed Nov 09 14:44:24 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

 org.eclipse.jdt.core.builder.duplicateResourceTask=warning

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.launching.prefs
index 6d2b96a..64f250d 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.launching.prefs
+++ b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:35 CEST 2011

+#Wed Nov 09 14:44:24 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.pde.api.tools.prefs
index 969441d..81b75b2 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.pde.api.tools.prefs
+++ b/tests/org.eclipse.graphiti.testtool.sketch/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:57:01 CEST 2011

+#Wed Nov 09 14:40:00 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchToolBehavior.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchToolBehavior.java
index 87c60dd..1b23a2f 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchToolBehavior.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchToolBehavior.java
@@ -85,11 +85,9 @@
 			this.imageFilePath = imageFilePath;
 		}
 
-		@Override
 		public ImageDescriptor getImageDescriptor() {
 			return AbstractUIPlugin.imageDescriptorFromPlugin(SketchPlugin.getID(), imageFilePath);
 		}
-
 	}
 
 	private class MyPaletteCompartmentEntry extends PaletteCompartmentEntry implements IEclipseImageDescriptor {
@@ -101,7 +99,6 @@
 			this.imageFilePath = imageFilePath;
 		}
 
-		@Override
 		public ImageDescriptor getImageDescriptor() {
 			return AbstractUIPlugin.imageDescriptorFromPlugin(SketchPlugin.getID(), imageFilePath);
 		}
@@ -511,7 +508,6 @@
 		return super.getContentArea(cs);
 	}
 
-	@Override
 	public String getName() {
 		return "Edit Mode";
 	}
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/AddAnythingFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/AddAnythingFeature.java
index a142650..6327eb5 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/AddAnythingFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/AddAnythingFeature.java
@@ -41,7 +41,6 @@
 		super(fp);
 	}
 
-	@Override
 	public PictogramElement add(IAddContext context) {
 		Object newObject = context.getNewObject();
 		Shape shape = Graphiti.getPeCreateService().createShape(context.getTargetContainer(), true);
@@ -59,7 +58,6 @@
 		return shape;
 	}
 
-	@Override
 	public boolean canAdd(IAddContext context) {
 		return context.getTargetContainer() != null;
 	}
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
index ab6e039..b2842a8 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
@@ -67,7 +67,6 @@
 		setGaType(gaType);
 	}
 
-	@Override
 	public boolean canCreate(ICreateContext context) {
 		boolean ret = false;
 		ContainerShape targetContainer = context.getTargetContainer();
@@ -77,7 +76,6 @@
 		return ret;
 	}
 
-	@Override
 	public Object[] create(ICreateContext context) {
 		ContainerShape targetContainer = context.getTargetContainer();
 		AnchorContainer newAc = createAnchorContainer(targetContainer);
diff --git a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.core.prefs
index ca2bb34..ce04a20 100644
--- a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Fri Oct 28 12:27:44 CEST 2011

+#Wed Nov 09 14:44:35 CET 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

+org.eclipse.jdt.core.builder.duplicateResourceTask=error

 org.eclipse.jdt.core.builder.invalidClasspath=abort

 org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore

 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

@@ -21,7 +21,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.5

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

diff --git a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.launching.prefs
index 6620b37..2fcfcd0 100644
--- a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.launching.prefs
+++ b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Oct 28 12:27:44 CEST 2011

+#Wed Nov 09 14:44:53 CET 2011

 eclipse.preferences.version=1

-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error

diff --git a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.pde.api.tools.prefs
index 421dcb4..9ecde0b 100644
--- a/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ b/tests/org.eclipse.graphiti.ui.tests/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Fri Oct 28 11:57:09 CEST 2011

+#Wed Nov 09 14:40:06 CET 2011

 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

@@ -62,7 +62,7 @@
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

 INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore

 LEAK_EXTEND=Warning

 LEAK_FIELD_DECL=Warning

 LEAK_IMPLEMENT=Warning

diff --git a/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CommandStackTest.java b/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CommandStackTest.java
index a967857..255d67a 100644
--- a/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CommandStackTest.java
+++ b/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CommandStackTest.java
@@ -213,12 +213,10 @@
 			super(featureProvider);
 		}
 
-		@Override
 		public int getEditingType() {
 			return TYPE_TEXT;
 		}
 
-		@Override
 		public String getInitialValue(IDirectEditingContext context) {
 			return "Initial";
 		}
@@ -257,12 +255,10 @@
 			super(fp);
 		}
 
-		@Override
 		public boolean canAdd(IAddContext context) {
 			return true;
 		}
 
-		@Override
 		public PictogramElement add(IAddContext context) {
 			// Do nothing
 			return null;
diff --git a/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CustomUndoableFeatureTest.java b/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CustomUndoableFeatureTest.java
index abf3780..f637649 100644
--- a/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CustomUndoableFeatureTest.java
+++ b/tests/org.eclipse.graphiti.ui.tests/src/org/eclipse/graphiti/ui/tests/CustomUndoableFeatureTest.java
@@ -123,18 +123,15 @@
 			return true;
 		}
 
-		@Override
 		public void undo(IContext context) {
 			undoCalled = true;
 			assertEquals("Context object must be the same as in execute", this.context, context);
 		}
 
-		@Override
 		public boolean canRedo(IContext context) {
 			return true;
 		}
 
-		@Override
 		public void redo(IContext context) {
 			redoCalled = true;
 			assertEquals("Context object must be the same as in execute", this.context, context);