Bug 352626 - Move platform debug to Java 1.6 BREE

14 files changed, 464 insertions, 342 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
index f24b49546..39825b009 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
@@ -46,6 +46,7 @@ class BreadcrumbDropDownAutoExpandAction extends Action {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		fLaunchView.setBreadcrumbDropDownAutoExpand(isChecked()); 
 	}	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
index 1b458ec5c..f75f7a5cb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
@@ -29,14 +29,16 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart {
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    public boolean equals(Object obj) {
+    @Override
+	public boolean equals(Object obj) {
         return (obj instanceof BreadcrumbWorkbenchPart);
     }
 
     /* (non-Javadoc)
      * @see java.lang.Object#hashCode()
      */
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return getClass().hashCode();
     }
 
@@ -52,65 +54,75 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart {
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(org.eclipse.ui.IPropertyListener)
      */
-    public void addPropertyListener(IPropertyListener listener) {
+    @Override
+	public void addPropertyListener(IPropertyListener listener) {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
      */
-    public void createPartControl(Composite parent) {
+    @Override
+	public void createPartControl(Composite parent) {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#dispose()
      */
-    public void dispose() {
+    @Override
+	public void dispose() {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#getSite()
      */
-    public IWorkbenchPartSite getSite() {
+    @Override
+	public IWorkbenchPartSite getSite() {
         return fSite;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#getTitle()
      */
-    public String getTitle() {
+    @Override
+	public String getTitle() {
         return ""; //$NON-NLS-1$
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
      */
-    public Image getTitleImage() {
+    @Override
+	public Image getTitleImage() {
         return null;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip()
      */
-    public String getTitleToolTip() {
+    @Override
+	public String getTitleToolTip() {
         return ""; //$NON-NLS-1$
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(org.eclipse.ui.IPropertyListener)
      */
-    public void removePropertyListener(IPropertyListener listener) {
+    @Override
+	public void removePropertyListener(IPropertyListener listener) {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchPart#setFocus()
      */
-    public void setFocus() {
+    @Override
+	public void setFocus() {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
-    public Object getAdapter(Class adapter) {
+    @Override
+	public Object getAdapter(Class adapter) {
         return null;
     }
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
index 1754e348e..dd5f094f2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
@@ -146,7 +146,8 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
      */
-    public Object getAdapter(Object adaptableObject, Class adapterType) {
+    @Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
         if (adapterType.isInstance(adaptableObject)) {
 			return adaptableObject;
 		}
@@ -322,7 +323,8 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
      */
-    public Class[] getAdapterList() {
+    @Override
+	public Class[] getAdapterList() {
         return new Class[] {
         		IAsynchronousLabelAdapter.class,
         		IAsynchronousContentAdapter.class,
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java
index efafa7b7c..04acbd126 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,204 +26,201 @@ import org.eclipse.swt.graphics.RGB;
 
 /**
  * Translates images, colors, and fonts into image descriptors, RGBs, and font
- * datas for workbench adapaters. Also provides labels. 
+ * data for workbench adapters. Also provides labels.
  * 
  * @since 3.1
  */
 public class DebugElementHelper {
-    
-    // a model presentation that can provide images & labels for debug elements
-    private static DelegatingModelPresentation fgPresenetation;
-    
-    // map of images to image descriptors
-    private static Map fgImages = new HashMap();
-    
-    /**
-     * Disposes this adapater
-     */
-    public static void dispose() {
-        fgImages.clear();
-        if (fgPresenetation != null) {
-            fgPresenetation.dispose();
-            fgPresenetation = null;
-        }
-    }
-    
-    /**
-     * Returns an image descriptor for the given debug element.
-     * 
-     * @param object object for which an image descriptor is required
-     */
-    public static ImageDescriptor getImageDescriptor(Object object) {
-        Image image = getPresentation().getImage(object);
-        return getImageDescriptor(image);
-    }
-    
-    /**
-     * Returns an image descriptor for the given debug element.
-     *
-     * @param presentation presentation to obtain image from
-     * @param object object for which an image descriptor is required
-     * @since 3.3
-     */
-    public static ImageDescriptor getImageDescriptor(Object object, IDebugModelPresentation presentation) {
-    	Image image = presentation.getImage(object);
-        return getImageDescriptor(image);
-    }    
-    
-    public static ImageDescriptor getImageDescriptor(Image image)
-    {
-    	if (image != null) {
-            ImageDescriptor descriptor = (ImageDescriptor) fgImages.get(image);
-            if (descriptor == null) {
-                descriptor = new ImageImageDescriptor(image);
-                fgImages.put(image, descriptor);
-            }
-            return descriptor;
-        }
-    	return null;
-    }
-
-    /**
-     * Returns a label for the given debug element.
-     * 
-     * @param o object for which a label is required
-     */
-    public static String getLabel(Object o) {
-        return getPresentation().getText(o);
-    }
-    
-    /**
-     * Returns a model presentation to use to retrieve lables & images.
-     * 
-     * @return a model presentation to use to retrieve lables & images
-     */
-    public static DelegatingModelPresentation getPresentation() {
-        if (fgPresenetation == null) {
-            fgPresenetation = new DelegatingModelPresentation();
-        }
-        return fgPresenetation;
-    }
-
-    /**
-     * Returns the RGB of the foreground color for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which a foreground color is required
-     * @return the RGB of the foreground color for the given element, or
-     * <code>null</code> if none
-     */
-    public static RGB getForeground(Object element) {
-        Color color = getPresentation().getForeground(element);
-        if (color != null) {
-            return color.getRGB();
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the RGB of the foreground color for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which a foreground color is required
-     * @param presentation presentation to obtain color from
-     * @return the RGB of the foreground color for the given element, or
-     * <code>null</code> if none
-     * @since 3.3
-     */
-    public static RGB getForeground(Object element, IDebugModelPresentation presentation) {
-    	Color color = null;
-    	if (presentation instanceof IColorProvider) {
+
+	// a model presentation that can provide images & labels for debug elements
+	private static DelegatingModelPresentation fgPresenetation;
+
+	// map of images to image descriptors
+	private static Map<Image, ImageDescriptor> fgImages = new HashMap<Image, ImageDescriptor>();
+
+	/**
+	 * Disposes this adapter
+	 */
+	public static void dispose() {
+		fgImages.clear();
+		if (fgPresenetation != null) {
+			fgPresenetation.dispose();
+			fgPresenetation = null;
+		}
+	}
+
+	/**
+	 * Returns an image descriptor for the given debug element.
+	 * 
+	 * @param object object for which an image descriptor is required
+	 */
+	public static ImageDescriptor getImageDescriptor(Object object) {
+		Image image = getPresentation().getImage(object);
+		return getImageDescriptor(image);
+	}
+
+	/**
+	 * Returns an image descriptor for the given debug element.
+	 * 
+	 * @param presentation presentation to obtain image from
+	 * @param object object for which an image descriptor is required
+	 * @since 3.3
+	 */
+	public static ImageDescriptor getImageDescriptor(Object object, IDebugModelPresentation presentation) {
+		Image image = presentation.getImage(object);
+		return getImageDescriptor(image);
+	}
+
+	public static ImageDescriptor getImageDescriptor(Image image) {
+		if (image != null) {
+			ImageDescriptor descriptor = fgImages.get(image);
+			if (descriptor == null) {
+				descriptor = new ImageImageDescriptor(image);
+				fgImages.put(image, descriptor);
+			}
+			return descriptor;
+		}
+		return null;
+	}
+
+	/**
+	 * Returns a label for the given debug element.
+	 * 
+	 * @param o object for which a label is required
+	 */
+	public static String getLabel(Object o) {
+		return getPresentation().getText(o);
+	}
+
+	/**
+	 * Returns a model presentation to use to retrieve lables & images.
+	 * 
+	 * @return a model presentation to use to retrieve lables & images
+	 */
+	public static DelegatingModelPresentation getPresentation() {
+		if (fgPresenetation == null) {
+			fgPresenetation = new DelegatingModelPresentation();
+		}
+		return fgPresenetation;
+	}
+
+	/**
+	 * Returns the RGB of the foreground color for the given element, or
+	 * <code>null</code> if none.
+	 * 
+	 * @param element object for which a foreground color is required
+	 * @return the RGB of the foreground color for the given element, or
+	 *         <code>null</code> if none
+	 */
+	public static RGB getForeground(Object element) {
+		Color color = getPresentation().getForeground(element);
+		if (color != null) {
+			return color.getRGB();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the RGB of the foreground color for the given element, or
+	 * <code>null</code> if none.
+	 * 
+	 * @param element object for which a foreground color is required
+	 * @param presentation presentation to obtain color from
+	 * @return the RGB of the foreground color for the given element, or
+	 *         <code>null</code> if none
+	 * @since 3.3
+	 */
+	public static RGB getForeground(Object element, IDebugModelPresentation presentation) {
+		Color color = null;
+		if (presentation instanceof IColorProvider) {
 			IColorProvider colorProvider = (IColorProvider) presentation;
 			color = colorProvider.getForeground(element);
 		} else {
 			color = getPresentation().getForeground(element);
 		}
-        if (color != null) {
-            return color.getRGB();
-        }
-        return null;
-    }    
-
-    /**
-     * Returns the RGB of the background color for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which a background color is required
-     * @return the RGB of the background color for the given element, or
-     * <code>null</code> if none
-     */
-    public static RGB getBackground(Object element) {
-        Color color = getPresentation().getBackground(element);
-        if (color != null) {
-            return color.getRGB();
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the RGB of the background color for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which a background color is required
-     * @param presentation presentation to use to retrieve color
-     * @return the RGB of the background color for the given element, or
-     * <code>null</code> if none
-     * @since 3.3
-     */
-    public static RGB getBackground(Object element, IDebugModelPresentation presentation) {
-    	Color color = null;
-    	if (presentation instanceof IColorProvider) {
+		if (color != null) {
+			return color.getRGB();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the RGB of the background color for the given element, or
+	 * <code>null</code> if none.
+	 * 
+	 * @param element object for which a background color is required
+	 * @return the RGB of the background color for the given element, or
+	 *         <code>null</code> if none
+	 */
+	public static RGB getBackground(Object element) {
+		Color color = getPresentation().getBackground(element);
+		if (color != null) {
+			return color.getRGB();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the RGB of the background color for the given element, or
+	 * <code>null</code> if none.
+	 * 
+	 * @param element object for which a background color is required
+	 * @param presentation presentation to use to retrieve color
+	 * @return the RGB of the background color for the given element, or
+	 *         <code>null</code> if none
+	 * @since 3.3
+	 */
+	public static RGB getBackground(Object element, IDebugModelPresentation presentation) {
+		Color color = null;
+		if (presentation instanceof IColorProvider) {
 			IColorProvider colorProvider = (IColorProvider) presentation;
 			color = colorProvider.getBackground(element);
 		} else {
 			color = getPresentation().getBackground(element);
 		}
-        if (color != null) {
-            return color.getRGB();
-        }
-        return null;
-    }    
-
-    /**
-     * Returns the font data for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which font data is required
-     * @return the font data for the given element, or
-     * <code>null</code> if none
-     */
-    public static FontData getFont(Object element) {
-        Font font = getPresentation().getFont(element);
-        if (font != null) {
-            return font.getFontData()[0];
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the font data for the given element, or
-     * <code>null</code> if none.
-     * 
-     * @param element object for which font data is required
-     * @param presentation presentation to obtain font from
-     * @return the font data for the given element, or
-     * <code>null</code> if none
-     * @since 3.3
-     */
-    public static FontData getFont(Object element, IDebugModelPresentation presentation) {
-    	Font font = null;
-    	if (presentation instanceof IFontProvider) {
-    		IFontProvider provider = (IFontProvider) presentation;
-    		font = provider.getFont(element);
-    	} else {
-    		font = getPresentation().getFont(element);
-    	}
-        if (font != null) {
-            return font.getFontData()[0];
-        }
-        return null;
-    }
+		if (color != null) {
+			return color.getRGB();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the font data for the given element, or <code>null</code> if
+	 * none.
+	 * 
+	 * @param element object for which font data is required
+	 * @return the font data for the given element, or <code>null</code> if none
+	 */
+	public static FontData getFont(Object element) {
+		Font font = getPresentation().getFont(element);
+		if (font != null) {
+			return font.getFontData()[0];
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the font data for the given element, or <code>null</code> if
+	 * none.
+	 * 
+	 * @param element object for which font data is required
+	 * @param presentation presentation to obtain font from
+	 * @return the font data for the given element, or <code>null</code> if none
+	 * @since 3.3
+	 */
+	public static FontData getFont(Object element, IDebugModelPresentation presentation) {
+		Font font = null;
+		if (presentation instanceof IFontProvider) {
+			IFontProvider provider = (IFontProvider) presentation;
+			font = provider.getFont(element);
+		} else {
+			font = getPresentation().getFont(element);
+		}
+		if (font != null) {
+			return font.getFontData()[0];
+		}
+		return null;
+	}
 
 	/**
 	 * Returns whether the UI thread is required for computing the label for the
@@ -235,5 +232,5 @@ public class DebugElementHelper {
 	public static boolean requiresUIThread(Object object) {
 		DelegatingModelPresentation presentation = getPresentation();
 		return presentation.requiresUIThread(object);
-	}    
+	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
index d47929d13..38f9c6900 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
@@ -46,6 +46,7 @@ class DebugToolBarAction extends Action {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		fLaunchView.setDebugToolbarInView(isChecked()); 
 	}	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
index 3c690ffd2..712f05126 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
@@ -73,6 +73,7 @@ class DebugViewModeAction extends Action {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		fLaunchView.setViewMode(fMode, fParent); 
 	}	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java
index 49938fd68..d44ec65a5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java
@@ -25,71 +25,68 @@ import org.eclipse.debug.core.model.IThread;
  */
 public class DecorationManager {
 
-    // map of targets to lists of active decorations
-    private static Map fDecorations = new HashMap(10);
+	// map of targets to lists of active decorations
+	private static Map<IDebugTarget, List<Decoration>> fDecorations = new HashMap<IDebugTarget, List<Decoration>>(10);
 
-    /**
-     * Adds the given decoration for the given stack frame.
-     * 
-     * @param decoration
-     * @param frame
-     */
-    public static void addDecoration(Decoration decoration) {
-        synchronized (fDecorations) {
-            IDebugTarget target = decoration.getThread().getDebugTarget();
-            List list = (List) fDecorations.get(target);
-            if (list == null) {
-                list = new ArrayList();
-                fDecorations.put(target, list);
-            }
-            list.add(decoration);
-        }
-    }
+	/**
+	 * Adds the given decoration for the given stack frame.
+	 * 
+	 * @param decoration
+	 * @param frame
+	 */
+	public static void addDecoration(Decoration decoration) {
+		synchronized (fDecorations) {
+			IDebugTarget target = decoration.getThread().getDebugTarget();
+			List<Decoration> list = fDecorations.get(target);
+			if (list == null) {
+				list = new ArrayList<Decoration>();
+				fDecorations.put(target, list);
+			}
+			list.add(decoration);
+		}
+	}
 
-    /**
-     * Removes any decorations for the given debug target.
-     * 
-     * @param target
-     *            to remove editor decorations for
-     */
-    public static void removeDecorations(IDebugTarget target) {
-    	doRemoveDecorations(target, null);
-    }
-    
-    /**
-     * Removes any decorations for the given thread
-     * 
-     * @param thread
-     *            thread to remove decorations for
-     */
-    public static void removeDecorations(IThread thread) {
-    	doRemoveDecorations(thread.getDebugTarget(), thread);
-    }
+	/**
+	 * Removes any decorations for the given debug target.
+	 * 
+	 * @param target to remove editor decorations for
+	 */
+	public static void removeDecorations(IDebugTarget target) {
+		doRemoveDecorations(target, null);
+	}
+
+	/**
+	 * Removes any decorations for the given thread
+	 * 
+	 * @param thread thread to remove decorations for
+	 */
+	public static void removeDecorations(IThread thread) {
+		doRemoveDecorations(thread.getDebugTarget(), thread);
+	}
 
 	private static void doRemoveDecorations(IDebugTarget target, IThread thread) {
-		ArrayList decorationsToRemove = new ArrayList();
-        synchronized (fDecorations) {
-            List list = (List) fDecorations.get(target);
-            if (list != null) {
-                ListIterator iterator = list.listIterator();
-                while (iterator.hasNext()) {
-                    Decoration decoration = (Decoration) iterator.next();
-                    if (thread == null || thread.equals(decoration.getThread())) {
-	                    decorationsToRemove.add(decoration);
-	                    iterator.remove();
-                    }
-                }
-                if (list.isEmpty()) {
-                	fDecorations.remove(target);
-                }
-            }
-        }
-        Iterator iter = decorationsToRemove.iterator();
-        while (iter.hasNext())
-        {
-        	Decoration decoration = (Decoration)iter.next();
-        	decoration.remove();
-        }
+		ArrayList<Decoration> decorationsToRemove = new ArrayList<Decoration>();
+		synchronized (fDecorations) {
+			List<Decoration> list = fDecorations.get(target);
+			if (list != null) {
+				ListIterator<Decoration> iterator = list.listIterator();
+				while (iterator.hasNext()) {
+					Decoration decoration = iterator.next();
+					if (thread == null || thread.equals(decoration.getThread())) {
+						decorationsToRemove.add(decoration);
+						iterator.remove();
+					}
+				}
+				if (list.isEmpty()) {
+					fDecorations.remove(target);
+				}
+			}
+		}
+		Iterator<Decoration> iter = decorationsToRemove.iterator();
+		while (iter.hasNext()) {
+			Decoration decoration = iter.next();
+			decoration.remove();
+		}
 	}
-	
+
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
index 57f8fb646..0caeab28c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
@@ -31,6 +31,7 @@ public class ImageImageDescriptor extends ImageDescriptor {
 	/* (non-Javadoc)
 	 * @see ImageDescriptor#getImageData()
 	 */
+	@Override
 	public ImageData getImageData() {
 		return fImage.getImageData();
 	}
@@ -38,6 +39,7 @@ public class ImageImageDescriptor extends ImageDescriptor {
 	/* (non-Javadoc)
 	 * @see Object#equals(Object)
 	 */
+	@Override
 	public boolean equals(Object obj) {
 		return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage);
 	}
@@ -45,6 +47,7 @@ public class ImageImageDescriptor extends ImageDescriptor {
 	/* (non-Javadoc)
 	 * @see Object#hashCode()
 	 */
+	@Override
 	public int hashCode() {
 		return fImage.hashCode();
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
index 3a21e0146..34b7d1f5e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -253,11 +253,11 @@ public class LaunchView extends AbstractDebugView
      * 
      * @since 3.6
      */
-    private Map fHandlers = new HashMap();
+	private Map<String, IHandler2> fHandlers = new HashMap<String, IHandler2>();
     
     private boolean fDebugToolbarInView = true;
     
-    private Set fDebugToolbarPerspectives = new TreeSet();
+	private Set<String> fDebugToolbarPerspectives = new TreeSet<String>();
     
 	/**
 	 * Page-book page for the breadcrumb viewer.  This page is activated in 
@@ -270,21 +270,25 @@ public class LaunchView extends AbstractDebugView
 	    LaunchViewBreadcrumb fCrumb;
 	    Control fControl;
 
-	    public void createControl(Composite parent) {
+	    @Override
+		public void createControl(Composite parent) {
 	        fCrumb = new LaunchViewBreadcrumb(LaunchView.this, (TreeModelViewer)getViewer(), fTreeViewerDebugContextProvider);
 	        fControl = fCrumb.createContent(parent);
 	    }
 
-	    public void init(IPageSite pageSite) {
+	    @Override
+		public void init(IPageSite pageSite) {
 	        super.init(pageSite);
             pageSite.setSelectionProvider(fCrumb.getSelectionProvider());
 	    }
 	    
-	    public Control getControl() {
+	    @Override
+		public Control getControl() {
 	        return fControl;
 	    }
 
-	    public void setFocus() {
+	    @Override
+		public void setFocus() {
 	        fCrumb.activate();
 	    }
 	    
@@ -296,7 +300,8 @@ public class LaunchView extends AbstractDebugView
 	        return fCrumb.getHeight();
 	    }
 	    
-	    public void dispose() {
+	    @Override
+		public void dispose() {
 	        fCrumb.dispose();
 	    }
 	}
@@ -310,6 +315,7 @@ public class LaunchView extends AbstractDebugView
 		private Visitor fVisitor = new Visitor();
 		
 		class Visitor implements IModelDeltaVisitor {
+			@Override
 			public boolean visit(IModelDelta delta, int depth) {
 				if ((delta.getFlags() & (IModelDelta.STATE | IModelDelta.CONTENT)) > 0) {
 					// state and/or content change
@@ -336,7 +342,7 @@ public class LaunchView extends AbstractDebugView
 		 * @return corresponding tree path
 		 */
 		private TreePath getViewerTreePath(IModelDelta node) {
-			ArrayList list = new ArrayList();
+			ArrayList<Object> list = new ArrayList<Object>();
 			IModelDelta parentDelta = node.getParentDelta();
 			while (parentDelta != null) {
 				list.add(0, node.getElement());
@@ -360,6 +366,7 @@ public class LaunchView extends AbstractDebugView
 		/* (non-Javadoc)
 		 * @see org.eclipse.debug.ui.contexts.IDebugContextProvider#getActiveContext()
 		 */
+		@Override
 		public synchronized ISelection getActiveContext() {
 			return fContext;
 		}	
@@ -398,6 +405,7 @@ public class LaunchView extends AbstractDebugView
 			} else {
 				final DebugContextEvent finalEvent = event;
 				Job job = new UIJob("context change") { //$NON-NLS-1$
+					@Override
 					public IStatus runInUIThread(IProgressMonitor monitor) {
 						// verify selection is still the same context since job was scheduled
 						synchronized (TreeViewerContextProvider.this) {
@@ -421,6 +429,7 @@ public class LaunchView extends AbstractDebugView
 		/* (non-Javadoc)
 		 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta)
 		 */
+		@Override
 		public void modelChanged(IModelDelta delta, IModelProxy proxy) {
 			delta.accept(fVisitor);
 		}
@@ -464,7 +473,8 @@ public class LaunchView extends AbstractDebugView
 	private PageRec fDefaultPageRec = null;
 
 	private ISelectionChangedListener fTreeViewerSelectionChangedListener = new ISelectionChangedListener() {
-	    public void selectionChanged(SelectionChangedEvent event) {
+	    @Override
+		public void selectionChanged(SelectionChangedEvent event) {
 	        fTreeViewerDebugContextProvider.activate(event.getSelection());
 	    }
 	};
@@ -493,7 +503,8 @@ public class LaunchView extends AbstractDebugView
             }
 	    }
 	    
-        public ISelection getActiveContext() {
+        @Override
+		public ISelection getActiveContext() {
             ISelection activeContext = fActiveProvider.getActiveContext();
             if (activeContext != null) {
                 return activeContext;
@@ -501,7 +512,8 @@ public class LaunchView extends AbstractDebugView
             return TreeSelection.EMPTY;
         }
 
-        public void debugContextChanged(DebugContextEvent event) {
+        @Override
+		public void debugContextChanged(DebugContextEvent event) {
 	        if (event.getSource().equals(fActiveProvider)) {
 	            fire(new DebugContextEvent(this, event.getContext(), event.getFlags()));
 	        }
@@ -521,6 +533,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId()
 	 */
+	@Override
 	protected String getHelpContextId() {
 		return IDebugHelpContextIds.DEBUG_VIEW;
 	}
@@ -528,6 +541,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#createActions()
 	 */
+	@Override
 	protected void createActions() {
 		setAction("Properties", new PropertyDialogAction(getSite(), getSite().getSelectionProvider())); //$NON-NLS-1$
 		fEditConfigAction = new EditLaunchConfigurationAction();
@@ -572,7 +586,7 @@ public class LaunchView extends AbstractDebugView
 	 * @return handler or <code>null</code>
 	 */
 	public IHandler2 getHandler(String id) {
-		return (IHandler2) fHandlers.get(id);
+		return fHandlers.get(id);
 	}
 	
 	/**
@@ -602,6 +616,7 @@ public class LaunchView extends AbstractDebugView
 	 * @since 3.5
 	 * @see #fDefaultPageRec
 	 */	
+	@Override
 	public void createPartControl(final Composite parent) {
 	    super.createPartControl(parent);
 
@@ -637,9 +652,11 @@ public class LaunchView extends AbstractDebugView
         
         // Add a resize listener for the view to activate breadcrumb as needed. 
         parent.addControlListener(new ControlListener() {
-            public void controlMoved(ControlEvent e) {
+            @Override
+			public void controlMoved(ControlEvent e) {
             }
-            public void controlResized(ControlEvent e) {
+            @Override
+			public void controlResized(ControlEvent e) {
                 if (parent.isDisposed()) {
                     return;
                 }
@@ -677,6 +694,7 @@ public class LaunchView extends AbstractDebugView
      * @since 3.5
      * @see #fDefaultPageRec
      */ 
+	@Override
 	protected PageRec doCreatePage(IWorkbenchPart part) {
 	    if (part instanceof BreadcrumbWorkbenchPart) {
 	        fBreadcrumbPage = new BreadcrumbPage();
@@ -694,6 +712,7 @@ public class LaunchView extends AbstractDebugView
      * @since 3.5
      * @see #fDefaultPageRec
      */ 
+	@Override
 	protected boolean isImportant(IWorkbenchPart part) {
 	    return part instanceof BreadcrumbWorkbenchPart;
 	}
@@ -705,6 +724,7 @@ public class LaunchView extends AbstractDebugView
      * @since 3.5
      * @see #fDefaultPageRec
      */ 
+	@Override
 	protected void showPageRec(PageRec pageRec) {
 	    if (pageRec.page == getDefaultPage()) {
 	        fDefaultPageRec = pageRec;
@@ -740,7 +760,8 @@ public class LaunchView extends AbstractDebugView
         viewMenu.add(modeSubmenu);
         
         modeSubmenu.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager manager) {
+            @Override
+			public void menuAboutToShow(IMenuManager manager) {
                 modeSubmenu.add(fDebugViewModeActions[0]);
                 modeSubmenu.add(fDebugViewModeActions[1]);
                 modeSubmenu.add(fDebugViewModeActions[2]);
@@ -855,6 +876,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite)
 	 */
+	@Override
 	protected Viewer createViewer(Composite parent) {
 		fPresentation = new DelegatingModelPresentation();
 		fPresentationContext = new DebugModelPresentationContext(IDebugUIConstants.ID_DEBUG_VIEW, this, fPresentation);
@@ -918,6 +940,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
 	 */
+	@Override
 	public void init(IViewSite site) throws PartInitException {
 		super.init(site);
 		commonInit(site);
@@ -928,6 +951,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento)
 	 */
+	@Override
 	public void init(IViewSite site, IMemento memento) throws PartInitException {
 		super.init(site, memento);
 		commonInit(site);
@@ -938,7 +962,8 @@ public class LaunchView extends AbstractDebugView
     /* (non-Javadoc)
      * @see org.eclipse.ui.part.PageBookView#partDeactivated(org.eclipse.ui.IWorkbenchPart)
      */
-    public void partDeactivated(IWorkbenchPart part) {
+    @Override
+	public void partDeactivated(IWorkbenchPart part) {
         String id = part.getSite().getId();
         if (id.equals(getSite().getId())) {
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -963,7 +988,7 @@ public class LaunchView extends AbstractDebugView
         }
         
         StringBuffer buffer= new StringBuffer();
-        for (Iterator itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) {
+		for (Iterator<String> itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) {
             buffer.append(itr.next()).append(',');          
         } 
         getPreferenceStore().setValue(IDebugPreferenceConstants.DEBUG_VIEW_TOOLBAR_HIDDEN_PERSPECTIVES, buffer.toString());
@@ -982,6 +1007,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
 	 */
+	@Override
 	protected void configureToolBar(IToolBarManager tbm) {
 		tbm.add(new Separator(IDebugUIConstants.THREAD_GROUP));
 		tbm.add(new Separator(IDebugUIConstants.STEP_GROUP));
@@ -1072,6 +1098,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
 	 */
+	@Override
 	public void dispose() {
 	    fContextService.removeContextManagerListener(this);
 	    getSite().getSelectionProvider().removeSelectionChangedListener(this);
@@ -1093,10 +1120,8 @@ public class LaunchView extends AbstractDebugView
 		IWorkbenchWindow window = getSite().getWorkbenchWindow();
 		window.removePerspectiveListener(this);
 		window.removePageListener(this);
-		Iterator iterator = fHandlers.values().iterator();
-		while (iterator.hasNext()) {
-			IHandler2 hander = (IHandler2) iterator.next();
-			hander.dispose();
+		for (IHandler2 handler : fHandlers.values()) {
+			handler.dispose();
 		}
 		fHandlers.clear();
 		super.dispose();
@@ -1127,6 +1152,7 @@ public class LaunchView extends AbstractDebugView
 	 * 
 	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		updateObjects();
 	}
@@ -1134,6 +1160,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
 	 */
+	@Override
 	public void doubleClick(DoubleClickEvent event) {
 		ISelection selection= event.getSelection();
 		if (!(selection instanceof IStructuredSelection)) {
@@ -1151,6 +1178,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
 	 */
+	@Override
 	public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 		setActive(page.findView(getSite().getId()) != null);
 		updateObjects();
@@ -1161,6 +1189,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
 	 */
+	@Override
 	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
 		setActive(page.findView(getSite().getId()) != null);
 	}
@@ -1168,12 +1197,14 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
 	 */
+	@Override
 	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageActivated(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageActivated(IWorkbenchPage page) {
 		if (getSite().getPage().equals(page)) {
 			setActive(true);
@@ -1184,18 +1215,21 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageClosed(IWorkbenchPage page) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageOpened(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageOpened(IWorkbenchPage page) {
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.IDebugView#getPresentation(java.lang.String)
 	 */
+	@Override
 	public IDebugModelPresentation getPresentation(String id) {
 		return ((DelegatingModelPresentation)fPresentation).getPresentation(id);
 	}
@@ -1203,6 +1237,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
 	 */
+	@Override
 	protected void fillContextMenu(IMenuManager menu) {
         TreeSelection sel = (TreeSelection) fTreeViewerDebugContextProvider.getActiveContext();
         Object element = sel != null && sel.size() > 0 ? sel.getFirstElement() : null; 
@@ -1257,10 +1292,11 @@ public class LaunchView extends AbstractDebugView
         menu.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));
     }
 	
+	@Override
 	public void contextManagerChanged(ContextManagerEvent event) {
 	    if (event.isActiveContextsChanged()) {
-	        Set oldContexts = event.getPreviouslyActiveContextIds();
-	        Set newContexts = event.getContextManager().getActiveContextIds();
+			Set<?> oldContexts = event.getPreviouslyActiveContextIds();
+			Set<?> newContexts = event.getContextManager().getActiveContextIds();
 	        if (oldContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET) != 
 	            newContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET)) 
 	        {
@@ -1315,6 +1351,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext)
 	 */
+	@Override
 	public boolean show(ShowInContext context) {
 		ISelection selection = context.getSelection();
 		if (selection != null) {
@@ -1341,6 +1378,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.IShowInSource#getShowInContext()
 	 */
+	@Override
 	public ShowInContext getShowInContext() {
 		if (isActive()) { 
 			IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection();
@@ -1361,6 +1399,7 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds()
 	 */
+	@Override
 	public String[] getShowInTargetIds() {
 		if (isActive()) { 
 			IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection();
@@ -1381,12 +1420,14 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partClosed(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partVisible(IWorkbenchPartReference partRef) {
 		IWorkbenchPart part = partRef.getPart(false);
 		if (part == this) {
@@ -1405,12 +1446,14 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partOpened(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partActivated(IWorkbenchPartReference partRef) {
 		// Ensure that the system property matches the debug toolbar state.
 		// Bug 385400
@@ -1421,30 +1464,35 @@ public class LaunchView extends AbstractDebugView
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partBroughtToTop(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partDeactivated(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partHidden(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partInputChanged(IWorkbenchPartReference partRef) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible()
 	 */
+	@Override
 	protected void becomesVisible() {
 		super.becomesVisible();
 		getViewer().refresh();
@@ -1453,7 +1501,8 @@ public class LaunchView extends AbstractDebugView
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor)
      */
-    public void updateComplete(IViewerUpdate update) {
+    @Override
+	public void updateComplete(IViewerUpdate update) {
         if (!update.isCanceled()) {
             if (TreePath.EMPTY.equals(update.getElementPath())) {
                 updateFindAction();
@@ -1465,13 +1514,15 @@ public class LaunchView extends AbstractDebugView
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateStarted(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor)
      */
-    public void updateStarted(IViewerUpdate update) {
+    @Override
+	public void updateStarted(IViewerUpdate update) {
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesBegin()
      */
-    public synchronized void viewerUpdatesBegin() {
+    @Override
+	public synchronized void viewerUpdatesBegin() {
         IWorkbenchSiteProgressService progressService = 
             (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
@@ -1482,7 +1533,8 @@ public class LaunchView extends AbstractDebugView
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesComplete()
      */
-    public synchronized void viewerUpdatesComplete() {
+    @Override
+	public synchronized void viewerUpdatesComplete() {
         IWorkbenchSiteProgressService progressService = 
             (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
@@ -1490,7 +1542,8 @@ public class LaunchView extends AbstractDebugView
         }       
     }   
 	
-    public void modelChanged(IModelDelta delta, IModelProxy proxy) {
+    @Override
+	public void modelChanged(IModelDelta delta, IModelProxy proxy) {
         updateFindAction();
     }
     
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
index 3636de650..6bb242385 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2013 Wind River Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Wind River Systems - initial API and implementation
+ *     IBM Corporation = bug fixing
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.launch;
 
@@ -69,13 +70,15 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             fPath = path;
         }
         
-        public boolean equals(Object obj) {
+        @Override
+		public boolean equals(Object obj) {
             return obj instanceof Input && 
                 ((fPath == null && ((Input)obj).fPath == null) ||
                  (fPath != null && fPath.equals( ((Input)obj).fPath )));
         }
         
-        public int hashCode() {
+        @Override
+		public int hashCode() {
             return fPath == null ? 0 : fPath.hashCode();
         }
     }
@@ -86,19 +89,22 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         
         public Input fInput;  
         
-        public Object[] getChildren(TreePath parentPath) {
+        @Override
+		public Object[] getChildren(TreePath parentPath) {
             if (hasChildren(parentPath)) {
                 return new Object[] { fInput.fPath.getSegment(parentPath.getSegmentCount()) };
             }
             return EMPTY_ELEMENTS_ARRAY;
         }
 
-        public TreePath[] getParents(Object element) {
+        @Override
+		public TreePath[] getParents(Object element) {
             // Not supported
             return new TreePath[] { TreePath.EMPTY };
         }
 
-        public boolean hasChildren(TreePath parentPath) {
+        @Override
+		public boolean hasChildren(TreePath parentPath) {
             if ( parentPath.getSegmentCount() == 0) {
                 return fInput != null;
             } else if (fInput != null && 
@@ -121,7 +127,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             return false;
         }
 
-        public Object[] getElements(Object inputElement) {
+        @Override
+		public Object[] getElements(Object inputElement) {
             if (fInput != null && 
                 fInput.fPath != null) 
             {
@@ -131,11 +138,13 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             }
         }
 
-        public void dispose() {
+        @Override
+		public void dispose() {
             fInput = null;
         }
 
-        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+        @Override
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
             if (newInput instanceof Input) {
                 fInput = ((Input)newInput);
             } else {
@@ -145,7 +154,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
     }
         
     private class LabelProvider extends BaseLabelProvider implements ITreePathLabelProvider {
-        public void updateLabel(ViewerLabel label, TreePath elementPath) {
+        @Override
+		public void updateLabel(ViewerLabel label, TreePath elementPath) {
             if (fgEmptyDebugContextElement.equals(elementPath.getLastSegment())) {
                 label.setText(LaunchViewMessages.Breadcrumb_NoActiveContext);
                 label.setImage(null);
@@ -186,7 +196,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             fTreeViewerContextProvider.addDebugContextListener(this);
         }
         
-        public ISelection getActiveContext() {
+        @Override
+		public ISelection getActiveContext() {
             if (fBreadcrumbSelection != null && !fBreadcrumbSelection.isEmpty()) {
                 return fBreadcrumbSelection;
             } else {
@@ -200,11 +211,13 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             fTreeViewerContextProvider.removeDebugContextListener(this);
         }
         
-        public void debugContextChanged(DebugContextEvent event) {
+        @Override
+		public void debugContextChanged(DebugContextEvent event) {
             fire(new DebugContextEvent(this, getActiveContext(), event.getFlags()));
         }
         
-        public void selectionChanged(SelectionChangedEvent event) {
+        @Override
+		public void selectionChanged(SelectionChangedEvent event) {
             ISelection oldContext = getActiveContext();
             fBreadcrumbSelection = event.getSelection();
             if (!getActiveContext().equals(oldContext)) {
@@ -224,10 +237,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         fTreeViewerContextProvider.addDebugContextListener(this);
     }
     
-    protected void activateBreadcrumb() {
+    @Override
+	protected void activateBreadcrumb() {
     }
 
-    protected void deactivateBreadcrumb() {
+    @Override
+	protected void deactivateBreadcrumb() {
         if (fViewer.isDropDownOpen()) {
             Shell shell = fViewer.getDropDownShell();
             if (shell != null && !shell.isDisposed()) {
@@ -236,9 +251,11 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         }
     }
 
-    protected BreadcrumbViewer createViewer(Composite parent) {
+    @Override
+	protected BreadcrumbViewer createViewer(Composite parent) {
         fViewer = new BreadcrumbViewer(parent, SWT.NONE) {
-            protected Control createDropDown(Composite dropDownParent, IBreadcrumbDropDownSite site, TreePath path) {
+            @Override
+			protected Control createDropDown(Composite dropDownParent, IBreadcrumbDropDownSite site, TreePath path) {
                 return createDropDownControl(dropDownParent, site, path);
             }
         };
@@ -263,7 +280,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         MenuManager menuMgr = new MenuManager("#PopUp"); //$NON-NLS-1$
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager mgr) {
+            @Override
+			public void menuAboutToShow(IMenuManager mgr) {
                 fView.fillContextMenu(mgr);
             }
         });
@@ -276,27 +294,32 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         fView.addContextMenuManager(menuMgr);
 
         fViewer.addMenuDetectListener(new MenuDetectListener() {
-            public void menuDetected(MenuDetectEvent event) {
+            @Override
+			public void menuDetected(MenuDetectEvent event) {
                 menu.setLocation(event.x + 10, event.y + 10);
                 menu.setVisible(true);
                 while (!menu.isDisposed() && menu.isVisible()) {
-                    if (!menu.getDisplay().readAndDispatch())
-                        menu.getDisplay().sleep();
+                    if (!menu.getDisplay().readAndDispatch()) {
+						menu.getDisplay().sleep();
+					}
                 }
             }
         });
     }
    
-    protected Object getCurrentInput() {
+    @Override
+	protected Object getCurrentInput() {
         return fBreadcrumbInput;
     }
 
-    protected boolean open(ISelection selection) {
+    @Override
+	protected boolean open(ISelection selection) {
         // Let the drop-down control implementation itself handle activating a new context.
         return false;
     }
 
-    public void dispose() {
+    @Override
+	public void dispose() {
         fBreadcrumbContextProvider = null;
         fTreeViewerContextProvider.removeDebugContextListener(this);
         fTreeViewer.removeLabelUpdateListener(this);
@@ -305,7 +328,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         super.dispose();
     }
 
-    public void debugContextChanged(DebugContextEvent event) {
+    @Override
+	public void debugContextChanged(DebugContextEvent event) {
         if (fView.isBreadcrumbVisible()) {
             fBreadcrumbInput = new Input(getPathForSelection(event.getContext())); 
             if ((event.getFlags() & DebugContextEvent.ACTIVATED) != 0) {
@@ -321,10 +345,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         }
     }
     
-    public void labelUpdateStarted(ILabelUpdate update) {
+    @Override
+	public void labelUpdateStarted(ILabelUpdate update) {
     }
     
-    public void labelUpdateComplete(ILabelUpdate update) {
+    @Override
+	public void labelUpdateComplete(ILabelUpdate update) {
         if (fBreadcrumbInput != null && fBreadcrumbInput.fPath != null) {
             if (fBreadcrumbInput.fPath.startsWith(update.getElementPath(), null)) {
                 synchronized (this) {
@@ -334,10 +360,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         }
     }
     
-    public void labelUpdatesBegin() {
+    @Override
+	public void labelUpdatesBegin() {
     }
     
-    public void labelUpdatesComplete() {
+    @Override
+	public void labelUpdatesComplete() {
         boolean refresh = false;
         synchronized(this) {
             refresh = fRefreshBreadcrumb;
@@ -346,7 +374,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
         if (fView.isBreadcrumbVisible() && refresh) {
             new UIJob(fViewer.getControl().getDisplay(), "refresh breadcrumb") { //$NON-NLS-1$
                 { setSystem(true); }
-                public IStatus runInUIThread(IProgressMonitor monitor) {
+                @Override
+				public IStatus runInUIThread(IProgressMonitor monitor) {
                     refresh();
                     return Status.OK_STATUS;
                 }
@@ -379,7 +408,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
             
             SubTreeModelViewer fDropDownViewer;
             
-            protected TreeViewer createTreeViewer(Composite composite, int style, final TreePath path) {
+            @Override
+			protected TreeViewer createTreeViewer(Composite composite, int style, final TreePath path) {
                 fDropDownViewer = new SubTreeModelViewer(
                     composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL | SWT.POP_UP, 
                     fTreeViewer.getPresentationContext());
@@ -400,7 +430,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
                     final ModelDelta prunedDelta = new ModelDelta(launchViewInput, IModelDelta.NO_CHANGE);
                     stateDelta.accept(new IModelDeltaVisitor() {
                         ModelDelta copy = prunedDelta;
-                        public boolean visit(IModelDelta delta, int depth) {
+                        @Override
+						public boolean visit(IModelDelta delta, int depth) {
                             TreePath deltaPath = getViewerTreePath(delta);
                             if (deltaPath.getSegmentCount() == 0) {
                                 // skip copying the root element, only copy it's child count
@@ -423,7 +454,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
                         }
                         
                         private TreePath getViewerTreePath(IModelDelta node) {
-                            ArrayList list = new ArrayList();
+							ArrayList<Object> list = new ArrayList<Object>();
                             IModelDelta parentDelta = node.getParentDelta();
                             while (parentDelta != null) {
                                 list.add(0, node.getElement());
@@ -439,13 +470,18 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
                 fDropDownViewer.updateViewer(stateDelta);
                 
                 fDropDownViewer.addLabelUpdateListener(new ILabelUpdateListener() {
-                    public void labelUpdateComplete(ILabelUpdate update) {}
-                    public void labelUpdatesBegin() {}
-                    public void labelUpdateStarted(ILabelUpdate update) {}
-                    public void labelUpdatesComplete() {
+                    @Override
+					public void labelUpdateComplete(ILabelUpdate update) {}
+                    @Override
+					public void labelUpdatesBegin() {}
+                    @Override
+					public void labelUpdateStarted(ILabelUpdate update) {}
+                    @Override
+					public void labelUpdatesComplete() {
                         new UIJob(fViewer.getControl().getDisplay(), "resize breadcrub dropdown") { //$NON-NLS-1$
                             { setSystem(true); }
-                            public IStatus runInUIThread(IProgressMonitor monitor) {
+                            @Override
+							public IStatus runInUIThread(IProgressMonitor monitor) {
                                 site.updateSize();
                                 return Status.OK_STATUS;
                             }
@@ -456,7 +492,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
                 return fDropDownViewer;
             }
 
-            protected void openElement(ISelection selection) {
+            @Override
+			protected void openElement(ISelection selection) {
                 if (fTreeViewer.getControl().isDisposed()) {
                     return;
                 }
@@ -488,7 +525,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
                     
                     // Add the IModelDelta.FORCE flag to override the current selection in view.
                     rootDelta.accept(new IModelDeltaVisitor(){
-                        public boolean visit(IModelDelta paramDelta, int depth) {
+                        @Override
+						public boolean visit(IModelDelta paramDelta, int depth) {
                             if ((paramDelta.getFlags() & IModelDelta.SELECT) != 0) {
                                 ((ModelDelta)paramDelta).setFlags(paramDelta.getFlags() | IModelDelta.FORCE);
                             }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java
index dbed5e238..cffa5ecb0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Wind River Systems and others.
+ * Copyright (c) 2009, 2013 Wind River Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Wind River Systems - initial API and implementation
+ *     IBM Corporation = bug fixing
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.launch;
 
@@ -36,7 +37,8 @@ import org.eclipse.swt.widgets.Widget;
  */
 public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipboardActionDelegate {
 
-    protected TreeItem[] getSelectedItems(TreeModelViewer clientViewer) {
+    @Override
+	protected TreeItem[] getSelectedItems(TreeModelViewer clientViewer) {
         LaunchView view = (LaunchView)getView();
         if (view.isBreadcrumbVisible()) {
             ISelection selection = getSelection();
@@ -51,9 +53,9 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo
         } else {
         	// Return tree selection plus children.
     	    TreeItem[] selection = clientViewer.getTree().getSelection();
-    	    Set set = new HashSet();
+			Set<Widget> set = new HashSet<Widget>();
     	    collectChildItems(set, selection);
-            return (TreeItem[])set.toArray(new TreeItem[set.size()]);
+            return set.toArray(new TreeItem[set.size()]);
         }
     }
 
@@ -66,7 +68,7 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo
      */
     private TreeItem[] getSelectedItemsInTreeViewer(TreeModelViewer viewer, TreePath path) {
         Widget item = viewer.findItem(path);
-        Set set = new HashSet();
+		Set<Widget> set = new HashSet<Widget>();
         if (item instanceof TreeItem) {
         	set.add(item);
         	if (((TreeItem) item).getExpanded()) {
@@ -75,10 +77,10 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo
         } else if (item instanceof Tree) {
         	collectChildItems(set, ((Tree)item).getItems());
         } 
-        return (TreeItem[])set.toArray(new TreeItem[set.size()]);
+        return set.toArray(new TreeItem[set.size()]);
     }
     
-    private void collectChildItems(Set set, TreeItem[] items) {
+	private void collectChildItems(Set<Widget> set, TreeItem[] items) {
     	if (items == null) {
     		return;
     	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java
index 78f007d56..06b9c4dea 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java
@@ -36,18 +36,21 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see org.eclipse.ui.IEditorPart#doSave(IProgressMonitor)
 	 */
+	@Override
 	public void doSave(IProgressMonitor monitor) {
 	}
 
 	/**
 	 * @see org.eclipse.ui.IEditorPart#doSaveAs()
 	 */
+	@Override
 	public void doSaveAs() {
 	}
 
 	/**
 	 * @see org.eclipse.ui.IEditorPart#init(IEditorSite, IEditorInput)
 	 */
+	@Override
 	public void init(IEditorSite site, IEditorInput input) {
 			setSite(site);
 			setInput(input);
@@ -56,6 +59,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see org.eclipse.ui.IEditorPart#isDirty()
 	 */
+	@Override
 	public boolean isDirty() {
 		return false;
 	}
@@ -63,6 +67,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see org.eclipse.ui.IEditorPart#isSaveAsAllowed()
 	 */
+	@Override
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
@@ -70,6 +75,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
 	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		fText = new Text(parent,SWT.MULTI|SWT.READ_ONLY|SWT.WRAP);
 		fText.setForeground(JFaceColors.getErrorText(fText.getDisplay()));
@@ -82,6 +88,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
 	 */
+	@Override
 	public void setFocus() {
 		if (fText != null) {
 			fText.setFocus();
@@ -91,6 +98,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor
 	/**
 	 * @see IReusableEditor#setInput(org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public void setInput(IEditorInput input) {
 		super.setInput(input);
 		setPartName(input.getName());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java
index daa0f90ef..6d94c489a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,6 @@
 package org.eclipse.debug.internal.ui.views.launch;
 
 
-import com.ibm.icu.text.MessageFormat;
-
 import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IStackFrame;
@@ -23,6 +21,8 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * Editor input for a stack frame for which source could not be located.
  * 
@@ -56,6 +56,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor
 	/**
 	 * @see org.eclipse.ui.IEditorInput#exists()
 	 */
+	@Override
 	public boolean exists() {
 		return false;
 	}
@@ -63,6 +64,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor
 	/**
 	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
 	 */
+	@Override
 	public ImageDescriptor getImageDescriptor() {
 		return DebugUITools.getDefaultImageDescriptor(fFrame);
 	}
@@ -70,6 +72,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor
 	/**
 	 * @see org.eclipse.ui.IEditorInput#getName()
 	 */
+	@Override
 	public String getName() {
 		try {
 			return fFrame.getName();
@@ -81,6 +84,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor
 	/**
 	 * @see org.eclipse.ui.IEditorInput#getPersistable()
 	 */
+	@Override
 	public IPersistableElement getPersistable() {
 		return null;
 	}
@@ -88,8 +92,9 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor
 	/**
 	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
 	 */
+	@Override
 	public String getToolTipText() {
-		return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2,new String[] {fFrameText}); 
+		return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2, new Object[] { fFrameText });
 	}
 
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
index ea33cf20d..639f708ef 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
@@ -32,6 +32,7 @@ public class StandardDecoration extends Decoration {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.internal.ui.views.launch.Decoration#remove()
 	 */
+	@Override
 	public void remove() {
 		fPresentation.removeAnnotations(fEditor, fThread);
 	}
@@ -39,6 +40,7 @@ public class StandardDecoration extends Decoration {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.internal.ui.views.launch.Decoration#getThread()
 	 */
+	@Override
 	public IThread getThread() {
 		return fThread;
 	}