From 7d7a43637821273a985cad5a8e0c657bebc1584b Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 20 Apr 2004 18:47:56 +0000 Subject: [PATCH] fixed some small bugs --- core/org.eclipse.cdt.core/ChangeLog | 10 ++++++++++ .../eclipse/cdt/internal/core/model/MacroEntry.java | 2 +- .../cdt/internal/core/model/PathEntryManager.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 2d5f05a03dc..d7bbc069dec 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,13 @@ +2004-04-20 David Inglis + + Fixed up some small bugs with the macro paths + + * model/org/eclipse/cdt/internal/core/model/MacroEntry.java + + Initialize baseref to always be a Path("") + + * model/org/eclipse/cdt/internal/core/model/PathEntryManager.java + 2004-04-20 David Inglis Added more CModelException throwing in model essentially if the model fails to create diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java index 0374e4dea12..a95d5134c00 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java @@ -39,7 +39,7 @@ public class MacroEntry extends APathEntry implements IMacroEntry { * @return String */ public String getMacroValue() { - return macroName; + return macroValue; } public boolean equals(Object obj) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java index f0a86187cdc..58511a921c7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java @@ -674,7 +674,7 @@ public class PathEntryManager implements ICDescriptorListener { } // check fo the base path - IPath basePath = null; + IPath basePath = new Path(""); //$NON-NLS-1$ if (element.hasAttribute(ATTRIBUTE_BASE_PATH)) { basePath = new Path(element.getAttribute(ATTRIBUTE_BASE_PATH)); }