ソースコード診断に対処

diff --git a/src/main/java/jp/sourceforge/mikutoga/math/MkPos2D.java b/src/main/java/jp/sourceforge/mikutoga/math/MkPos2D.java
index d96b93d..b4983f0 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/math/MkPos2D.java
+++ b/src/main/java/jp/sourceforge/mikutoga/math/MkPos2D.java
@@ -28,22 +28,22 @@ public class MkPos2D {
 
     /**
      * コンストラクタ。
-     * @param xPos X座標
-     * @param yPos Y座標
+     * @param xPosArg X座標
+     * @param yPosArg Y座標
      */
-    public MkPos2D(double xPos, double yPos){
+    public MkPos2D(double xPosArg, double yPosArg){
         super();
-        this.xPos = xPos;
-        this.yPos = yPos;
+        this.xPos = xPosArg;
+        this.yPos = yPosArg;
         return;
     }
 
     /**
      * X座標を設定する。
-     * @param xPos X座標
+     * @param xPosArg X座標
      */
-    public void setXpos(double xPos){
-        this.xPos = xPos;
+    public void setXpos(double xPosArg){
+        this.xPos = xPosArg;
         return;
     }
 
@@ -57,10 +57,10 @@ public class MkPos2D {
 
     /**
      * Y座標を設定する。
-     * @param yPos Y座標
+     * @param yPosArg Y座標
      */
-    public void setYpos(double yPos){
-        this.yPos = yPos;
+    public void setYpos(double yPosArg){
+        this.yPos = yPosArg;
         return;
     }
 

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/TripletRange.java b/src/main/java/jp/sourceforge/mikutoga/pmd/TripletRange.java
index 04aa853..ae36731 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/TripletRange.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/TripletRange.java
@@ -30,16 +30,16 @@ public class TripletRange {
     /**
      * X値有効範囲を設定する。
      * 下限値が上限値より大きければ入れ替える。
-     * @param xFrom X値下限
-     * @param xTo X値上限
+     * @param xFromArg X値下限
+     * @param xToArg X値上限
      */
-    public void setXRange(float xFrom, float xTo){
-        if(xFrom <= xTo){
-            this.xFrom = xFrom;
-            this.xTo = xTo;
+    public void setXRange(float xFromArg, float xToArg){
+        if(xFromArg <= xToArg){
+            this.xFrom = xFromArg;
+            this.xTo = xToArg;
         }else{
-            this.xFrom = xTo;
-            this.xTo = xFrom;
+            this.xFrom = xToArg;
+            this.xTo = xFromArg;
         }
         return;
     }
@@ -47,16 +47,16 @@ public class TripletRange {
     /**
      * Y値有効範囲を設定する。
      * 下限値が上限値より大きければ入れ替える。
-     * @param yFrom Y値下限
-     * @param yTo Y値上限
+     * @param yFromArg Y値下限
+     * @param yToArg Y値上限
      */
-    public void setYRange(float yFrom, float yTo){
-        if(yFrom <= yTo){
-            this.yFrom = yFrom;
-            this.yTo = yTo;
+    public void setYRange(float yFromArg, float yToArg){
+        if(yFromArg <= yToArg){
+            this.yFrom = yFromArg;
+            this.yTo = yToArg;
         }else{
-            this.yFrom = yTo;
-            this.yTo = yFrom;
+            this.yFrom = yToArg;
+            this.yTo = yFromArg;
         }
         return;
     }
@@ -64,16 +64,16 @@ public class TripletRange {
     /**
      * Z値有効範囲を設定する。
      * 下限値が上限値より大きければ入れ替える。
-     * @param zFrom Z値下限
-     * @param zTo Z値上限
+     * @param zFromArg Z値下限
+     * @param zToArg Z値上限
      */
-    public void setZRange(float zFrom, float zTo){
-        if(zFrom <= zTo){
-            this.zFrom = zFrom;
-            this.zTo = zTo;
+    public void setZRange(float zFromArg, float zToArg){
+        if(zFromArg <= zToArg){
+            this.zFrom = zFromArg;
+            this.zTo = zToArg;
         }else{
-            this.zFrom = zTo;
-            this.zTo = zFrom;
+            this.zFrom = zToArg;
+            this.zTo = zFromArg;
         }
         return;
     }

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
index 1bf7f97..e545ffe 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
@@ -17,8 +17,6 @@ import jp.sourceforge.mikutoga.parser.MmdSource;
  */
 public class PmdParserBase extends CommonParser {
 
-    public static final int HEADER_LENGTH = 7;
-
     /** 改行文字列 CR。 */
     protected static final String CR = "\r";       // 0x0d
     /** 改行文字列 LF。 */
@@ -26,6 +24,8 @@ public class PmdParserBase extends CommonParser {
     /** 改行文字列 CRLF。 */
     protected static final String CRLF = CR + LF;  // 0x0d, 0x0a
 
+    private static final int HEADER_LENGTH = 7;
+
     private static final byte[] MAGIC_BYTES = {
         (byte)0x50, (byte)0x6d, (byte)0x64,               // "Pmd"
         (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,   // 1.0f

diff --git a/src/main/java/jp/sourceforge/mikutoga/typical/TypicalObject.java b/src/main/java/jp/sourceforge/mikutoga/typical/TypicalObject.java
index f1a4bd8..ff5e2d5 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/typical/TypicalObject.java
+++ b/src/main/java/jp/sourceforge/mikutoga/typical/TypicalObject.java
@@ -150,7 +150,7 @@ class TypicalObject {
         /**
          * コンストラクタ。
          */
-        private OrderComparator(){
+        OrderComparator(){
             super();
             return;
         }

diff --git a/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java b/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java
index 66c3234..66dea2d 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java
+++ b/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java
@@ -314,14 +314,14 @@ public final class DomUtils {
     /**
      * 同じ親要素と同じ要素名を持つ兄弟要素を列挙する列挙子。
      */
-    private static class ElemIterator implements Iterator<Element>{
+    private static final class ElemIterator implements Iterator<Element>{
         private Element next;
 
         /**
          * コンストラクタ。
          * @param elem 最初の要素。nullを指定すれば空列挙子となる。
          */
-        private ElemIterator(Element elem){
+        ElemIterator(Element elem){
             super();
             this.next = elem;
         }

diff --git a/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java b/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java
index 1bb3acf..dc7ffd0 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java
+++ b/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java
@@ -29,15 +29,18 @@ import org.xml.sax.SAXException;
 public class XmlResourceResolver
         implements LSResourceResolver, EntityResolver {
 
+    /** XML Schema. */
     public static final String SCHEMA_XML =
             "http://www.w3.org/2001/xml.xsd";
+
+    /** XSD名前空間。 */
     public static final String NS_XSD =
             "http://www.w3.org/2001/XMLSchema-instance";
 
     private static final String LOCAL_SCHEMA_XML =
             "resources/xml-2009-01.xsd";
     private static final URI EMPTY_URI = URI.create("");
-    private static final Class THISCLASS = XmlResourceResolver.class;
+    private static final Class<?> THISCLASS = XmlResourceResolver.class;
 
     private final Map<URI, URI> uriMap = new HashMap<URI, URI>();
 
@@ -227,7 +230,7 @@ public class XmlResourceResolver
         /**
          * コンストラクタ。
          */
-        private LSInputImpl(){
+        LSInputImpl(){
             super();
             return;
         }