From 954d5b8b450f7d6bd2263f8a233d2779824b0cca Mon Sep 17 00:00:00 2001 From: John Camelon Date: Thu, 17 Jun 2004 18:44:38 +0000 Subject: [PATCH] Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=67634 --- .../org/eclipse/cdt/core/parser/IParserLogService.java | 2 +- .../cdt/internal/core/parser/ExpressionParser.java | 9 ++++----- .../org/eclipse/cdt/internal/core/parser/Parser.java | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IParserLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IParserLogService.java index 50c0f69184b..7f16dcc9308 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IParserLogService.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IParserLogService.java @@ -18,7 +18,7 @@ public interface IParserLogService { public void traceLog( String message ); - public void errorLog( String message ); +// public void errorLog( String message ); public boolean isTracing(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java index b8f862bc57d..15c12bf8e2a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java @@ -1097,7 +1097,7 @@ public class ExpressionParser implements IExpressionParser, IParserData { * @param e */ public void logException(String methodName, Exception e) { - if (!(e instanceof EndOfFileException) && e != null) { + if (!(e instanceof EndOfFileException) && e != null && log.isTracing()) { StringBuffer buffer = new StringBuffer(); buffer.append("Parser: Unexpected exception in "); //$NON-NLS-1$ buffer.append(methodName); @@ -1107,9 +1107,8 @@ public class ExpressionParser implements IExpressionParser, IParserData { buffer.append(e.getMessage()); buffer.append(". w/"); //$NON-NLS-1$ buffer.append(scanner.toString()); - if (log.isTracing()) - log.traceLog(buffer.toString()); - log.errorLog(buffer.toString()); + log.traceLog(buffer.toString()); +// log.errorLog(buffer.toString()); } } @@ -2593,7 +2592,7 @@ public class ExpressionParser implements IExpressionParser, IParserData { .outputTrace( log, "ScannerException thrown : ", e.getProblem(), null, null, null); //$NON-NLS-1$ - log.errorLog("Scanner Exception: " + e.getProblem().getMessage()); //$NON-NLS-1$ +// log.errorLog("Scanner Exception: " + e.getProblem().getMessage()); //$NON-NLS-1$ return fetchToken(); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java index df6e3185171..356b73b5744 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java @@ -243,7 +243,7 @@ public abstract class Parser extends ExpressionParser implements IParser * @param e */ private void logThrowable(String methodName, Throwable e) { - if( e != null ) + if( e != null && log.isTracing()) { StringBuffer buffer = new StringBuffer(); buffer.append( "Parser: Unexpected throwable in "); //$NON-NLS-1$ @@ -254,9 +254,8 @@ public abstract class Parser extends ExpressionParser implements IParser buffer.append( e.getMessage() ); buffer.append( ". w/"); //$NON-NLS-1$ buffer.append( scanner.toString() ); - if( log.isTracing() ) - log.traceLog( buffer.toString() ); - log.errorLog( buffer.toString() ); + log.traceLog( buffer.toString() ); +// log.errorLog( buffer.toString() ); } }