定数の宣言位置の調整

git-svn-id: https://svn.sourceforge.jp/svnroot/charactermanaj/trunk@58 5b6e9025-a2e8-4882-b233-f889982098c5

diff --git a/src/charactermanaj/model/io/AbstractCharacterDataArchiveFile.java b/src/charactermanaj/model/io/AbstractCharacterDataArchiveFile.java
index b227ca5..f9f795e 100644 (file)
--- a/src/charactermanaj/model/io/AbstractCharacterDataArchiveFile.java
+++ b/src/charactermanaj/model/io/AbstractCharacterDataArchiveFile.java
@@ -921,8 +921,8 @@ public abstract class AbstractCharacterDataArchiveFile
 \r
                InputStream is = content.openStream();\r
                try {\r
-                       PartsInfoXMLReader xmlReader = new PartsInfoXMLReader();\r
-                       partsManageData = xmlReader.loadPartsManageData(is);\r
+                       PartsInfoXMLReader xmlWriter = new PartsInfoXMLReader();\r
+                       partsManageData = xmlWriter.loadPartsManageData(is);\r
                } finally {\r
                        is.close();\r
                }\r

diff --git a/src/charactermanaj/model/io/CharacterDataPersistent.java b/src/charactermanaj/model/io/CharacterDataPersistent.java
index 188d214..887044d 100644 (file)
--- a/src/charactermanaj/model/io/CharacterDataPersistent.java
+++ b/src/charactermanaj/model/io/CharacterDataPersistent.java
@@ -77,13 +77,7 @@ public class CharacterDataPersistent {
        /**\r
         * サンプルイメージファイル名\r
         */\r
-       public static final String SAMPLE_IMAGE_FILENAME = "preview.png";\r
-\r
-       /**\r
-        * キャラクター定義バージョン\r
-        */\r
-       public static final String VERSION_SIG_1_0 = "1.0";\r
-\r
+       private static final String SAMPLE_IMAGE_FILENAME = "preview.png";\r
 \r
        /**\r
         * プロファイルの列挙時のエラーハンドラ.<br>\r

diff --git a/src/charactermanaj/model/io/CharacterDataXMLWriter.java b/src/charactermanaj/model/io/CharacterDataXMLWriter.java
index cbeff3c..e8d7863 100644 (file)
--- a/src/charactermanaj/model/io/CharacterDataXMLWriter.java
+++ b/src/charactermanaj/model/io/CharacterDataXMLWriter.java
@@ -1,7 +1,5 @@
 package charactermanaj.model.io;\r
 \r
-import static charactermanaj.model.io.CharacterDataPersistent.VERSION_SIG_1_0;\r
-\r
 import java.awt.Color;\r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -49,10 +47,22 @@ import charactermanaj.model.RecommendationURL;
 public class CharacterDataXMLWriter {\r
 \r
        /**\r
+        * キャラクター定義バージョン\r
+        */\r
+       private static final String VERSION_SIG_1_0 = "1.0";\r
+\r
+       /**\r
         * キャラクター定義XMLファイルの名前空間\r
         */\r
        private static final String NS = "http://charactermanaj.sourceforge.jp/schema/charactermanaj";\r
 \r
+       /**\r
+        * キャラクターデータのXMLの書き込み.\r
+        * \r
+        * @param characterData\r
+        * @param outstm\r
+        * @throws IOException\r
+        */\r
        public void writeXMLCharacterData(CharacterData characterData,\r
                        OutputStream outstm) throws IOException {\r
                if (outstm == null || characterData == null) {\r