diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
index c3c1e4f515d..193bdcd2da7 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
@@ -42,6 +42,7 @@ public class LexicalSortingAction extends Action {
 		valueChanged(checked, false);
 	}
 
+	@Override
 	public void run() {
 		valueChanged(isChecked(), true);
 	}
@@ -59,10 +60,7 @@ public class LexicalSortingAction extends Action {
 
 	private class LexicalMakefileSorter extends ViewerSorter {
 
-		public boolean isSorterProperty(Object element, Object property) {
-			return true;
-		}
-
+		@Override
 		public int category(Object obj) {
 			if (obj instanceof IDirective) {
 				IDirective directive = (IDirective) obj;
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElement.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElement.java
index 643f1925505..b52c1ce2f5f 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElement.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElement.java
@@ -162,15 +162,15 @@ public class DiscoveredElement {
 	/**
 	 * @return children of the discovered element 
 	 */
-	public Object[] getChildren() {
+	public DiscoveredElement[] getChildren() {
 		switch(fEntryKind) {
 			case INCLUDE_PATH:
 			case SYMBOL_DEFINITION:
 			case INCLUDE_FILE:
 			case MACROS_FILE:
-				return new Object[0];
+				return new DiscoveredElement[0];
 		}
-		return fChildren.toArray();
+		return fChildren.toArray(new DiscoveredElement[fChildren.size()]);
 	}
 
 	public boolean hasChildren() {
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
index acaad96748c..26a096e0ca8 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -58,6 +58,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
 	 */
+	@Override
 	public Image getImage(Object element) {
 		if (element instanceof DiscoveredElement) {
 			DiscoveredElement elem = (DiscoveredElement) element;
@@ -68,10 +69,6 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 		}
 		return super.getImage(element);
 	}
-	/**
-	 * @param elem
-	 * @return
-	 */
 	private Image composeImage(DiscoveredElement elem) {
 		Image image = null;
 		switch (elem.getEntryKind()) {
@@ -106,6 +103,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
 	 */
+	@Override
 	public String getText(Object element) {
 		if (element instanceof DiscoveredElement) {
 			DiscoveredElement elem = (DiscoveredElement) element;
@@ -129,10 +127,6 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 		return super.getText(element);
 	}
 
-	/**
-	 * @param annotation
-	 * @return
-	 */
 	private String addAnnotation(String annotation) {
 		return " (" + annotation + ")";	//$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -181,6 +175,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
 		 */
+		@Override
 		protected void drawCompositeImage(int width, int height) {
 			ImageData bg = fBaseImage.getImageData();
 			if (bg == null) {
@@ -204,6 +199,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
 		 */
+		@Override
 		protected Point getSize() {
 			if (fSize == null) {
 				ImageData data = fBaseImage.getImageData();
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementSorter.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementSorter.java
index cd26b427893..7428f921524 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementSorter.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementSorter.java
@@ -29,6 +29,7 @@ public class DiscoveredElementSorter extends ViewerSorter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
 	 */
+	@Override
 	public int category(Object element) {
 		if (element instanceof DiscoveredElement) {
 			DiscoveredElement elem = (DiscoveredElement) element;
@@ -50,6 +51,7 @@ public class DiscoveredElementSorter extends ViewerSorter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ViewerSorter#sort(org.eclipse.jface.viewers.Viewer, java.lang.Object[])
 	 */
+	@Override
 	public void sort(Viewer viewer, Object[] elements) {
 		if (elements.length > 0 && elements[0] instanceof DiscoveredElement) {
 			DiscoveredElement firstElem = (DiscoveredElement) elements[0];