From b787d5ed90d64e3475286ff2ca5a8cbf65d5487e Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Fri, 22 Nov 2002 14:14:37 +0000 Subject: [PATCH] Fix bug with needing whitespace around '*' using in import blah.*; --- .../tools/checkstyle/checks/WhitespaceAroundCheck.java | 7 +++++++ .../com/puppycrawl/tools/checkstyle/InputSimple.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java index 2a6225f25..c936081bb 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java @@ -94,6 +94,13 @@ public class WhitespaceAroundCheck return; } + // Check for import pkg.name.*; + if ((aAST.getType() == TokenTypes.STAR) + && (aAST.getParent().getType() == TokenTypes.DOT)) + { + return; + } + final String[] lines = getLines(); final String line = lines[aAST.getLineNo() - 1]; final int before = aAST.getColumnNo() - 1; diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java index b506a93c4..6f34cdfba 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java @@ -4,7 +4,7 @@ // Ignore error //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle; - +import java.io.*; /** * Contains simple mistakes: * - Long lines