TouchInstinct
/
checkstyle
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #2451: removed excess hierarchy from AbstractParenPadCheck

This commit is contained in:
rnveach 2015-11-10 12:48:56 -05:00 committed by Roman Ivanov
parent 9faf80abae
commit 15557f448c
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.java
View File

@ -19,8 +19,12 @@
package com.puppycrawl.tools.checkstyle.checks.whitespace;
import java.util.Locale;
import org.apache.commons.beanutils.ConversionException;
import com.puppycrawl.tools.checkstyle.api.Check;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck;
import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
/**
@ -31,7 +35,7 @@ import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
* @author Oliver Burn
*/
abstract class AbstractParenPadCheck
extends AbstractOptionCheck<PadOption> {
extends Check {
/**
* A key is pointing to the warning message text in "messages.properties"
@ -63,11 +67,21 @@ abstract class AbstractParenPadCheck
/** Close parenthesis literal. */
private static final char CLOSE_PARENTHESIS = ')';
/** The policy to enforce. */
private PadOption option = PadOption.NOSPACE;
/**
* Sets the paren pad option to nospace.
* Set the option to enforce.
* @param optionStr string to decode option from
* @throws ConversionException if unable to decode
*/
AbstractParenPadCheck() {
super(PadOption.NOSPACE, PadOption.class);
public void setOption(String optionStr) {
try {
option = PadOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH));
}
catch (IllegalArgumentException iae) {
throw new ConversionException("unable to parse " + optionStr, iae);
}
}
/**
@ -78,11 +92,11 @@ abstract class AbstractParenPadCheck
final String line = getLines()[ast.getLineNo() - 1];
final int after = ast.getColumnNo() + 1;
if (after < line.length()) {
if (getAbstractOption() == PadOption.NOSPACE
if (option == PadOption.NOSPACE
&& Character.isWhitespace(line.charAt(after))) {
log(ast.getLineNo(), after, WS_FOLLOWED, OPEN_PARENTHESIS);
}
else if (getAbstractOption() == PadOption.SPACE
else if (option == PadOption.SPACE
&& !Character.isWhitespace(line.charAt(after))
&& line.charAt(after) != CLOSE_PARENTHESIS) {
log(ast.getLineNo(), after, WS_NOT_FOLLOWED, OPEN_PARENTHESIS);
@ -98,12 +112,12 @@ abstract class AbstractParenPadCheck
final String line = getLines()[ast.getLineNo() - 1];
final int before = ast.getColumnNo() - 1;
if (before >= 0) {
if (getAbstractOption() == PadOption.NOSPACE
if (option == PadOption.NOSPACE
&& Character.isWhitespace(line.charAt(before))
&& !CommonUtils.hasWhitespaceBefore(before, line)) {
log(ast.getLineNo(), before, WS_PRECEDED, CLOSE_PARENTHESIS);
}
else if (getAbstractOption() == PadOption.SPACE
else if (option == PadOption.SPACE
&& !Character.isWhitespace(line.charAt(before))
&& line.charAt(before) != OPEN_PARENTHESIS) {
log(ast.getLineNo(), ast.getColumnNo(),

10
src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
View File

@ -32,6 +32,7 @@ import org.junit.Test;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
public class ParenPadCheckTest
extends BaseCheckTestSupport {
@ -239,4 +240,13 @@ public class ParenPadCheckTest
};
verify(checkConfig, getPath("InputParenPad.java"), expected);
}
@Test(expected = CheckstyleException.class)
public void testInvalidOption() throws Exception {
final DefaultConfiguration checkConfig = createCheckConfig(ParenPadCheck.class);
checkConfig.addAttribute("option", "invalid_option");
final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
verify(checkConfig, getPath("InputParenPad.java"), expected);
}
}