From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Fri, 17 Jun 2016 18:23:13 +0000 (+0900)
Subject: 抜けたthisを補充
X-Git-Tag: fromMercurial~29
X-Git-Url: http://git.osdn.net/view?p=jindolf%2FJindolf.git;a=commitdiff_plain;h=cb307d7d8549b42b7fc660a6d9e9081b3ecd3640

抜けたthisを補充
---

diff --git a/src/main/java/jp/sfjp/jindolf/data/Player.java b/src/main/java/jp/sfjp/jindolf/data/Player.java
index b7cc11e..bf36f51 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Player.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Player.java
@@ -46,7 +46,7 @@ public class Player{
      * @return Avatar
      */
     public Avatar getAvatar(){
-        return avatar;
+        return this.avatar;
     }
 
     /**
@@ -63,7 +63,7 @@ public class Player{
      * @return 役割
      */
     public GameRole getRole(){
-        return role;
+        return this.role;
     }
 
     /**
@@ -80,7 +80,7 @@ public class Player{
      * @return 運命
      */
     public Destiny getDestiny(){
-        return destiny;
+        return this.destiny;
     }
 
     /**
@@ -97,7 +97,7 @@ public class Player{
      * @return プロローグを0とする命日。死んでなければ負。
      */
     public int getObitDay(){
-        return obitDay;
+        return this.obitDay;
     }
 
     /**
@@ -114,7 +114,7 @@ public class Player{
      * @return プレイヤーID
      */
     public String getIdName(){
-        return idName;
+        return this.idName;
     }
 
     /**
@@ -132,7 +132,7 @@ public class Player{
      * @return URL文字列
      */
     public String getUrlText(){
-        return urlText;
+        return this.urlText;
     }
 
     /**
@@ -149,7 +149,7 @@ public class Player{
      * @return エントリーNo.
      */
     public int getEntryNo(){
-        return entryNo;
+        return this.entryNo;
     }
 
     /**
diff --git a/src/main/java/jp/sfjp/jindolf/data/Village.java b/src/main/java/jp/sfjp/jindolf/data/Village.java
index 9c5be0f..d6f8a7d 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Village.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Village.java
@@ -37,40 +37,6 @@ import jp.sourceforge.jindolf.parser.SeqRange;
  */
 public class Village implements Comparable<Village> {
 
-    /**
-     * 村同士を比較するためのComparator。
-     */
-    private static class VillageComparator implements Comparator<Village> {
-
-        /**
-         * コンストラクタ。
-         */
-        public VillageComparator(){
-            super();
-            return;
-        }
-
-        /**
-         * {@inheritDoc}
-         * @param v1 {@inheritDoc}
-         * @param v2 {@inheritDoc}
-         * @return {@inheritDoc}
-         */
-        @Override
-        public int compare(Village v1, Village v2){
-            int v1Num;
-            if(v1 == null) v1Num = Integer.MIN_VALUE;
-            else           v1Num = v1.getVillageIDNum();
-
-            int v2Num;
-            if(v2 == null) v2Num = Integer.MIN_VALUE;
-            else           v2Num = v2.getVillageIDNum();
-
-            return v1Num - v2Num;
-        }
-
-    }
-
     private static final int GID_MIN = 3;
 
     private static final Comparator<Village> VILLAGE_COMPARATOR =
@@ -659,6 +625,7 @@ public class Village implements Comparable<Village> {
         return getVillageFullName();
     }
 
+
     /**
      * Period一覧取得用ハンドラ。
      */
@@ -896,4 +863,39 @@ public class Village implements Comparable<Village> {
 
     }
 
+
+    /**
+     * 村同士を比較するためのComparator。
+     */
+    private static class VillageComparator implements Comparator<Village> {
+
+        /**
+         * コンストラクタ。
+         */
+        public VillageComparator(){
+            super();
+            return;
+        }
+
+        /**
+         * {@inheritDoc}
+         * @param v1 {@inheritDoc}
+         * @param v2 {@inheritDoc}
+         * @return {@inheritDoc}
+         */
+        @Override
+        public int compare(Village v1, Village v2){
+            int v1Num;
+            if(v1 == null) v1Num = Integer.MIN_VALUE;
+            else           v1Num = v1.getVillageIDNum();
+
+            int v2Num;
+            if(v2 == null) v2Num = Integer.MIN_VALUE;
+            else           v2Num = v2.getVillageIDNum();
+
+            return v1Num - v2Num;
+        }
+
+    }
+
 }
diff --git a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
index 00b0548..716b359 100644
--- a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
@@ -521,7 +521,7 @@ public class TalkDraw extends AbstractTextRow{
         this.dialog.paint(g);
 
         int anchorX = xPos + OFFSET_ANCHOR;
-        int anchorY = yPos + this.dialogOrigin.y + baloonHeight;
+        int anchorY = yPos + this.dialogOrigin.y + this.baloonHeight;
 
         for(AnchorDraw anchorDraw : this.anchorTalks){
             anchorDraw.setPos(anchorX, anchorY);
diff --git a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
index 305639f..17c7014 100644
--- a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
+++ b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
@@ -721,7 +721,8 @@ public class VillageDigest
         EventQueue.invokeLater(new Runnable(){
             @Override
             public void run(){
-                templateArea.scrollRectToVisible(new Rectangle());
+                JTextArea area = VillageDigest.this.templateArea;
+                area.scrollRectToVisible(new Rectangle());
             }
         });
         // TODO あらかじめテキストを全選択させておきたい
@@ -755,7 +756,7 @@ public class VillageDigest
             this.nextPlayer.setEnabled(true);
         }
 
-        Image image = village.getAvatarFaceImage(avatar);
+        Image image = this.village.getAvatarFaceImage(avatar);
         this.faceIcon.setImage(image);
         this.faceLabel.setIcon(null);          // なぜかこれが必要
         this.faceLabel.setIcon(this.faceIcon);