Executables View improvements: source file providers, import exes with same name, externalized some strings

4 files changed, 30 insertions, 6 deletions

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java
index 14ffe305506..535a241e931 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java
@@ -148,7 +148,7 @@ abstract class BaseViewer extends TreeViewer {
 		}
 		String[] columns = visibleColumns.split(","); //$NON-NLS-1$
 		for (int i=0; i<columns.length; i++) {
-			if (columns[i].equals("0")) {
+			if (columns[i].equals("0")) { //$NON-NLS-1$
 				tree.getColumn(i).setWidth(0);
 			}
 		}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java
index ac7835b9cef..ae9bdf00aaa 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java
@@ -52,6 +52,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.XMLMemento;
 import org.eclipse.ui.dialogs.ListSelectionDialog;
 import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.progress.UIJob;
 
 /**
  * ExecutablesView displays a list of executable files either in the workspace
@@ -264,11 +265,30 @@ public class ExecutablesView extends ViewPart {
 			public void selectionChanged(SelectionChangedEvent event) {
 				ISelection newSelection = event.getSelection();
 				if (newSelection instanceof IStructuredSelection) {
-					Object firstElement = ((IStructuredSelection) newSelection).getFirstElement();
-					sourceFilesViewer.setInput(firstElement);
-					if (firstElement instanceof Executable) {
-						sourceFilesViewer.packColumns();
-					}
+					final Object firstElement = ((IStructuredSelection) newSelection).getFirstElement();
+					
+					Job setectExeJob = new Job(Messages.ExecutablesView_Select_Executable) {
+
+						@Override
+						protected IStatus run(IProgressMonitor monitor) {
+							if (firstElement instanceof Executable) {
+								Executable executable = (Executable)firstElement;
+								this.setName(Messages.ExecutablesView_Finding_Sources_Job_Name + executable.getName());
+								executable.getSourceFiles(monitor);
+							}
+							UIJob selectExeUIJob = new UIJob(Messages.ExecutablesView_Select_Executable){
+								@Override
+								public IStatus runInUIThread(IProgressMonitor monitor) {
+									sourceFilesViewer.setInput(firstElement);
+									if (firstElement instanceof Executable) {
+										sourceFilesViewer.packColumns();
+									}
+									return Status.OK_STATUS;
+								}};
+								selectExeUIJob.schedule();								
+								return Status.OK_STATUS;
+						}};
+						setectExeJob.schedule();
 				}
 			}
 		});
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java
index 8c34191a9f3..958b3b798d2 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/Messages.java
@@ -23,11 +23,13 @@ public class Messages extends NLS {
 	public static String ExecutablesView_ExeProject;
 	public static String ExecutablesView_ExeSize;
 	public static String ExecutablesView_ExeType;
+	public static String ExecutablesView_Finding_Sources_Job_Name;
 	public static String ExecutablesView_Import;
 	public static String ExecutablesView_ImportExe;
 	public static String ExecutablesView_ImportExecutables;
 	public static String ExecutablesView_Refresh;
 	public static String ExecutablesView_RefreshList;
+	public static String ExecutablesView_Select_Executable;
 	public static String ExecutablesView_SelectColumns;
 	public static String ExecutablesView_SelectExeFile;
 	public static String ExecutablesView_SrcDate;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties
index d5347a606dc..5c91bede192 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/messages.properties
@@ -17,11 +17,13 @@ ExecutablesView_ExeName=Executable Name
 ExecutablesView_ExeProject=Executable Project
 ExecutablesView_ExeSize=Executable Size
 ExecutablesView_ExeType=Executable Type
+ExecutablesView_Finding_Sources_Job_Name=Finding source files in 
 ExecutablesView_Import=Import
 ExecutablesView_ImportExe=Import an executable file
 ExecutablesView_ImportExecutables=Import Executables
 ExecutablesView_Refresh=Refresh
 ExecutablesView_RefreshList=Refresh the list of executables
+ExecutablesView_Select_Executable=Select Executable
 ExecutablesView_SelectColumns=Select the columns to show
 ExecutablesView_SelectExeFile=Select an executable file
 ExecutablesView_SrcDate=Source File Date