Target Explorer: Fix Bug 422850 - Target Explorer Build Failures against

Eclipse SDK 4.4m4 Luna

7 files changed, 52 insertions, 37 deletions

diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/.settings/org.eclipse.jdt.core.prefs b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/.settings/org.eclipse.jdt.core.prefs
index 0e57f0904..ed6c703d1 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Fri Oct 07 16:15:14 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/Application.java b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/Application.java
index 487e56328..17c2f55f3 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/Application.java
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/Application.java
@@ -33,7 +33,8 @@ public class Application implements IApplication {
 	/* (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
 	 */
-	public Object start(IApplicationContext context) throws Exception {
+	@Override
+    public Object start(IApplicationContext context) throws Exception {
         Display display = createDisplay();
 
         try {
@@ -75,13 +76,15 @@ public class Application implements IApplication {
 	/* (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#stop()
 	 */
-	public void stop() {
+	@Override
+    public void stop() {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
 		if (workbench == null) return;
 
 		final Display display = workbench.getDisplay();
 		display.syncExec(new Runnable() {
-			public void run() {
+			@Override
+            public void run() {
 				if (!display.isDisposed())
 					workbench.close();
 			}
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationActionBarAdvisor.java b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationActionBarAdvisor.java
index 330faf78e..58a0cddf5 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationActionBarAdvisor.java
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationActionBarAdvisor.java
@@ -217,13 +217,15 @@ public final class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 		// listener for the "close editors automatically"
 		// preference change
 		propPrefListener = new IPropertyChangeListener() {
-			@SuppressWarnings("synthetic-access")
+			@Override
+            @SuppressWarnings("synthetic-access")
 			public void propertyChange(PropertyChangeEvent event) {
 				if (event.getProperty().equals(IPreferenceConstants.REUSE_EDITORS_BOOLEAN)) {
 					if (window.getShell() != null && !window.getShell().isDisposed()) {
 						// this property change notification could be from a non-UI thread
 						window.getShell().getDisplay().syncExec(new Runnable() {
-							public void run() {
+							@Override
+                            public void run() {
 								updatePinActionToolbar();
 							}
 						});
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchAdvisor.java b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchAdvisor.java
index c27374f4f..16d544c8e 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchAdvisor.java
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchAdvisor.java
@@ -9,12 +9,9 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.rcp.application;
 
-import java.text.Collator;
-
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.util.Policy;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
@@ -50,7 +47,8 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 		workbenchAdvisor = this;
 
 		Listener closeListener = new Listener() {
-			public void handleEvent(Event event) {
+			@Override
+            public void handleEvent(Event event) {
 				boolean doExit = ApplicationWorkbenchWindowAdvisor.promptOnExit(null);
 				event.doit = doExit;
 				if (!doExit) event.type = SWT.None;
@@ -74,8 +72,6 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
 		// show Help button in JFace dialogs
 		TrayDialog.setDialogHelpAvailable(true);
-
-		Policy.setComparator(Collator.getInstance());
 	}
 
 	/*
@@ -113,7 +109,8 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
 			boolean currentHighContrast = Display.getCurrent().getHighContrast();
 
-			public void handleEvent(org.eclipse.swt.widgets.Event event) {
+			@Override
+            public void handleEvent(org.eclipse.swt.widgets.Event event) {
 				if (Display.getCurrent().getHighContrast() == currentHighContrast) return;
 
 				currentHighContrast = !currentHighContrast;
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchWindowAdvisor.java b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchWindowAdvisor.java
index 8fc36fba6..793132c46 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchWindowAdvisor.java
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp.application/src/org/eclipse/tcf/te/rcp/application/ApplicationWorkbenchWindowAdvisor.java
@@ -66,7 +66,8 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	private String lastEditorTitle = ""; //$NON-NLS-1$
 
 	private IPropertyListener editorPropertyListener = new IPropertyListener() {
-		@SuppressWarnings("synthetic-access")
+		@Override
+        @SuppressWarnings("synthetic-access")
 		public void propertyChanged(Object source, int propId) {
 			if (propId == IWorkbenchPartConstants.PROP_TITLE) {
 				if (lastActiveEditor != null) {
@@ -190,15 +191,18 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	private void hookTitleUpdateListeners(IWorkbenchWindowConfigurer configurer) {
 		// hook up the listeners to update the window title
 		configurer.getWindow().addPageListener(new IPageListener() {
-			public void pageActivated(IWorkbenchPage page) {
+			@Override
+            public void pageActivated(IWorkbenchPage page) {
 				updateTitle(false);
 			}
 
-			public void pageClosed(IWorkbenchPage page) {
+			@Override
+            public void pageClosed(IWorkbenchPage page) {
 				updateTitle(false);
 			}
 
-			public void pageOpened(IWorkbenchPage page) {
+			@Override
+            public void pageOpened(IWorkbenchPage page) {
 				// do nothing
 			}
 		});
@@ -219,43 +223,51 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 			}
 		});
 		configurer.getWindow().getPartService().addPartListener(new IPartListener2() {
-			public void partActivated(IWorkbenchPartReference ref) {
+			@Override
+            public void partActivated(IWorkbenchPartReference ref) {
 				if (ref instanceof IEditorReference) {
 					updateTitle(false);
 				}
 			}
 
-			public void partBroughtToTop(IWorkbenchPartReference ref) {
+			@Override
+            public void partBroughtToTop(IWorkbenchPartReference ref) {
 				if (ref instanceof IEditorReference) {
 					updateTitle(false);
 				}
 			}
 
-			public void partClosed(IWorkbenchPartReference ref) {
+			@Override
+            public void partClosed(IWorkbenchPartReference ref) {
 				updateTitle(false);
 			}
 
-			public void partDeactivated(IWorkbenchPartReference ref) {
+			@Override
+            public void partDeactivated(IWorkbenchPartReference ref) {
 				// do nothing
 			}
 
-			public void partOpened(IWorkbenchPartReference ref) {
+			@Override
+            public void partOpened(IWorkbenchPartReference ref) {
 				// do nothing
 			}
 
-			public void partHidden(IWorkbenchPartReference ref) {
+			@Override
+            public void partHidden(IWorkbenchPartReference ref) {
 				if (ref.getPart(false) == lastActiveEditor && lastActiveEditor != null) {
 					updateTitle(true);
 				}
 			}
 
-			public void partVisible(IWorkbenchPartReference ref) {
+			@Override
+            public void partVisible(IWorkbenchPartReference ref) {
 				if (ref.getPart(false) == lastActiveEditor && lastActiveEditor != null) {
 					updateTitle(false);
 				}
 			}
 
-			public void partInputChanged(IWorkbenchPartReference ref) {
+			@Override
+            public void partInputChanged(IWorkbenchPartReference ref) {
 				// do nothing
 			}
 		});
@@ -353,10 +365,11 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.ui.application.WorkbenchAdvisor#createEmptyWindowContents(org.eclipse.ui.application.IWorkbenchWindowConfigurer,
-	 *      org.eclipse.swt.widgets.Composite)
+	 * @see org.eclipse.ui.application.WorkbenchAdvisor#createEmptyWindowContents(org.eclipse.ui.application.IWorkbenchWindowConfigurer, org.eclipse.swt.widgets.Composite)
 	 */
-	@Override
+	@SuppressWarnings("deprecation")
+    @Deprecated
+    @Override
 	public Control createEmptyWindowContents(Composite parent) {
 		final IWorkbenchWindow window = getWindowConfigurer().getWindow();
 		Composite composite = new Composite(parent, SWT.NONE);
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/.settings/org.eclipse.jdt.core.prefs b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/.settings/org.eclipse.jdt.core.prefs
index 3f2f7b843..ed6c703d1 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Fri Oct 07 16:15:09 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/src/org/eclipse/tcf/te/rcp/activator/ProductBundleActivator.java b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/src/org/eclipse/tcf/te/rcp/activator/ProductBundleActivator.java
index 18b1456d3..97e5697de 100644
--- a/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/src/org/eclipse/tcf/te/rcp/activator/ProductBundleActivator.java
+++ b/target_explorer/experimental/plugins/org.eclipse.tcf.te.rcp/src/org/eclipse/tcf/te/rcp/activator/ProductBundleActivator.java
@@ -41,14 +41,16 @@ public class ProductBundleActivator implements BundleActivator {
 	/* (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
-	public void start(BundleContext bundleContext) throws Exception {
+	@Override
+    public void start(BundleContext bundleContext) throws Exception {
 		ProductBundleActivator.context = bundleContext;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
-	public void stop(BundleContext bundleContext) throws Exception {
+	@Override
+    public void stop(BundleContext bundleContext) throws Exception {
 		ProductBundleActivator.context = null;
 	}
 }