From 7120d00e704a5cdca53d1d11ca188be47dc0f8fc Mon Sep 17 00:00:00 2001
From: Michael Rennie
Date: Mon, 2 Nov 2009 19:33:22 +0000
Subject:  Bug 293498 -  [launching] Run and Debug Configurations dialogs don't
 appear in response to menu selection

---
 .../ui/launchConfigurations/LaunchConfigurationsDialog.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 336ecdd6c..4a43a5052 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
@@ -591,7 +591,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 		if (name == null) {
 			name = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
-		return getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
+		return getLaunchManager().generateLaunchConfigurationName(name);
 	}
 	
 	/**
@@ -981,7 +981,13 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 			int w1, w2;
 			try {
 				w1 = settings.getInt(DIALOG_SASH_WEIGHTS_1);
+				if(w1 < 10) {
+					w1 = DEFAULT_SASH_WEIGHTS[0];
+				}
 				w2 = settings.getInt(DIALOG_SASH_WEIGHTS_2);
+				if(w2 < 10) {
+					w2 = DEFAULT_SASH_WEIGHTS[1];
+				}
 			}
 			catch(NumberFormatException nfe) {
 				w1 = DEFAULT_SASH_WEIGHTS[0];
@@ -1148,8 +1154,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 		IDialogSettings settings = getDialogSettings();
 		if (fSashForm != null) {
 			int[] sashWeights = fSashForm.getWeights();
-			settings.put(DIALOG_SASH_WEIGHTS_1, sashWeights[0]);
-			settings.put(DIALOG_SASH_WEIGHTS_2, sashWeights[1]);
+			settings.put(DIALOG_SASH_WEIGHTS_1, (sashWeights[0] < 10 ? DEFAULT_SASH_WEIGHTS[0] : sashWeights[0]));
+			settings.put(DIALOG_SASH_WEIGHTS_2, (sashWeights[1] < 10 ? DEFAULT_SASH_WEIGHTS[1] : sashWeights[1]));
 		}
 	}
 	
-- 
cgit v1.2.3