From b671e6bb1c0652cfc1ccd07355cac99df584eb2f Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Thu, 14 Mar 2002 10:20:46 +0000 Subject: [PATCH] Removed some duplicate code, as I also feel the pain. I like the patch, but I question using the Java14 lexer/recognizer first. Is this because most of the time it will succeed (especially with 1.4 source:-). Be great if a comment could be added to the code. --- .../com/puppycrawl/tools/checkstyle/Checker.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java index 0e3edbd93..0c029209c 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java @@ -229,10 +229,10 @@ public class Checker try { fireFileStarted(aFileName); final String[] lines = getLines(aFileName); + final Reader sar = new StringArrayReader(lines); + VerifierSingleton.getInstance().clearMessages(); + VerifierSingleton.getInstance().setLines(lines); try { - VerifierSingleton.getInstance().clearMessages(); - VerifierSingleton.getInstance().setLines(lines); - final Reader sar = new StringArrayReader(lines); final GeneratedJava14Lexer jl = new GeneratedJava14Lexer(sar); jl.setFilename(aFileName); final GeneratedJava14Recognizer jr = @@ -242,17 +242,12 @@ public class Checker jr.compilationUnit(); } catch (RecognitionException re) { - // Parsing might have failed because the checked // filecontains "assert" statement. Retry with a // grammar that treats "assert" as an identifier // and not as a keyword // Arghh - the pain - duplicate code! - - VerifierSingleton.getInstance().clearMessages(); - VerifierSingleton.getInstance().setLines(lines); - final Reader sar = new StringArrayReader(lines); final GeneratedJavaLexer jl = new GeneratedJavaLexer(sar); jl.setFilename(aFileName); final GeneratedJavaRecognizer jr =