From 7e5fe9f7bbb443d811ab7b186a3c871fc7adf04d Mon Sep 17 00:00:00 2001
From: jk-5 <jk-5@users.noreply.github.com>
Date: Sun, 4 May 2014 18:16:45 +0200
Subject: [PATCH] Fix checkstyle

---
 build.gradle                                  |   2 +-
 .../core/recipes/AssemblyRecipeManager.java   |   3 +-
 guidelines/buildcraft.checkstyle              | 156 +++++++++---------
 3 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/build.gradle b/build.gradle
index be3099e0..8a42eae5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -115,7 +115,7 @@ jar {
 	from sourceSets.api.output
 }
 
-tasks.withType(Checkstyle).all {
+checkstyle {
 	configFile = file('guidelines/buildcraft.checkstyle')
 }
 
diff --git a/common/buildcraft/core/recipes/AssemblyRecipeManager.java b/common/buildcraft/core/recipes/AssemblyRecipeManager.java
index ae7b88b1..39e1d90b 100644
--- a/common/buildcraft/core/recipes/AssemblyRecipeManager.java
+++ b/common/buildcraft/core/recipes/AssemblyRecipeManager.java
@@ -121,8 +121,9 @@ public class AssemblyRecipeManager implements IAssemblyRecipeManager {
 					int found = 0; // Amount of ingredient found in inventory
 					// TODO: this i++ is highly dubious here, and against good
 					// programming practises. Investigate and fix or document.
+					//CHECKSTYLE.OFF: ModifiedControlVariable
 					int expected = (Integer) processedInput[i++ + 1];
-
+					//CHECKSTYLE.ON: ModifiedControlVariable
 					for (IInvSlot slot : InventoryIterator.getIterable(inv, ForgeDirection.UNKNOWN)) {
 						ItemStack item = slot.getStackInSlot();
 						if (item == null) {
diff --git a/guidelines/buildcraft.checkstyle b/guidelines/buildcraft.checkstyle
index d253f077..dd2a1bc8 100755
--- a/guidelines/buildcraft.checkstyle
+++ b/guidelines/buildcraft.checkstyle
@@ -1,79 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
 <!--
     This configuration file was written by the eclipse-cs plugin configuration editor
--->
+-->
 <!--
     Checkstyle-Configuration: BuildCraft
     Description: none
--->
-<module name="Checker">
-  <property name="severity" value="warning"/>
-  <module name="TreeWalker">
-    <module name="MissingOverride"/>
-    <module name="RedundantImport"/>
-    <module name="UnusedImports"/>
-    <module name="AvoidStarImport"/>
-    <module name="MethodName"/>
-    <module name="ImportOrder">
-      <property name="groups" value="java,com,org,io,net.minecraft,cpw,net.minecraftforge,buildcraft"/>
-    </module>
-    <module name="WhitespaceAround">
-      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
-      <property name="allowEmptyConstructors" value="true"/>
-      <property name="allowEmptyMethods" value="true"/>
-    </module>
-    <module name="ModifierOrder"/>
-    <module name="RedundantModifier"/>
-    <module name="NeedBraces"/>
-    <module name="RightCurly"/>
-    <module name="LeftCurly"/>
-    <module name="ParenPad"/>
-    <module name="TypecastParenPad">
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter"/>
-    <module name="GenericWhitespace"/>
-    <module name="EmptyForInitializerPad"/>
-    <module name="EmptyForIteratorPad"/>
-    <module name="NoWhitespaceAfter">
-      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="allowLineBreaks" value="true"/>
-      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
-    </module>
-    <module name="DefaultComesLast"/>
-    <module name="DeclarationOrder"/>
-    <module name="EmptyStatement"/>
-    <module name="EqualsAvoidNull"/>
-    <module name="FallThrough"/>
-    <module name="HiddenField">
-      <property name="tokens" value="VARIABLE_DEF"/>
-    </module>
-    <module name="ModifiedControlVariable"/>
-    <module name="NoClone"/>
-    <module name="NoFinalizer"/>
-    <module name="PackageDeclaration"/>
-    <module name="ParameterAssignment"/>
-    <module name="SimplifyBooleanReturn"/>
-    <module name="StringLiteralEquality"/>
-    <module name="UnnecessaryParentheses"/>
-    <module name="OneStatementPerLine"/>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="MemberName"/>
-    <module name="MethodTypeParameterName"/>
-    <module name="PackageName">
-      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9_]*)*$"/>
-    </module>
-    <module name="ParameterName"/>
-    <module name="TypeName"/>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="ArrayTypeStyle"/>
-    <module name="UpperEll"/>
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
+-->
+<module name="Checker">
+  <property name="severity" value="error"/>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+    <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="MissingOverride"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <module name="AvoidStarImport"/>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+    </module>
+    <module name="ImportOrder">
+      <property name="groups" value="java,com,org,io,net.minecraft,cpw,net.minecraftforge,buildcraft"/>
+    </module>
+    <module name="WhitespaceAround">
+      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+    </module>
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+    <module name="NeedBraces"/>
+    <module name="RightCurly"/>
+    <module name="LeftCurly"/>
+    <module name="ParenPad"/>
+    <module name="TypecastParenPad">
+      <property name="tokens" value="RPAREN,TYPECAST"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="GenericWhitespace"/>
+    <module name="EmptyForInitializerPad"/>
+    <module name="EmptyForIteratorPad"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="allowLineBreaks" value="true"/>
+      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+    </module>
+    <module name="DefaultComesLast"/>
+    <module name="DeclarationOrder"/>
+    <module name="EmptyStatement"/>
+    <module name="EqualsAvoidNull"/>
+    <module name="FallThrough"/>
+    <module name="HiddenField">
+      <property name="tokens" value="VARIABLE_DEF"/>
+    </module>
+    <module name="ModifiedControlVariable"/>
+    <module name="NoClone"/>
+    <module name="NoFinalizer"/>
+    <module name="PackageDeclaration"/>
+    <module name="ParameterAssignment"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="StringLiteralEquality"/>
+    <module name="UnnecessaryParentheses"/>
+    <module name="OneStatementPerLine"/>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="MemberName"/>
+    <module name="MethodTypeParameterName"/>
+    <module name="PackageName">
+      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9_]*)*$"/>
+    </module>
+    <module name="ParameterName"/>
+    <module name="TypeName"/>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+    <module name="OuterTypeFilename"/>
+    <module name="FileContentsHolder"/>
+  </module>
+</module>