Target Explorer: Fix findbugs warnings

7 files changed, 25 insertions, 31 deletions

diff --git a/admin/findbugs-exclude.xml b/admin/findbugs-exclude.xml
index 42d66cde0..1ae521d82 100644
--- a/admin/findbugs-exclude.xml
+++ b/admin/findbugs-exclude.xml
@@ -149,7 +149,7 @@
 		</Or>
 	</Match>
 
-		<!-- Ignore BC_VACUOUS_INSTANCEOF -->
+	<!-- Ignore BC_VACUOUS_INSTANCEOF -->
 	<Match>
 		<Bug pattern="BC_VACUOUS_INSTANCEOF"/>
 		<Class name="org.eclipse.tcf.te.runtime.stepper.extensions.StepGroup"/>
@@ -169,7 +169,10 @@
 	<!-- Ignore WA_NOT_IN_LOOP in ProcessOutputReaderThread -->
 	<Match>
 		<Bug pattern="WA_NOT_IN_LOOP"/>
-		<Class name="org.eclipse.tcf.te.runtime.processes.ProcessOutputReaderThread"/>
+		<Or>
+			<Class name="org.eclipse.tcf.te.runtime.processes.ProcessOutputReaderThread"/>
+			<Class name="org.eclipse.tcf.te.tcf.launch.cdt.utils.TEHelper"/>
+		</Or>
 	</Match>
 	
 	<!-- Ignore UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR -->
@@ -213,6 +216,12 @@
 			<Class name="org.eclipse.tcf.te.ui.controls.BaseWizardConfigurationPanelControl"/>
 		</Or>
 	</Match>
+
+	<!-- Ignore BC_VACUOUS_INSTANCEOF -->
+	<Match>
+		<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
+		<Class name="org.eclipse.tcf.te.tcf.filesystem.ui.internal.columns.FileExtBasedImageUpdater"/>
+	</Match>
 	
 	<!-- Filters for org.eclipse.tcf bundle -->
 	<Match>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
index 9772e20d4..165ff93d7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.launch.core.activator;
 
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationListener;
 import org.eclipse.tcf.te.runtime.preferences.ScopedEclipsePreferences;
 import org.eclipse.tcf.te.runtime.tracing.TraceHandler;
 import org.osgi.framework.BundleActivator;
@@ -26,9 +24,6 @@ public class CoreBundleActivator implements BundleActivator {
 	private static volatile ScopedEclipsePreferences scopedPreferences;
 	// The trace handler instance
 	private static volatile TraceHandler traceHandler;
-	// The launch config listener to delegate launch config changes to the launch manager delegate
-	private ILaunchConfigurationListener launchConfigListener;
-
 
 	/**
 	 * Returns the bundle context
@@ -89,9 +84,5 @@ public class CoreBundleActivator implements BundleActivator {
 		CoreBundleActivator.context = null;
 		scopedPreferences = null;
 		traceHandler = null;
-
-		DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(launchConfigListener);
-		launchConfigListener = null;
 	}
-
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbLaunchDelegate.java
index 34a0a9040..8c5d67dca 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbLaunchDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbLaunchDelegate.java
@@ -46,7 +46,7 @@ public class TEGdbLaunchDelegate extends GdbLaunchDelegate {
 	public void launch(ILaunchConfiguration config, String mode,
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
 		IPath exePath = checkBinaryDetails(config);
-		if (exePath != null) {
+		if (exePath != null && launch instanceof GdbLaunch) {
 			// -1. Initialize TE
 			Activator.getDefault().initializeTE();
 			// 0. Get the peer from the launch configuration
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TEDSFGDBDebuggerPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TEDSFGDBDebuggerPage.java
index 9cd90dd7b..04679cfa9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TEDSFGDBDebuggerPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TEDSFGDBDebuggerPage.java
@@ -35,9 +35,9 @@ import org.eclipse.tcf.te.tcf.launch.cdt.nls.Messages;
 @SuppressWarnings("restriction")
 public class TEDSFGDBDebuggerPage extends GdbDebuggerPage {
 
-	protected Text fGDBServerCommandText;
+	protected Text fGDBServerCommandText = null;
 
-	protected Text fGDBServerPortNumberText;
+	protected Text fGDBServerPortNumberText = null;
 
 	private boolean fIsInitializing = false;
 
@@ -82,20 +82,18 @@ public class TEDSFGDBDebuggerPage extends GdbDebuggerPage {
 							IRemoteTEConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT);
 		} catch (CoreException e) {
 		}
-		fGDBServerCommandText.setText(gdbserverCommand);
-		fGDBServerPortNumberText.setText(gdbserverPortNumber);
+		if (fGDBServerCommandText != null) fGDBServerCommandText.setText(gdbserverCommand);
+		if (fGDBServerPortNumberText != null) fGDBServerPortNumberText.setText(gdbserverPortNumber);
 		setInitializing(false);
 	}
 
 	@Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		super.performApply(configuration);
-		String str = fGDBServerCommandText.getText();
-		str.trim();
+		String str = fGDBServerCommandText != null ? fGDBServerCommandText.getText().trim() : null;
 		configuration.setAttribute(
 				IRemoteTEConfigurationConstants.ATTR_GDBSERVER_COMMAND, str);
-		str = fGDBServerPortNumberText.getText();
-		str.trim();
+		str = fGDBServerPortNumberText != null ? fGDBServerPortNumberText.getText().trim() : null;
 		configuration.setAttribute(
 				IRemoteTEConfigurationConstants.ATTR_GDBSERVER_PORT, str);
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
index 93f9e0190..217dd2d57 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.tcf.launch.core.activator;
 
-import org.eclipse.tcf.te.runtime.events.EventManager;
-import org.eclipse.tcf.te.runtime.interfaces.events.IEventListener;
 import org.eclipse.tcf.te.runtime.tracing.TraceHandler;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -23,8 +21,6 @@ public class CoreBundleActivator implements BundleActivator {
 	private static BundleContext context;
 	// The trace handler instance
 	private static volatile TraceHandler traceHandler;
-	// The event listener to delegate peer attribute changes
-	private IEventListener eventListener;
 
 	/**
 	 * Returns the bundle context
@@ -72,8 +68,5 @@ public class CoreBundleActivator implements BundleActivator {
 	public void stop(BundleContext bundleContext) throws Exception {
 		CoreBundleActivator.context = null;
 		traceHandler = null;
-
-		EventManager.getInstance().removeEventListener(eventListener);
-		eventListener = null;
 	}
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
index 74a9cd029..20a26b5c1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java
@@ -110,7 +110,6 @@ public class LaunchTerminalSettingsDialog extends CustomTrayDialog {
            		configPanel = delegate.getPanel(this);
             	if (configPanel == null) configPanel = new EmptySettingsPanel(this);
             	// Push the selection to the configuration panel
-            	Assert.isTrue(configPanel instanceof IConfigurationPanel);
             	((IConfigurationPanel)configPanel).setSelection(getSelection());
             	// Add it
             	addConfigurationPanel(key, configPanel);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/preferences/PreferencePage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/preferences/PreferencePage.java
index 3b64a932a..dd7266e9a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/preferences/PreferencePage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/preferences/PreferencePage.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  * Top preference page implementation.
  */
 public class PreferencePage extends org.eclipse.jface.preference.PreferencePage implements IWorkbenchPreferencePage {
-	private Button persistEditors;
+	private Button persistEditors = null;
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
@@ -67,7 +67,9 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage
 	 */
 	@Override
 	protected void performDefaults() {
-		persistEditors.setSelection(UIPlugin.getScopedPreferences().getDefaultBoolean(IPreferenceKeys.PREF_PERSIST_EDITORS));
+		if (persistEditors != null) {
+			persistEditors.setSelection(UIPlugin.getScopedPreferences().getDefaultBoolean(IPreferenceKeys.PREF_PERSIST_EDITORS));
+		}
 	    super.performDefaults();
 	}
 
@@ -76,7 +78,9 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage
 	 */
 	@Override
 	public boolean performOk() {
-		UIPlugin.getScopedPreferences().putBoolean(IPreferenceKeys.PREF_PERSIST_EDITORS, persistEditors.getSelection());
+		if (persistEditors != null) {
+			UIPlugin.getScopedPreferences().putBoolean(IPreferenceKeys.PREF_PERSIST_EDITORS, persistEditors.getSelection());
+		}
 	    return super.performOk();
 	}