modify whitespaces.

diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index 6d6a0ad..5f6d0fd 100644 (file)
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -41,6 +41,7 @@
     <suppress files="" checks="RedundantModifier" />
 
     <!-- Whitespace -->
     <suppress files="" checks="RedundantModifier" />
 
     <!-- Whitespace -->

+    <suppress files="" checks="ParenPad" />

     <suppress files="" checks="SingleSpaceSeparator" />
 
 </suppressions>
     <suppress files="" checks="SingleSpaceSeparator" />
 
 </suppressions>

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 7d19930..6289d5e 100644 (file)
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -39,6 +39,7 @@
         <property name="fileExtensions" value="xml" />
     </module>
     <module name="RegexpHeader">
         <property name="fileExtensions" value="xml" />
     </module>
     <module name="RegexpHeader">

+        <!-- /* ... */ -->

         <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
         <property name="multiLines" value="2" />
         <property name="fileExtensions" value="java" />
         <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
         <property name="multiLines" value="2" />
         <property name="fileExtensions" value="java" />


@@ -188,7 +189,10 @@
         <module name="RequireThis">
             <property name="checkMethods" value="false" />
         </module>
         <module name="RequireThis">
             <property name="checkMethods" value="false" />
         </module>

-        <module name="ReturnCount" />
+        <module name="ReturnCount">
+            <property name="max" value="5" />
+            <property name="maxForVoid" value="5" />
+        </module>

         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />


@@ -352,16 +356,17 @@
         <module name="GenericWhitespace" />
         <module name="MethodParamPad" />
         <module name="NoLineWrap" />
         <module name="GenericWhitespace" />
         <module name="MethodParamPad" />
         <module name="NoLineWrap" />

-        <module name="NoWhitespaceAfter" />
-        <module name="NoWhitespaceBefore" />
-        <module name="OperatorWrap" />
-        <module name="ParenPad">
-            <property name="option" value="nospace" />
+        <module name="NoWhitespaceAfter">

             <property
                 name="tokens"
             <property
                 name="tokens"

-                value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
+                value="AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, DOT"

             />
         </module>
             />
         </module>

+        <module name="NoWhitespaceBefore">
+            <property name="allowLineBreaks" value="true" />
+        </module>
+        <module name="OperatorWrap" />
+        <module name="ParenPad" />

         <module name="SeparatorWrap">
             <property name="tokens" value="DOT"/>
             <property name="option" value="nl"/>
         <module name="SeparatorWrap">
             <property name="tokens" value="DOT"/>
             <property name="option" value="nl"/>

diff --git a/src/main/java/jp/sfjp/mikutoga/bin/parser/TextDecoder.java b/src/main/java/jp/sfjp/mikutoga/bin/parser/TextDecoder.java
index 0652e14..7410bab 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/bin/parser/TextDecoder.java
+++ b/src/main/java/jp/sfjp/mikutoga/bin/parser/TextDecoder.java
@@ -56,7 +56,7 @@ public class TextDecoder {
 
         this.decoder = decoder;
         this.decoder.reset();
 
         this.decoder = decoder;
         this.decoder.reset();

-        this.decoder.onMalformedInput     (CodingErrorAction.REPORT);
+        this.decoder.onMalformedInput(     CodingErrorAction.REPORT);

         this.decoder.onUnmappableCharacter(CodingErrorAction.REPORT);
 
         return;
         this.decoder.onUnmappableCharacter(CodingErrorAction.REPORT);
 
         return;

diff --git a/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdBasicParser.java b/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdBasicParser.java
index 31fe622..cf74a12 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdBasicParser.java
+++ b/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdBasicParser.java
@@ -250,7 +250,7 @@ class VmdBasicParser extends ProxyParser{
         this.handler.vmdBoneIntpltXpos(xP1x, xP1y, xP2x, xP2y);
         this.handler.vmdBoneIntpltYpos(yP1x, yP1y, yP2x, yP2y);
         this.handler.vmdBoneIntpltZpos(zP1x, zP1y, zP2x, zP2y);
         this.handler.vmdBoneIntpltXpos(xP1x, xP1y, xP2x, xP2y);
         this.handler.vmdBoneIntpltYpos(yP1x, yP1y, yP2x, yP2y);
         this.handler.vmdBoneIntpltZpos(zP1x, zP1y, zP2x, zP2y);

-        this.handler.vmdBoneIntpltRot (rP1x, rP1y, rP2x, rP2y);
+        this.handler.vmdBoneIntpltRot( rP1x, rP1y, rP2x, rP2y);

 
         return;
     }
 
         return;
     }

diff --git a/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdCameraParser.java b/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdCameraParser.java
index 57e7e64..8273a13 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdCameraParser.java
+++ b/src/main/java/jp/sfjp/mikutoga/vmd/parser/VmdCameraParser.java
@@ -157,8 +157,8 @@ class VmdCameraParser extends ProxyParser{
 
         assert idx == this.etcIntplt.length;
 
 
         assert idx == this.etcIntplt.length;
 

-        this.handler.vmdCameraIntpltRotation  (rP1x, rP1y, rP2x, rP2y);
-        this.handler.vmdCameraIntpltRange     (dP1x, dP1y, dP2x, dP2y);
+        this.handler.vmdCameraIntpltRotation(  rP1x, rP1y, rP2x, rP2y);
+        this.handler.vmdCameraIntpltRange(     dP1x, dP1y, dP2x, dP2y);

         this.handler.vmdCameraIntpltProjection(pP1x, pP1y, pP2x, pP2y);
 
         return;
         this.handler.vmdCameraIntpltProjection(pP1x, pP1y, pP2x, pP2y);
 
         return;