From 8512e1b76f9850234766a0763bd677102a3a46c2 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 3 Feb 2004 23:15:30 +0000 Subject: [PATCH] Fix for 51143 --- core/org.eclipse.cdt.core/ChangeLog | 8 ++++++++ .../src/org/eclipse/cdt/core/resources/ACBuilder.java | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 2a9736696ed..cbf72531a7e 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,11 @@ +2004-02-03 Alain Magloire + PR 51143 + + In testing the duplication of errors, we did not look at the right + severity. + + * src/org/eclipse/cdt/core/resources/ACBuilder.java + 2004-01-29 Alain Magloire PR #50846 and patch from Alex Chapiro diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ACBuilder.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ACBuilder.java index 62add0f683c..4583102083e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ACBuilder.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ACBuilder.java @@ -34,9 +34,10 @@ public abstract class ACBuilder extends IncrementalProjectBuilder implements IMa */ if ((cur != null) && (cur.length > 0)) { for (int i = 0; i < cur.length; i++) { - if ((((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue() == lineNumber) - && (((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue() == severity) - && (((String) cur[i].getAttribute(IMarker.MESSAGE)).equals(errorDesc))) { + int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue(); + int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue(); + String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE); + if (line == lineNumber && sev == mapMarkerSeverity(severity) && mesg.equals(errorDesc)) { return; } }