From af477cff1d60ee03882eee9bfec1ef9afd623bc6 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 10 Feb 2005 16:52:12 +0000
Subject: [PATCH] Fix for 75916: Errors and exceptions in log if you try create
 a C++ project with same name/different case.

---
 core/org.eclipse.cdt.ui/ChangeLog                  |  9 +++++++++
 .../src/org/eclipse/cdt/ui/CUIPlugin.java          | 14 ++++++++++----
 .../cdt/ui/dialogs/TabFolderOptionBlock.java       |  2 +-
 .../eclipse/cdt/ui/wizards/NewCProjectWizard.java  |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index c610d68b382..efdfae7b72c 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-10 Bogdan Gheorghe
+	Fix for 75916: Errors and exceptions in log if you try create a C++ project with 
+	same name/different case.
+	Refactored CUIPlugin.errorDialog to take a boolean logError.
+	
+	* src/org/eclipse/cdt/ui/CUIPlugin.java
+	* src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
+	* src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
+	
 2005-02-09 Alain Magloire
 	PR 84841: Description of the template in the hover was incorrect.
 	* src/org/eclipse/cdt/internal/ui/text/TemplateEngine.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index 9fa3849d8e0..522f78ecde0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -294,9 +294,12 @@ public class CUIPlugin extends AbstractUIPlugin {
 
 	/**
 	* Utility method with conventions
+	 * @param logError TODO
 	*/
-	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
-		getDefault().log(s);
+	public static void errorDialog(Shell shell, String title, String message, IStatus s, boolean logError) {
+		if (logError)
+		    getDefault().log(s);
+		
 		// if the 'message' resource string and the IStatus' message are the same,
 		// don't show both in the dialog
 		if (s != null && message.equals(s.getMessage())) {
@@ -307,9 +310,12 @@ public class CUIPlugin extends AbstractUIPlugin {
 
 	/**
 	* Utility method with conventions
+	 * @param logError TODO
 	*/
-	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
-		getDefault().log(t);
+	public static void errorDialog(Shell shell, String title, String message, Throwable t, boolean logError) {
+		if (logError)
+		    getDefault().log(t);	
+		
 		IStatus status;
 		if (t instanceof CoreException) {
 			status = ((CoreException) t).getStatus();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
index e991879656a..d7520927caf 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
@@ -163,7 +163,7 @@ public abstract class TabFolderOptionBlock {
 				} catch (CoreException e) {
 					CUIPlugin.errorDialog(
 							composite.getShell(),
-							CUIMessages.getString("TabFolderOptionBlock.error"), CUIMessages.getString("TabFolderOptionBlock.error.settingOptions"), e); //$NON-NLS-1$ //$NON-NLS-2$
+							CUIMessages.getString("TabFolderOptionBlock.error"), CUIMessages.getString("TabFolderOptionBlock.error.settingOptions"), e, true); //$NON-NLS-1$ //$NON-NLS-2$
 					return false;
 				}
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
index 5dbf4531da6..f1361ec5984 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
@@ -242,7 +242,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
 			String message= CUIPlugin.getResourceString(OP_ERROR + ".message"); //$NON-NLS-1$
                        
 			Throwable th= e.getTargetException();
-			CUIPlugin.errorDialog(shell, title, message, th);
+			CUIPlugin.errorDialog(shell, title, message, th, false);
 			try {
 				getProjectHandle().delete(false, false, null);
 			} catch (CoreException ignore) {