クラスメンバ定義順を統一

diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java b/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java
index 855a402..755f2cf 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/GameRole.java
@@ -52,6 +52,32 @@ public enum GameRole{
         ROLE_PATTERN = Pattern.compile(roleRegex.toString());\r
     }\r
 \r
+\r
+    private final String roleName;\r
+    private final char shortName;\r
+    private final String xmlName;\r
+    private final Team team;\r
+\r
+\r
+    /**\r
+     * コンストラクタ。\r
+     * @param roleName 役職名\r
+     * @param shortName 短縮名\r
+     * @param xmlName XML用シンボル\r
+     * @param team 陣営\r
+     */\r
+    private GameRole(String roleName,\r
+                      char shortName,\r
+                      String xmlName,\r
+                      Team team ){\r
+        this.roleName = roleName.intern();\r
+        this.shortName = shortName;\r
+        this.xmlName = xmlName.intern();\r
+        this.team = team;\r
+        return;\r
+    }\r
+\r
+\r
     /**\r
      * 与えられたマッチャ先頭が定義済みRole名に一致しないか調べる。\r
      * @param matcher マッチャ\r
@@ -81,28 +107,6 @@ public enum GameRole{
         return BALANCE_COMPARATOR;\r
     }\r
 \r
-    private final String roleName;\r
-    private final char shortName;\r
-    private final String xmlName;\r
-    private final Team team;\r
-\r
-    /**\r
-     * コンストラクタ。\r
-     * @param roleName 役職名\r
-     * @param shortName 短縮名\r
-     * @param xmlName XML用シンボル\r
-     * @param team 陣営\r
-     */\r
-    private GameRole(String roleName,\r
-                      char shortName,\r
-                      String xmlName,\r
-                      Team team ){\r
-        this.roleName = roleName.intern();\r
-        this.shortName = shortName;\r
-        this.xmlName = xmlName.intern();\r
-        this.team = team;\r
-        return;\r
-    }\r
 \r
     /**\r
      * 役職名を返す。\r
@@ -144,6 +148,14 @@ public enum GameRole{
             implements Comparator<GameRole> {\r
 \r
         /**\r
+         * コンストラクタ。\r
+         */\r
+        private PowerBalanceComparator(){\r
+            super();\r
+            return;\r
+        }\r
+\r
+        /**\r
          * 役職に順序を割り当てる。\r
          * 村人陣営のほうが狼陣営より小さい値を返す。\r
          * @param role 役職\r
@@ -172,19 +184,12 @@ public enum GameRole{
         }\r
 \r
         /**\r
-         * コンストラクタ。\r
-         */\r
-        private PowerBalanceComparator(){\r
-            super();\r
-            return;\r
-        }\r
-\r
-        /**\r
          * {@inheritDoc}\r
          * @param role1 {@inheritDoc}\r
          * @param role2 {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public int compare(GameRole role1, GameRole role2){\r
             int power1 = getPowerValue(role1);\r
             int power2 = getPowerValue(role2);\r

diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/LandDef.java b/src/main/java/jp/sourceforge/jindolf/corelib/LandDef.java
index 3c127e3..4f845a8 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/corelib/LandDef.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/LandDef.java
@@ -61,6 +61,30 @@ public final class LandDef{
 \r
     private static final Pattern ISO8601_PATTERN;\r
 \r
+\r
+    private String landName;\r
+    private String landId;\r
+    private String formalName;\r
+    private String landPrefix;\r
+    private LandState landState;\r
+    private int minMembers;\r
+    private int maxMembers;\r
+    private URI webURI;\r
+    private URI cgiURI;\r
+    private URI tombFaceIconURI;\r
+    private URI tombBodyIconURI;\r
+    private String faceURITemplate;\r
+    private String bodyURITemplate;\r
+    private Locale locale;\r
+    private Charset encoding;\r
+    private TimeZone timeZone;\r
+    private long startDateTime;\r
+    private long endDateTime;\r
+    private String description;\r
+    private String contactInfo;\r
+    private int[] invalidVid;\r
+\r
+\r
     static{\r
         STATE_MAP = new HashMap<String, LandState>();\r
         STATE_MAP.put("closed",     LandState.CLOSED);\r
@@ -89,6 +113,16 @@ public final class LandDef{
         ISO8601_PATTERN = Pattern.compile(iso8601Regex);\r
     }\r
 \r
+\r
+    /**\r
+     * コンストラクタ。\r
+     */\r
+    private LandDef(){\r
+        super();\r
+        return;\r
+    }\r
+\r
+\r
     /**\r
      * ISO8601形式の日付をエポック秒msに変換する。\r
      * JRE1.6 の javax.xml.bind.DatatypeConverter 代替品\r
@@ -567,36 +601,6 @@ public final class LandDef{
     }\r
 \r
 \r
-    private String landName;\r
-    private String landId;\r
-    private String formalName;\r
-    private String landPrefix;\r
-    private LandState landState;\r
-    private int minMembers;\r
-    private int maxMembers;\r
-    private URI webURI;\r
-    private URI cgiURI;\r
-    private URI tombFaceIconURI;\r
-    private URI tombBodyIconURI;\r
-    private String faceURITemplate;\r
-    private String bodyURITemplate;\r
-    private Locale locale;\r
-    private Charset encoding;\r
-    private TimeZone timeZone;\r
-    private long startDateTime;\r
-    private long endDateTime;\r
-    private String description;\r
-    private String contactInfo;\r
-    private int[] invalidVid;\r
-\r
-    /**\r
-     * コンストラクタ。\r
-     */\r
-    private LandDef(){\r
-        super();\r
-        return;\r
-    }\r
-\r
     /**\r
      * 国名を得る。\r
      * @return 国名\r

diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/PreDefAvatar.java b/src/main/java/jp/sourceforge/jindolf/corelib/PreDefAvatar.java
index 3192f07..ef38838 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/corelib/PreDefAvatar.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/PreDefAvatar.java
@@ -25,6 +25,51 @@ import org.xml.sax.SAXException;
  */\r
 public final class PreDefAvatar{\r
 \r
+    private final String avatarId;\r
+    private final String fullName;\r
+    private final String jobTitle;\r
+    private final String shortName;\r
+    private final int serialNo;\r
+\r
+\r
+    /**\r
+     * コンストラクタ。\r
+     * @param avatarId Avatar識別子\r
+     * @param fullName フルネーム\r
+     * @param jobTitle 職業名\r
+     * @param shortName 省略名\r
+     * @param serialNo 通し番号\r
+     */\r
+    private PreDefAvatar(String avatarId,\r
+                         String fullName,\r
+                         String jobTitle,\r
+                         String shortName,\r
+                         int serialNo ){\r
+        super();\r
+\r
+        if(   avatarId  == null\r
+           || fullName  == null\r
+           || jobTitle  == null\r
+           || shortName == null ){\r
+            throw new NullPointerException();\r
+        }\r
+\r
+        if(   avatarId.length() <= 0\r
+           || fullName.length() <= 0\r
+           || serialNo < 0 ){\r
+            throw new IllegalArgumentException();\r
+        }\r
+\r
+        this.avatarId  = avatarId.intern();\r
+        this.fullName  = fullName.intern();\r
+        this.jobTitle  = jobTitle.intern();\r
+        this.shortName = shortName.intern();\r
+        this.serialNo  = serialNo;\r
+\r
+        return;\r
+    }\r
+\r
+\r
     /**\r
      * プリセット済みAvatar一覧リストを生成する。\r
      * @param builder DOMビルダ\r
@@ -128,48 +173,6 @@ public final class PreDefAvatar{
         return avatar;\r
     }\r
 \r
-    private final String avatarId;\r
-    private final String fullName;\r
-    private final String jobTitle;\r
-    private final String shortName;\r
-    private final int serialNo;\r
-\r
-    /**\r
-     * コンストラクタ。\r
-     * @param avatarId Avatar識別子\r
-     * @param fullName フルネーム\r
-     * @param jobTitle 職業名\r
-     * @param shortName 省略名\r
-     * @param serialNo 通し番号\r
-     */\r
-    private PreDefAvatar(String avatarId,\r
-                         String fullName,\r
-                         String jobTitle,\r
-                         String shortName,\r
-                         int serialNo ){\r
-        super();\r
-\r
-        if(   avatarId  == null\r
-           || fullName  == null\r
-           || jobTitle  == null\r
-           || shortName == null ){\r
-            throw new NullPointerException();\r
-        }\r
-\r
-        if(   avatarId.length() <= 0\r
-           || fullName.length() <= 0\r
-           || serialNo < 0 ){\r
-            throw new IllegalArgumentException();\r
-        }\r
-\r
-        this.avatarId  = avatarId.intern();\r
-        this.fullName  = fullName.intern();\r
-        this.jobTitle  = jobTitle.intern();\r
-        this.shortName = shortName.intern();\r
-        this.serialNo  = serialNo;\r
-\r
-        return;\r
-    }\r
 \r
     /**\r
      * Avatar識別子を返す。\r

diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java b/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java
index 997a990..eedfee4 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/VillageTag.java
@@ -127,6 +127,20 @@ public enum VillageTag{
         VTAG_PATTERN = Pattern.compile(vtagRegex.toString());\r
     }\r
 \r
+\r
+    private final String tagName;\r
+\r
+\r
+    /**\r
+     * 隠しコンストラクタ。\r
+     * @param tagName 村名\r
+     */\r
+    private VillageTag(String tagName){\r
+        this.tagName = tagName.intern();\r
+        return;\r
+    }\r
+\r
+\r
     /**\r
      * 村名からEnumメンバを得る。\r
      * @param tagName 村名\r
@@ -157,16 +171,6 @@ public enum VillageTag{
         return null;\r
     }\r
 \r
-    private final String tagName;\r
-\r
-    /**\r
-     * 隠しコンストラクタ。\r
-     * @param tagName 村名\r
-     */\r
-    private VillageTag(String tagName){\r
-        this.tagName = tagName.intern();\r
-        return;\r
-    }\r
 \r
     /**\r
      * 村名を得る。\r

diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/XmlResource.java b/src/main/java/jp/sourceforge/jindolf/corelib/XmlResource.java
index 346e93b..a1104b8 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/corelib/XmlResource.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/XmlResource.java
@@ -22,8 +22,6 @@ import java.util.Map;
  */\r
 public final class XmlResource{\r
 \r
-    private static final Class<?> THISCLASS = XmlResource.class;\r
-\r
     /** 独自XMLスキーマ 外部URI名の前置詞。 {@value} */\r
     public static final String O_XSDBASE =\r
             "http://jindolf.sourceforge.jp/xml/xsd/";\r
@@ -92,6 +90,10 @@ public final class XmlResource{
      */\r
     public static final Map<URI, URI> RESOLVE_MAP;\r
 \r
+\r
+    private static final Class<?> THISCLASS = XmlResource.class;\r
+\r
+\r
     static{\r
         new XmlResource();\r
 \r
@@ -126,6 +128,17 @@ public final class XmlResource{
         RESOLVE_MAP = Collections.unmodifiableMap(map);\r
     }\r
 \r
+\r
+    /**\r
+     * 隠れコンストラクタ。\r
+     */\r
+    private XmlResource(){\r
+        super();\r
+        assert this.getClass().equals(THISCLASS);\r
+        return;\r
+    }\r
+\r
+\r
     /**\r
      * 内部リソースのURIを得る。\r
      * @param res リソース名\r
@@ -152,13 +165,4 @@ public final class XmlResource{
         return uri;\r
     }\r
 \r
-    /**\r
-     * 隠れコンストラクタ。\r
-     */\r
-    private XmlResource(){\r
-        super();\r
-        assert this.getClass().equals(THISCLASS);\r
-        return;\r
-    }\r
-\r
 }\r