Bug 239446 - org.eclipse.debug LaunchConfigurationsDialog fails to load when PlatformUI SHOW_FILTERED_TEXTS is false

https://bugs.eclipse.org/bugs/show_bug.cgi?id=239446

2 files changed, 9 insertions, 4 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
index 46e1a8ead..bd9685314 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -169,9 +169,10 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc
 	}
 	
 	/**
-	 * gets the filtering text control from the viewer
-	 * @return the filtering text control
+	 * Returns the filtering text control from the viewer or <code>null</code>
+	 * if the text control was not created.
 	 * 
+	 * @return the filtering text control or <code>null</code>
 	 * @since 3.2
 	 */
 	public Text getFilteringTextControl() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index b5779b1a4..702231cf7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -80,6 +80,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.PlatformUI;
@@ -1063,7 +1064,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 		if (status != null) {
 			handleStatus(status);
 		}
-		fLaunchConfigurationView.getFilteringTextControl().setFocus();
+		Text filterText = fLaunchConfigurationView.getFilteringTextControl();
+		if (filterText != null){
+			filterText.setFocus();
+		}
 		restoreExpansion();
 	}