From 02988e794e6873760ca642d81395d6350ccaa918 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 8 Sep 2003 04:57:59 +0000 Subject: [PATCH] trim strings --- .../cdt/make/internal/core/makefile/MacroDefinition.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java index 34c1b7fac9c..07848a9fd72 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java @@ -22,7 +22,7 @@ public class MacroDefinition extends Statement implements IMacroDefinition { value = new StringBuffer(); int index = line.indexOf('='); if (index != -1) { - name = line.substring(0, index); + name = line.substring(0, index).trim(); value.append(line.substring(index + 1)); } else { name = line; @@ -39,11 +39,11 @@ public class MacroDefinition extends Statement implements IMacroDefinition { } public void setName(String n) { - name = n; + name = (n == null) ? "" : n.trim() ; } public String getValue() { - return value.toString(); + return value.toString().trim(); } public void setValue(String val) { @@ -59,7 +59,7 @@ public class MacroDefinition extends Statement implements IMacroDefinition { */ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append(name).append(" = ").append(value).append('\n'); + buffer.append(getName()).append(" = ").append(getValue()).append('\n'); return buffer.toString(); }