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

Changed indentation of switch-case, checks, issue #512

This commit is contained in:
alexkravin 2015-01-22 16:28:32 +04:00
parent 95c1a081e0
commit 90545ad2ed
4 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/com/puppycrawl/tools/checkstyle/checks/CheckUtils.java
View File

@ -154,35 +154,35 @@ public final class CheckUtils
String txt = text.replaceAll("_", "");
double result = 0;
switch (type) {
case TokenTypes.NUM_FLOAT:
case TokenTypes.NUM_DOUBLE:
result = Double.parseDouble(txt);
break;
case TokenTypes.NUM_INT:
case TokenTypes.NUM_LONG:
int radix = BASE_10;
if (txt.startsWith("0x") || txt.startsWith("0X")) {
radix = BASE_16;
txt = txt.substring(2);
}
else if (txt.charAt(0) == '0') {
radix = BASE_8;
txt = txt.substring(1);
}
if ((txt.endsWith("L")) || (txt.endsWith("l"))) {
txt = txt.substring(0, txt.length() - 1);
}
if (txt.length() > 0) {
if (type == TokenTypes.NUM_INT) {
result = parseInt(txt, radix);
case TokenTypes.NUM_FLOAT:
case TokenTypes.NUM_DOUBLE:
result = Double.parseDouble(txt);
break;
case TokenTypes.NUM_INT:
case TokenTypes.NUM_LONG:
int radix = BASE_10;
if (txt.startsWith("0x") || txt.startsWith("0X")) {
radix = BASE_16;
txt = txt.substring(2);
}
else {
result = parseLong(txt, radix);
else if (txt.charAt(0) == '0') {
radix = BASE_8;
txt = txt.substring(1);
}
}
break;
default:
break;
if ((txt.endsWith("L")) || (txt.endsWith("l"))) {
txt = txt.substring(0, txt.length() - 1);
}
if (txt.length() > 0) {
if (type == TokenTypes.NUM_INT) {
result = parseInt(txt, radix);
}
else {
result = parseLong(txt, radix);
}
}
break;
default:
break;
}
return result;
}

146
src/main/java/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
View File

@ -76,17 +76,17 @@ public abstract class DeclarationCollector extends Check
public void visitToken(DetailAST ast)
{
switch (ast.getType()) {
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF :
case TokenTypes.SLIST :
case TokenTypes.METHOD_DEF :
case TokenTypes.CTOR_DEF :
this.current = this.frames.get(ast);
break;
default :
// do nothing
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF :
case TokenTypes.SLIST :
case TokenTypes.METHOD_DEF :
case TokenTypes.CTOR_DEF :
this.current = this.frames.get(ast);
break;
default :
// do nothing
}
} // end visitToken
@ -101,61 +101,61 @@ public abstract class DeclarationCollector extends Check
{
final LexicalFrame frame = frameStack.peek();
switch (ast.getType()) {
case TokenTypes.VARIABLE_DEF : {
final String name =
ast.findFirstToken(TokenTypes.IDENT).getText();
if (frame instanceof ClassFrame) {
final DetailAST mods =
ast.findFirstToken(TokenTypes.MODIFIERS);
if (ScopeUtils.inInterfaceBlock(ast)
|| mods.branchContains(TokenTypes.LITERAL_STATIC))
{
((ClassFrame) frame).addStaticMember(name);
case TokenTypes.VARIABLE_DEF : {
final String name =
ast.findFirstToken(TokenTypes.IDENT).getText();
if (frame instanceof ClassFrame) {
final DetailAST mods =
ast.findFirstToken(TokenTypes.MODIFIERS);
if (ScopeUtils.inInterfaceBlock(ast)
|| mods.branchContains(TokenTypes.LITERAL_STATIC))
{
((ClassFrame) frame).addStaticMember(name);
}
else {
((ClassFrame) frame).addInstanceMember(name);
}
}
else {
((ClassFrame) frame).addInstanceMember(name);
frame.addName(name);
}
break;
}
case TokenTypes.PARAMETER_DEF : {
final DetailAST nameAST = ast.findFirstToken(TokenTypes.IDENT);
frame.addName(nameAST.getText());
break;
}
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF : {
final DetailAST nameAST = ast.findFirstToken(TokenTypes.IDENT);
frame.addName(nameAST.getText());
frameStack.addFirst(new ClassFrame(frame));
break;
}
case TokenTypes.SLIST :
frameStack.addFirst(new BlockFrame(frame));
break;
case TokenTypes.METHOD_DEF : {
final String name = ast.findFirstToken(TokenTypes.IDENT).getText();
if (frame instanceof ClassFrame) {
final DetailAST mods =
ast.findFirstToken(TokenTypes.MODIFIERS);
if (mods.branchContains(TokenTypes.LITERAL_STATIC)) {
((ClassFrame) frame).addStaticMethod(name);
}
else {
((ClassFrame) frame).addInstanceMethod(name);
}
}
}
else {
frame.addName(name);
}
break;
}
case TokenTypes.PARAMETER_DEF : {
final DetailAST nameAST = ast.findFirstToken(TokenTypes.IDENT);
frame.addName(nameAST.getText());
break;
}
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF : {
final DetailAST nameAST = ast.findFirstToken(TokenTypes.IDENT);
frame.addName(nameAST.getText());
frameStack.addFirst(new ClassFrame(frame));
break;
}
case TokenTypes.SLIST :
frameStack.addFirst(new BlockFrame(frame));
break;
case TokenTypes.METHOD_DEF : {
final String name = ast.findFirstToken(TokenTypes.IDENT).getText();
if (frame instanceof ClassFrame) {
final DetailAST mods =
ast.findFirstToken(TokenTypes.MODIFIERS);
if (mods.branchContains(TokenTypes.LITERAL_STATIC)) {
((ClassFrame) frame).addStaticMethod(name);
}
else {
((ClassFrame) frame).addInstanceMethod(name);
}
}
}
case TokenTypes.CTOR_DEF :
frameStack.addFirst(new MethodFrame(frame));
break;
default:
// do nothing
case TokenTypes.CTOR_DEF :
frameStack.addFirst(new MethodFrame(frame));
break;
default:
// do nothing
}
}
@ -170,17 +170,17 @@ public abstract class DeclarationCollector extends Check
DetailAST ast)
{
switch (ast.getType()) {
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF :
case TokenTypes.SLIST :
case TokenTypes.METHOD_DEF :
case TokenTypes.CTOR_DEF :
this.frames.put(ast, frameStack.poll());
break;
default :
// do nothing
case TokenTypes.CLASS_DEF :
case TokenTypes.INTERFACE_DEF :
case TokenTypes.ENUM_DEF :
case TokenTypes.ANNOTATION_DEF :
case TokenTypes.SLIST :
case TokenTypes.METHOD_DEF :
case TokenTypes.CTOR_DEF :
this.frames.put(ast, frameStack.poll());
break;
default :
// do nothing
}
}

116
src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
View File

@ -256,23 +256,23 @@ public class SuppressWarningsHolder
if (nextAST != null) {
final int nextType = nextAST.getType();
switch (nextType) {
case TokenTypes.EXPR:
case TokenTypes.ANNOTATION_ARRAY_INIT:
values = getAnnotationValues(nextAST);
break;
case TokenTypes.EXPR:
case TokenTypes.ANNOTATION_ARRAY_INIT:
values = getAnnotationValues(nextAST);
break;
case TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR:
// expected children: IDENT ASSIGN ( EXPR |
// ANNOTATION_ARRAY_INIT )
values = getAnnotationValues(getNthChild(nextAST, 2));
break;
case TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR:
// expected children: IDENT ASSIGN ( EXPR |
// ANNOTATION_ARRAY_INIT )
values = getAnnotationValues(getNthChild(nextAST, 2));
break;
case TokenTypes.RPAREN:
// no value present (not valid Java)
break;
case TokenTypes.RPAREN:
// no value present (not valid Java)
break;
default:
// unknown annotation value type (new syntax?)
default:
// unknown annotation value type (new syntax?)
}
}
}
@ -286,32 +286,32 @@ public class SuppressWarningsHolder
DetailAST parentAST = ast.getParent();
if (parentAST != null) {
switch (parentAST.getType()) {
case TokenTypes.MODIFIERS:
case TokenTypes.ANNOTATIONS:
parentAST = parentAST.getParent();
if (parentAST != null) {
switch (parentAST.getType()) {
case TokenTypes.ANNOTATION_DEF:
case TokenTypes.PACKAGE_DEF:
case TokenTypes.CLASS_DEF:
case TokenTypes.INTERFACE_DEF:
case TokenTypes.ENUM_DEF:
case TokenTypes.ENUM_CONSTANT_DEF:
case TokenTypes.CTOR_DEF:
case TokenTypes.METHOD_DEF:
case TokenTypes.PARAMETER_DEF:
case TokenTypes.VARIABLE_DEF:
targetAST = parentAST;
break;
case TokenTypes.MODIFIERS:
case TokenTypes.ANNOTATIONS:
parentAST = parentAST.getParent();
if (parentAST != null) {
switch (parentAST.getType()) {
case TokenTypes.ANNOTATION_DEF:
case TokenTypes.PACKAGE_DEF:
case TokenTypes.CLASS_DEF:
case TokenTypes.INTERFACE_DEF:
case TokenTypes.ENUM_DEF:
case TokenTypes.ENUM_CONSTANT_DEF:
case TokenTypes.CTOR_DEF:
case TokenTypes.METHOD_DEF:
case TokenTypes.PARAMETER_DEF:
case TokenTypes.VARIABLE_DEF:
targetAST = parentAST;
break;
default:
// unexpected target type
default:
// unexpected target type
}
}
}
break;
break;
default:
// unexpected container type
default:
// unexpected container type
}
}
if (targetAST == null) {
@ -396,15 +396,15 @@ public class SuppressWarningsHolder
if (ast != null && ast.getType() == TokenTypes.EXPR) {
final DetailAST firstChild = ast.getFirstChild();
switch (firstChild.getType()) {
case TokenTypes.STRING_LITERAL:
// NOTE: escaped characters are not unescaped
final String quotedText = firstChild.getText();
return quotedText.substring(1, quotedText.length() - 1);
case TokenTypes.IDENT:
return firstChild.getText();
default:
throw new IllegalArgumentException("String literal AST expected: "
+ firstChild);
case TokenTypes.STRING_LITERAL:
// NOTE: escaped characters are not unescaped
final String quotedText = firstChild.getText();
return quotedText.substring(1, quotedText.length() - 1);
case TokenTypes.IDENT:
return firstChild.getText();
default:
throw new IllegalArgumentException("String literal AST expected: "
+ firstChild);
}
}
throw new IllegalArgumentException("Expression AST expected: " + ast);
@ -420,21 +420,21 @@ public class SuppressWarningsHolder
private static List<String> getAnnotationValues(DetailAST ast)
{
switch (ast.getType()) {
case TokenTypes.EXPR:
return ImmutableList.of(getStringExpr(ast));
case TokenTypes.EXPR:
return ImmutableList.of(getStringExpr(ast));
case TokenTypes.ANNOTATION_ARRAY_INIT:
final List<String> valueList = Lists.newLinkedList();
DetailAST childAST = ast.getFirstChild();
while (childAST != null) {
if (childAST.getType() == TokenTypes.EXPR) {
valueList.add(getStringExpr(childAST));
case TokenTypes.ANNOTATION_ARRAY_INIT:
final List<String> valueList = Lists.newLinkedList();
DetailAST childAST = ast.getFirstChild();
while (childAST != null) {
if (childAST.getType() == TokenTypes.EXPR) {
valueList.add(getStringExpr(childAST));
}
childAST = childAST.getNextSibling();
}
childAST = childAST.getNextSibling();
}
return valueList;
return valueList;
default:
default:
}
throw new IllegalArgumentException(
"Expression or annotation array initializer AST expected: " + ast);

22
src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java
View File

@ -114,17 +114,17 @@ public class UncommentedMainCheck
public void visitToken(DetailAST ast)
{
switch (ast.getType()) {
case TokenTypes.PACKAGE_DEF:
visitPackageDef(ast);
break;
case TokenTypes.CLASS_DEF:
visitClassDef(ast);
break;
case TokenTypes.METHOD_DEF:
visitMethodDef(ast);
break;
default:
throw new IllegalStateException(ast.toString());
case TokenTypes.PACKAGE_DEF:
visitPackageDef(ast);
break;
case TokenTypes.CLASS_DEF:
visitClassDef(ast);
break;
case TokenTypes.METHOD_DEF:
visitMethodDef(ast);
break;
default:
throw new IllegalStateException(ast.toString());
}
}