From de2df1266e8f911eab93355ea4fda693f6b16b71 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 23 Oct 2002 18:22:10 +0000 Subject: [PATCH] Use the new fields in IMarkerGenerator --- .../cdt/internal/errorparsers/GASErrorParser.java | 8 ++++---- .../cdt/internal/errorparsers/GCCErrorParser.java | 12 ++++++------ .../cdt/internal/errorparsers/GLDErrorParser.java | 10 +++++----- .../cdt/internal/errorparsers/VCErrorParser.java | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GASErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GASErrorParser.java index 38797eb09c2..8d5b5fc8b8a 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GASErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GASErrorParser.java @@ -5,10 +5,10 @@ package org.eclipse.cdt.internal.errorparsers; * All Rights Reserved. */ -import org.eclipse.cdt.errorparsers.ErrorParserManager; -import org.eclipse.cdt.errorparsers.IErrorParser; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParser; +import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; public class GASErrorParser implements IErrorParser { @@ -22,7 +22,7 @@ public class GASErrorParser implements IErrorParser { String fileName = ""; IFile file = null; int num = 0; - int severity = IMarker.SEVERITY_ERROR; + int severity = IMarkerGenerator.SEVERITY_ERROR_RESOURCE; String desc = line; if (previous != null && previous.startsWith("Assembler")) { if (! line.startsWith("FATAL")) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java index babcd188a82..49194024ba8 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java @@ -5,10 +5,10 @@ package org.eclipse.cdt.internal.errorparsers; * All Rights Reserved. */ -import org.eclipse.cdt.errorparsers.ErrorParserManager; -import org.eclipse.cdt.errorparsers.IErrorParser; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParser; +import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; public class GCCErrorParser implements IErrorParser { @@ -40,7 +40,7 @@ public class GCCErrorParser implements IErrorParser { String lineNumber = line.substring(firstColon + 1, secondColon); String varName = null; String desc = line.substring(secondColon + 1).trim(); - int severity = IMarker.SEVERITY_ERROR; + int severity = IMarkerGenerator.SEVERITY_ERROR_RESOURCE; int num = 0; try { @@ -126,14 +126,14 @@ public class GCCErrorParser implements IErrorParser { } } if (desc.startsWith("warning") || desc.startsWith("Warning")) { - severity = IMarker.SEVERITY_WARNING; + severity = IMarkerGenerator.SEVERITY_WARNING; } eoParser.generateMarker(file, num, desc, severity, varName); } } catch (StringIndexOutOfBoundsException e) { } catch (NumberFormatException e) { } - } + } return false; } } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java index 3c9582c5841..4ffd9c94ae0 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GLDErrorParser.java @@ -5,10 +5,10 @@ package org.eclipse.cdt.internal.errorparsers; * All Rights Reserved. */ -import org.eclipse.cdt.errorparsers.ErrorParserManager; -import org.eclipse.cdt.errorparsers.IErrorParser; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParser; +import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; public class GLDErrorParser implements IErrorParser { @@ -44,14 +44,14 @@ public class GLDErrorParser implements IErrorParser { if (file == null) { desc = fileName + " " + desc; } - eoParser.generateMarker(file, 0, desc, IMarker.SEVERITY_ERROR, null); + eoParser.generateMarker(file, 0, desc, IMarkerGenerator.SEVERITY_ERROR_RESOURCE, null); } else if (buf.endsWith("ld")){ String fileName = line.substring(0, firstColon); IFile file = eoParser.findFilePath(fileName); if (file == null) { desc = fileName + " " + desc; } - eoParser.generateMarker(file, 0, desc, IMarker.SEVERITY_ERROR, null); + eoParser.generateMarker(file, 0, desc, IMarkerGenerator.SEVERITY_ERROR_RESOURCE, null); } } return false; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java index 850e29cc52f..9680e5e7c37 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java @@ -8,10 +8,10 @@ package org.eclipse.cdt.internal.errorparsers; import java.io.File; import java.util.StringTokenizer; -import org.eclipse.cdt.errorparsers.ErrorParserManager; -import org.eclipse.cdt.errorparsers.IErrorParser; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParser; +import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; public class VCErrorParser implements IErrorParser { @@ -37,9 +37,9 @@ public class VCErrorParser implements IErrorParser { if (file == null) { desc= "*" + desc; } - int severity= IMarker.SEVERITY_ERROR; + int severity= IMarkerGenerator.SEVERITY_ERROR_RESOURCE; if (desc.startsWith("warning")) { - severity= IMarker.SEVERITY_WARNING; + severity= IMarkerGenerator.SEVERITY_WARNING; } eoParser.generateMarker(file, num, desc, severity, null); return true;