Cleaned up compiler warnings

6 files changed, 20 insertions, 34 deletions

diff --git a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathContentProvider.java b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathContentProvider.java
index 21cef0280..eada0d9ff 100644
--- a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathContentProvider.java
+++ b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathContentProvider.java
@@ -41,12 +41,12 @@ public class AntClasspathContentProvider extends ExternalToolsContentProvider {
 			}
 		}
 		elements.add(o);
-		viewer.add(o);
+		tableViewer.add(o);
 	}
 
 	public void removeAll() {
-		if (viewer != null) {
-			viewer.remove(elements.toArray());
+		if (tableViewer != null) {
+			tableViewer.remove(elements.toArray());
 		}
 		elements = new ArrayList(5);
 	}
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java
index 337c37296..dea5ad16d 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java
@@ -37,7 +37,7 @@ public class ExternalToolVariableForm {
 	private String variableListLabelText;
 	private ExternalToolVariable[] variables;
 	private IVariableComponent[] components;
-	private IGroupDialogPage page;
+	private IGroupDialogPage dialogPage;
 	
 	private Label variableListLabel;
 	private List variableList;
@@ -61,7 +61,7 @@ public class ExternalToolVariableForm {
 	public Composite createContents(Composite parent, IGroupDialogPage page) {
 		Font font = parent.getFont();
 		
-		this.page = page;
+		dialogPage = page;
 		
 		Composite mainComposite = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
@@ -117,7 +117,7 @@ public class ExternalToolVariableForm {
 		for (int i = 0; i < variables.length; i++) {
 			ExternalToolVariable var = variables[i];
 			components[i] = var.getComponent();
-			components[i].createContents(variableComposite, var.getTag(), page);
+			components[i].createContents(variableComposite, var.getTag(), dialogPage);
 		}
 	}
 	
@@ -208,7 +208,7 @@ public class ExternalToolVariableForm {
 		if (activeComponentIndex != -1 && setValue) {
 			components[activeComponentIndex].setVariableValue(value);
 		}
-		page.updateValidState();
+		dialogPage.updateValidState();
 	}
 
 	/**
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsContentProvider.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsContentProvider.java
index 0e3432c84..2ff6f74dd 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsContentProvider.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsContentProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.ViewerSorter;
  */
 public class ExternalToolsContentProvider implements IStructuredContentProvider {
 	protected List elements = new ArrayList();
-	protected TableViewer viewer;
+	protected TableViewer tableViewer;
 	private ViewerSorter sorter= null;
 
 	public void add(Object o) {
@@ -35,7 +35,7 @@ public class ExternalToolsContentProvider implements IStructuredContentProvider
 			return;
 		}
 		elements.add(o);
-		viewer.add(o);
+		tableViewer.add(o);
 	}
 
 	public void dispose() {
@@ -46,8 +46,8 @@ public class ExternalToolsContentProvider implements IStructuredContentProvider
 	}
 
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		this.viewer = (TableViewer) viewer;
-		this.viewer.setSorter(getSorter());
+		tableViewer = (TableViewer) viewer;
+		tableViewer.setSorter(getSorter());
 		elements.clear();
 		if (newInput != null) {
 			List list;
@@ -62,13 +62,13 @@ public class ExternalToolsContentProvider implements IStructuredContentProvider
 
 	public void remove(Object o) {
 		elements.remove(o);
-		viewer.remove(o);
+		tableViewer.remove(o);
 	}
 	
 	public void remove(IStructuredSelection selection) {
 		Object[] array= selection.toArray();
 		elements.removeAll(Arrays.asList(array));
-		viewer.remove(array);
+		tableViewer.remove(array);
 	}
 	
 	protected ViewerSorter getSorter() {
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java
index 4ed2b622a..613907b44 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java
@@ -55,10 +55,10 @@ public class MessageDialogWithToggle extends MessageDialog {
 	}
 	
 	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		fToggleButton = createCheckButton(dialogArea, fToggleMessage);
+		Composite area = (Composite) super.createDialogArea(parent);
+		fToggleButton = createCheckButton(area, fToggleMessage);
 		getToggleButton().setSelection(fStore.getBoolean(fPreferenceKey));
-		return dialogArea;
+		return area;
 	}
 
 	/**
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/StatusDialog.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/StatusDialog.java
index 2432d8ae9..8f4d832e8 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/StatusDialog.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/StatusDialog.java
@@ -39,29 +39,15 @@ public abstract class StatusDialog extends Dialog {
 	private String fTitle;
 	private Image fImage;
 
-	private boolean fStatusLineAboveButtons;
-
 	/**
 	 * Creates an instane of a status dialog.
 	 */
 	public StatusDialog(Shell parent) {
 		super(parent);
-		fStatusLineAboveButtons= false;
 		fLastStatus= new StatusInfo();
 	}
 
 	/**
-	 * Specifies whether status line appears to the left of the buttons (default)
-	 * or above them.
-	 *
-	 * @param aboveButtons if <code>true</code> status line is placed above buttons; if
-	 * 	<code>false</code> to the right
-	 */
-	public void setStatusLineAboveButtons(boolean aboveButtons) {
-		fStatusLineAboveButtons= aboveButtons;
-	}
-
-	/**
 	 * Update the dialog's status line to reflect the given status.
 	 * It is save to call this method before the dialog has been opened.
 	 */
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variable/AbstractVariableComponent.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variable/AbstractVariableComponent.java
index 0c5558ecb..639dc5f23 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variable/AbstractVariableComponent.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variable/AbstractVariableComponent.java
@@ -26,7 +26,7 @@ import org.eclipse.ui.externaltools.internal.model.ToolUtil;
 public abstract class AbstractVariableComponent implements IVariableComponent {
 	
 	protected Group mainGroup;
-	protected IGroupDialogPage page;
+	protected IGroupDialogPage dialogPage;
 	private boolean isValid = true;
 
 	/**
@@ -40,14 +40,14 @@ public abstract class AbstractVariableComponent implements IVariableComponent {
 	 * Returns the dialog page this component is part of
 	 */
 	protected IGroupDialogPage getPage() {
-		return page;
+		return dialogPage;
 	}
 
 	/**
 	 * @see IVariableComponent#createContents(Composite, String, IGroupDialogPage)
 	 */
 	public void createContents(Composite parent, String varTag, IGroupDialogPage page) {
-		this.page= page;
+		dialogPage= page;
 		
 		// main composite
 		mainGroup = new Group(parent, SWT.NONE);
@@ -84,7 +84,7 @@ public abstract class AbstractVariableComponent implements IVariableComponent {
 	protected void setIsValid(boolean isValid) {
 		if (isValid() != isValid) {
 			this.isValid= isValid;
-			this.page.updateValidState();
+			this.dialogPage.updateValidState();
 		}
 	}