mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 01:06:01 +02:00
Code Issues Wiki Activity

Fixed broken error parser tests.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-19 18:56:27 -07:00
parent 7bccb394be
commit d193756141
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorParserExtensionManager.java
View file

@ -25,8 +25,8 @@ import java.util.Set;
import java.util.TreeSet;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ErrorParserManager;
import org.eclipse.cdt.core.ErrorParserContext;
import org.eclipse.cdt.core.ErrorParserManager;
import org.eclipse.cdt.core.IErrorParser;
import org.eclipse.cdt.core.IErrorParserNamed;
import org.eclipse.cdt.core.IMarkerGenerator;
@ -748,10 +748,10 @@ public class ErrorParserExtensionManager {
* @return default error parsers IDs to be used if error parser list is empty.
*/
public static String[] getDefaultErrorParserIds() {
if (fDefaultErrorParserIds==null) {
return fAvailableErrorParsers.keySet().toArray(new String[0]);
if (fDefaultErrorParserIds == null) {
return getErrorParserIds(fAvailableErrorParsers, BUILD);
}
return fDefaultErrorParserIds.toArray(new String[0]);
return fDefaultErrorParserIds.toArray(new String[fDefaultErrorParserIds.size()]);
}
/**
@ -777,7 +777,7 @@ public class ErrorParserExtensionManager {
int context) {
Pair<IErrorParserNamed, Integer> pair =
isExtension ? fExtensionErrorParsers.get(id) : fAvailableErrorParsers.get(id);
if (!isInContext(pair, context)) {
if (pair == null || !isInContext(pair, context)) {
return null;
}
IErrorParserNamed errorParser = pair.first;