diff options
author | Alain Magloire | 2002-12-20 21:13:47 +0000 |
---|---|---|
committer | Alain Magloire | 2002-12-20 21:13:47 +0000 |
commit | 04682bb2bc1fff0c544e69b3c460fdbe97c79c75 (patch) | |
tree | b39ae97df25abda36bb18695b06b71462faf39f9 | |
parent | e2c5db0b473a724f7c53ef4c4973f190331a07d8 (diff) | |
download | org.eclipse.cdt-04682bb2bc1fff0c544e69b3c460fdbe97c79c75.tar.gz org.eclipse.cdt-04682bb2bc1fff0c544e69b3c460fdbe97c79c75.tar.xz org.eclipse.cdt-04682bb2bc1fff0c544e69b3c460fdbe97c79c75.zip |
popDirectory() make sure the stack is not empty
-rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java index 26ba0ab0514..f244399ca85 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java @@ -90,7 +90,7 @@ public class ErrorParserManager extends OutputStream { } // Fallback to the Project Location // FIXME: if the build did not start in the Project ? - return fProject.getLocation(); + return fBaseDirectory; } public void pushDirectory(IPath dir) { @@ -99,8 +99,7 @@ public class ErrorParserManager extends OutputStream { if (fBaseDirectory.isPrefixOf(dir)) { int segments = fBaseDirectory.matchingFirstSegments(dir); pwd = dir.removeFirstSegments(segments); - } - else { + } else { pwd = dir; } fDirectoryStack.addElement(pwd); @@ -109,11 +108,12 @@ public class ErrorParserManager extends OutputStream { public IPath popDirectory() { int i = fDirectoryStack.size(); - IPath dir = (IPath) fDirectoryStack.lastElement(); - if (i != 0) { + if (i != 0) { + IPath dir = (IPath) fDirectoryStack.lastElement(); fDirectoryStack.removeElementAt(i - 1); + return dir; } - return dir; + return new Path(""); } public int getDirectoryLevel() { |