Increased warning levels for ui-plugin, fixed warnings.

10 files changed, 25 insertions, 13 deletions

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
index 2fded570869..2153d7bc54c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
@@ -97,9 +97,7 @@ public class CHContentProvider extends AsyncTreeContentProvider {
 				if (fComputeReferencedBy) {
 					return asyncronouslyComputeReferencedBy(node);
 				}
-				else {
-					return asyncronouslyComputeRefersTo(node);
-				}
+				return asyncronouslyComputeRefersTo(node);
 			}
 		} catch (CoreException e) {
 			CUIPlugin.log(e);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
index b31c14be871..8fdbcb61692 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
@@ -56,7 +56,7 @@ public class CHDropTargetListener implements DropTargetListener {
 	private ICElement checkLocalSelection() {
 		ISelection sel= LocalSelectionTransfer.getTransfer().getSelection();
 		if (sel instanceof IStructuredSelection) {
-			for (Iterator iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) {
+			for (Iterator<?> iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) {
 				Object element = iter.next();
 				if (element instanceof ICElement) {
 					return (ICElement) element;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java
index bb6355a3410..162257f92e3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java
@@ -52,6 +52,7 @@ public class CHHistoryAction extends Action {
 	/*
 	 * @see Action#run()
 	 */
+	@Override
 	public void run() {
 		fViewPart.setInput(fElement);
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java
index 1ba051eae6c..c59b5ea3b6c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java
@@ -34,6 +34,7 @@ public class CHHistoryDropDownAction extends Action implements IMenuCreator {
 			fView= view;
 		}
 			
+		@Override
 		public void run() {
 			fView.setHistoryEntries(new ICElement[0]);
 			fView.setInput(null);
@@ -99,6 +100,7 @@ public class CHHistoryDropDownAction extends Action implements IMenuCreator {
 		item.fill(parent, -1);
 	}
 
+	@Override
 	public void run() {
 		(new CHHistoryListAction(fHierarchyView)).run();
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
index 0ac4f52af4a..2b9d284d810 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
@@ -121,7 +121,7 @@ public class CHHistoryListAction extends Action {
 		
 		private void doSelectionChanged() {
 			StatusInfo status= new StatusInfo();
-			List selected= fHistoryList.getSelectedElements();
+			List<?> selected= fHistoryList.getSelectedElements();
 			if (selected.size() != 1) {
 				status.setError(""); //$NON-NLS-1$
 				fResult= null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java
index 5f00627d158..d5905bfeaf9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java
@@ -26,18 +26,22 @@ public class CHMultiDefChildNode extends CHNode {
     	super(parent, fileOfReferences, timestamp, decl);
     }
     
+	@Override
 	public int getReferenceCount() {
 		return getParent().getReferenceCount();
 	}
 	
+	@Override
 	public CHReferenceInfo getReference(int idx) {
 		return getParent().getReference(idx);
 	}
 	
+	@Override
 	public int getFirstReferenceOffset() {
 		return getParent().getFirstReferenceOffset();
 	}
 	
+	@Override
 	public void addReference(CHReferenceInfo info) {
 		assert false;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
index 5a025bd39ac..aa19b549e4f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
@@ -34,19 +34,23 @@ public class CHMultiDefNode extends CHNode {
 		return fChildren;
 	}
 
+	@Override
 	public boolean isMacro() {
 		return fChildren[0].isMacro();
 	}
 
+	@Override
 	public boolean isVariableOrEnumerator() {
 		return fChildren[0].isVariableOrEnumerator();
 	}
 
 	
+	@Override
 	public ICElement getOneRepresentedDeclaration() {
 		return fChildren[0].getRepresentedDeclaration();
 	}
 
+	@Override
 	public boolean isMultiDef() {
 		return true;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index b40318df629..95482531e03 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -770,7 +770,7 @@ public class CHViewPart extends ViewPart {
 	private CHNode selectionToNode(ISelection selection) {
 		if (selection instanceof IStructuredSelection) {
 			IStructuredSelection ss= (IStructuredSelection) selection;
-			for (Iterator iter = ss.iterator(); iter.hasNext(); ) {
+			for (Iterator<?> iter = ss.iterator(); iter.hasNext(); ) {
 				Object cand= iter.next();
 				if (cand instanceof CHNode) {
 					return (CHNode) cand;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java
index 866764a8c69..d9fc6d51b6c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java
@@ -60,7 +60,8 @@ public class CallHierarchyUI {
         	final Display display= Display.getCurrent();
 
         	Job job= new Job(CHMessages.CallHierarchyUI_label) {
-        		protected IStatus run(IProgressMonitor monitor) {
+        		@Override
+				protected IStatus run(IProgressMonitor monitor) {
         			final ICElement[] elems= findDefinitions(input);
 					if (elems != null && elems.length > 0) {
 						display.asyncExec(new Runnable() {
@@ -120,6 +121,7 @@ public class CallHierarchyUI {
 				final Display display= Display.getCurrent();
 
 				Job job= new Job(CHMessages.CallHierarchyUI_label) {
+					@Override
 					protected IStatus run(IProgressMonitor monitor) {
 						try {
 							StatusLineHandler.clearStatusLine(editor.getSite());
@@ -183,9 +185,7 @@ public class CallHierarchyUI {
 				}
 			}
 			finally {
-				if (index != null) {
-					index.releaseReadLock();
-				}
+				index.releaseReadLock();
 			}
 		}
 		catch (CoreException e) {
@@ -222,9 +222,7 @@ public class CallHierarchyUI {
 					}
 				}
 				finally {
-					if (index != null) {
-						index.releaseReadLock();
-					}
+					index.releaseReadLock();
 				}
 			}
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
index f382fb054c8..6dea19a1fdb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
@@ -42,10 +42,12 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
 		setEnabled(fEditor != null && CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()) != null);
 	}
 
+	@Override
 	public void run(ITextSelection sel) {
 		CallHierarchyUI.open(fEditor, sel);
 	}
 	
+	@Override
 	public void run(IStructuredSelection selection) {
 		if (!selection.isEmpty()) {
 			Object selectedObject= selection.getFirstElement();
@@ -56,9 +58,11 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
 		}
 	}
 
+	@Override
 	public void selectionChanged(ITextSelection sel) {
 	}
 			
+	@Override
 	public void selectionChanged(IStructuredSelection selection) {
 		if (selection.isEmpty()) {
 			setEnabled(false);
@@ -88,6 +92,7 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
 		return false;
 	}
 
+	@SuppressWarnings("unchecked")
 	private Object getAdapter(Object object, Class desiredClass) {
 		if (desiredClass.isInstance(object)) {
 			return object;