Target Explorer: Fix more warnings from FindBugs.

4 files changed, 22 insertions, 8 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.java
index 991f59cf6..e67151edd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.java
@@ -64,4 +64,5 @@ public class Messages extends NLS {
 	public static String NameValuePairDialog_usedOrIllegalName_error;
 
 	public static String PreferencePage_label;
+	public static String ViewerStateManager_MkdirFailed;
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.properties
index 111ac5afe..397e04f5a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/nls/Messages.properties
@@ -46,3 +46,4 @@ NameValuePairDialog_usedOrIllegalName_error=The name ''{0}'' is reserved or alre
 # ***** Preference Pages *****
 
 PreferencePage_label=General settings for Target Explorer:
+ViewerStateManager_MkdirFailed=Making the directory for viewerstate.xml failed\!
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
index a1c3ad557..b4ce35058 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
@@ -704,11 +704,9 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement
 
 		// If the parent composite is a forms section, set the toolbar
 		// as text client to the section header
-		if (parent instanceof Section) {
-			Section section = (Section)parent;
-			// Set the toolbar as text client
-			section.setTextClient(toolbar);
-		}
+		Section section = (Section)parent;
+		// Set the toolbar as text client
+		section.setTextClient(toolbar);
 	}
 
 	/**
@@ -741,7 +739,9 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement
 	 * @return The filter descriptors of this viewer.
 	 */
 	public FilterDescriptor[] getFilterDescriptors() {
-		return filterDescriptors;
+		FilterDescriptor[] descriptors = new FilterDescriptor[filterDescriptors.length];
+		System.arraycopy(filterDescriptors, 0, descriptors, 0, filterDescriptors.length);
+		return descriptors;
 	}
 
 	/**
@@ -750,7 +750,9 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement
 	 * @return The current viewer columns.
 	 */
 	public ColumnDescriptor[] getViewerColumns() {
-		return columns;
+		ColumnDescriptor[] columnDescriptors = new ColumnDescriptor[columns.length];
+		System.arraycopy(columns, 0, columnDescriptors, 0, columns.length);
+		return columnDescriptors;
 	}
 
 	/**
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/ViewerStateManager.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/ViewerStateManager.java
index e9e4e56ec..3fa39c12a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/ViewerStateManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/ViewerStateManager.java
@@ -30,6 +30,7 @@ import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.jface.util.SafeRunnable;

 import org.eclipse.tcf.te.ui.activator.UIPlugin;

 import org.eclipse.tcf.te.ui.interfaces.IViewerInput;

+import org.eclipse.tcf.te.ui.nls.Messages;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.XMLMemento;

 

@@ -210,7 +211,16 @@ public class ViewerStateManager {
 			location = new File(System.getProperty("user.home"), ".tcf"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 		// Create the location if it not exist

-		if (!location.exists()) location.mkdir();

+		if (!location.exists()) {

+			final File dir = location;

+			SafeRunner.run(new SafeRunnable(){

+				@Override

+                public void run() throws Exception {

+					if (!dir.mkdir()) {

+						throw new Exception(Messages.ViewerStateManager_MkdirFailed);

+					}

+                }});

+		}

 		location = new File(location, "viewerstates.xml"); //$NON-NLS-1$

 		return location;

 	}