From d440fd11f018ca170c84bcfacac01c57f9315ff6 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sun, 8 Jan 2006 01:59:56 +0000 Subject: [PATCH] Fix compile error. Looks like Java 1.5 auto converts between Integer and int. Unfortunately 1.4 doesn't. --- .../eclipse/cdt/internal/errorparsers/ErrorPattern.java | 2 +- .../eclipse/cdt/internal/errorparsers/MakeErrorParser.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java index 8e00b38bcd3..4bc89fad03e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java @@ -84,7 +84,7 @@ public class ErrorPattern { public int getLineNum(Matcher matcher) { try { return groupLineNum != 0 - ? Integer.valueOf(matcher.group(groupLineNum)) + ? Integer.valueOf(matcher.group(groupLineNum)).intValue() : 0; } catch (NumberFormatException e) { return 0; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java index e941d198683..10146ce3f76 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java @@ -22,7 +22,12 @@ public class MakeErrorParser extends AbstractErrorParser { private static final ErrorPattern[] patterns = { new ErrorPattern("make\\[(.*)\\]: Entering directory `(.*)'", 0, 0) { //$NON-NLS-1 protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { - int level = Integer.valueOf(matcher.group(1)); + int level; + try { + level = Integer.valueOf(matcher.group(1)).intValue(); + } catch (NumberFormatException e) { + level = 0; + } String dir = matcher.group(2); /* Sometimes make screws up the output, so * "leave" events can't be seen. Double-check level