From 1f79e4583a048c56cd22b0464ac42ec199b5a057 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 2 May 2007 15:29:10 +0000
Subject: [PATCH] Bug #185044: remove spaces in the build artifact name

---
 .../cdt/managedbuilder/ui/properties/ArtifactTab.java |  3 ++-
 .../managedbuilder/ui/wizards/MBSWizardHandler.java   |  3 +--
 .../managedbuilder/ui/wizards/STDWizardHandler.java   |  2 +-
 .../org/eclipse/cdt/ui/wizards/CWizardHandler.java    | 11 +++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
index c89d52c03a5..58379611844 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
@@ -16,6 +16,7 @@ import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
 import org.eclipse.cdt.managedbuilder.core.IBuildObjectProperties;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.wizards.CWizardHandler;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -117,7 +118,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
 		String s = fCfg.getArtifactName();
 		if (s == null || s.trim().length() == 0) {
 			s = getResDesc().getConfiguration().getProjectDescription().getName();
-			getCfg().setArtifactName(s);
+			getCfg().setArtifactName(CWizardHandler.removeSpaces(s));
 		}
 		t2.setText(s);
 		
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index fd8202129fa..368084d5b08 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -364,9 +364,8 @@ public class MBSWizardHandler extends CWizardHandler {
 			IBuilder bld = config.getEditableBuilder();
 			if (bld != null) { 	bld.setManagedBuildOn(true); }
 			
-			String s = project.getName();
 			config.setName(cfgs[i].getName());
-			config.setArtifactName(s);
+			config.setArtifactName(removeSpaces(project.getName()));
 			
 			IBuildProperty b = config.getBuildProperties().getProperty(PROPERTY);
 			if (b != null && b.getValue() != null && PROP_VAL.equals(b.getValue().getId()))
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
index 2ea8694d767..ef8d0374fd6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
@@ -72,7 +72,7 @@ public class STDWizardHandler extends MBSWizardHandler {
 			} else {
 				System.out.println(UIMessages.getString("StdProjectTypeHandler.3")); //$NON-NLS-1$
 			}
-			cfg.setArtifactName(project.getName());
+			cfg.setArtifactName(removeSpaces(project.getName()));
 			CConfigurationData data = cfg.getConfigurationData();
 			des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
index e118c1f0017..f67770ccae6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
@@ -189,4 +189,15 @@ public class CWizardHandler implements Cloneable {
 			return clone;
 		} catch (CloneNotSupportedException e) { return null; }
 	}
+	
+	public static String removeSpaces(String s) {
+		char[] cs = s.toCharArray();
+		StringBuffer sb = new StringBuffer();
+		for (int i=0; i<cs.length; i++) {
+			if (Character.isWhitespace(cs[i])) 
+				continue;
+			sb.append(cs[i]);
+		}
+		return sb.toString();	
+	}
 }