From 00fa5ecf22ca9e64a5e64463e960692f4e36ff09 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 28 Sep 2005 19:41:10 +0000 Subject: [PATCH] Bug 108920 - propagated changes from CDT 3.0. See comment over there. --- .../cdt/internal/errorparsers/GCCErrorParser.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 811e0c7147b..5d8590fdd7b 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 @@ -201,7 +201,7 @@ public class GCCErrorParser implements IErrorParser { eoParser.clearScratchBuffer(); int from = -1; String inclusionError = fileName + ":" + num; //$NON-NLS-1$ - while ((from = buffer.indexOf("from ")) != -1) { //$NON-NLS-1$ + while ((from = buffer.indexOf("from ")) != -1) { //$NON-NLS-1$: " + name + " int coma = buffer.indexOf(',', from); String buf; if (coma != -1) { @@ -231,7 +231,7 @@ public class GCCErrorParser implements IErrorParser { IFile file = eoParser.findFileName(fileName); if (file != null) { if (eoParser.isConflictingName(fileName)) { - desc = "[Conflicting names: " + fileName + " ] " + desc; //$NON-NLS-1$ //$NON-NLS-2$ + desc = desc + " [Conflicting names] "; //$NON-NLS-1$ file = null; } } else { @@ -244,11 +244,10 @@ public class GCCErrorParser implements IErrorParser { // the user do a cd(1). IPath path = new Path(fileName); if (path.segmentCount() > 1) { - String name = path.lastSegment(); file = eoParser.findFileName(fileName); if (file != null) { if (eoParser.isConflictingName(fileName)) { - desc = "[Conflicting names: " + name + " ] " + desc; //$NON-NLS-1$ //$NON-NLS-2$ + desc = desc + " [Conflicting names] "; //$NON-NLS-1$ file = null; } } @@ -271,7 +270,7 @@ public class GCCErrorParser implements IErrorParser { // Display the fileName. if (file == null) { - desc = desc +"[" + fileName + "]"; //$NON-NLS-1$ //$NON-NLS-2$ + desc = desc + " [" + fileName + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } eoParser.generateMarker(file, num, desc, severity, varName);