diff options
| author | Alain Magloire | 2004-07-15 20:41:22 +0000 |
|---|---|---|
| committer | Alain Magloire | 2004-07-15 20:41:22 +0000 |
| commit | 1e11fc16ef19f0b5187e9babb458e335bf25040f (patch) | |
| tree | 2896f0f95e4a511dba62cb9b3f1b86c6c558eaff /core/org.eclipse.cdt.core | |
| parent | dbd947fc1dc146597838c2d0718358fe143fc900 (diff) | |
| download | org.eclipse.cdt-1e11fc16ef19f0b5187e9babb458e335bf25040f.tar.gz org.eclipse.cdt-1e11fc16ef19f0b5187e9babb458e335bf25040f.tar.xz org.eclipse.cdt-1e11fc16ef19f0b5187e9babb458e335bf25040f.zip | |
Check for Empty path in the binary and copy the []IPathEntry
for the manager.
* model/org/eclipse/cdt/internal/core/model/Binary.java
* model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
Diffstat (limited to 'core/org.eclipse.cdt.core')
3 files changed, 10 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 6eb42969d5c..7919d05cfba 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,11 @@ +2004-07-15 Alain Magloire + + Check for Empty path in the binary and copy the []IPathEntry + for the manager. + + * model/org/eclipse/cdt/internal/core/model/Binary.java + * model/org/eclipse/cdt/internal/core/model/PathEntryManager.java + 2004-07-15 Chris Wiebe Initial draft for the type hierarchy view. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java index 798b5e0aa01..c60a926c4b7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java @@ -251,7 +251,7 @@ public class Binary extends Openable implements IBinary { IPath filename = filename = symbol.getFilename(); BinaryFunction function = null; - if (filename != null) { + if (filename != null && !filename.isEmpty()) { BinaryModule module = null; if (hash.containsKey(filename)) { module = (BinaryModule)hash.get(filename); 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 cfb914bc607..2a34b77dab1 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 @@ -179,7 +179,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange resolvedEntries = (IPathEntry[])listEntries.toArray(NO_PATHENTRIES); if (generateMarkers) { final ICProject finalCProject = cproject; - final IPathEntry[] finalEntries = resolvedEntries; + final IPathEntry[] finalEntries = (IPathEntry[])listEntries.toArray(NO_PATHENTRIES); Job markerTask = new Job("PathEntry Marker Job") { //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) |