OSDN Git Service

WorkingSetの保存と復元をシリアライズからXML形式に変更した。
authorseraphy <seraphy@5b6e9025-a2e8-4882-b233-f889982098c5>
Sat, 28 Dec 2013 21:39:28 +0000 (21:39 +0000)
committerseraphy <seraphy@5b6e9025-a2e8-4882-b233-f889982098c5>
Sat, 28 Dec 2013 21:39:28 +0000 (21:39 +0000)
git-svn-id: https://svn.sourceforge.jp/svnroot/charactermanaj/trunk@90 5b6e9025-a2e8-4882-b233-f889982098c5

15 files changed:
resources/schema/character.xsd
resources/schema/character_inc.xsd
src/charactermanaj/Main.java
src/charactermanaj/model/IndependentPartsColorInfo.java [new file with mode: 0644]
src/charactermanaj/model/IndependentPartsSetInfo.java [new file with mode: 0644]
src/charactermanaj/model/IndependentPartsSetInfoList.java [new file with mode: 0644]
src/charactermanaj/model/WorkingSet.java
src/charactermanaj/model/WorkingSet2.java [new file with mode: 0644]
src/charactermanaj/model/io/CharacterDataPersistent.java
src/charactermanaj/model/io/CharacterDataXMLReader.java
src/charactermanaj/model/io/CharacterDataXMLWriter.java
src/charactermanaj/model/io/WorkingSetXMLReader.java [new file with mode: 0644]
src/charactermanaj/model/io/WorkingSetXMLWriter.java
src/charactermanaj/model/util/StartupSupport.java
src/charactermanaj/ui/MainFrame.java

index 8613c63..1e915a8 100644 (file)
@@ -1,13 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<xs:schema\r
-  targetNamespace="http://charactermanaj.sourceforge.jp/schema/charactermanaj"\r
-  xmlns="http://charactermanaj.sourceforge.jp/schema/charactermanaj"\r
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-  xmlns:xml="http://www.w3.org/XML/1998/namespace"\r
-  attributeFormDefault="qualified"\r
-  elementFormDefault="qualified">\r
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>\r
-  <xs:include schemaLocation="character_inc.xsd"/>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://charactermanaj.sourceforge.jp/schema/charactermanaj" targetNamespace="http://charactermanaj.sourceforge.jp/schema/charactermanaj" attributeFormDefault="qualified" elementFormDefault="qualified">\r
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" />\r
+  <xs:include schemaLocation="character_inc.xsd" />\r
   <xs:element name="character">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="ja">キャラクターデータの定義</xs:documentation>\r
           <xs:complexType>\r
             <xs:simpleContent>\r
               <xs:extension base="tokenNotEmpty">\r
-                 <xs:attribute ref="xml:lang" use="required" />\r
+                <xs:attribute ref="xml:lang" use="required" />\r
               </xs:extension>\r
             </xs:simpleContent>\r
           </xs:complexType>\r
         </xs:element>\r
-\r
         <xs:element name="information" minOccurs="0" maxOccurs="1">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">備考</xs:documentation>\r
@@ -60,7 +53,6 @@
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-        \r
         <xs:element name="image-size">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">イメージのサイズ(幅と高さ)</xs:documentation>\r
               <xs:element name="width">\r
                 <xs:simpleType>\r
                   <xs:restriction base="xs:unsignedInt">\r
-                    <xs:minExclusive value="0"/>\r
+                    <xs:minExclusive value="0" />\r
                   </xs:restriction>\r
                 </xs:simpleType>\r
               </xs:element>\r
               <xs:element name="height">\r
                 <xs:simpleType>\r
                   <xs:restriction base="xs:unsignedInt">\r
-                    <xs:minExclusive value="0"/>\r
+                    <xs:minExclusive value="0" />\r
                   </xs:restriction>\r
                 </xs:simpleType>\r
               </xs:element>\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-        \r
         <xs:element name="settings" minOccurs="0" maxOccurs="1">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">雑多なプロパティのコレクション</xs:documentation>\r
@@ -98,7 +89,7 @@
                 <xs:complexType>\r
                   <xs:simpleContent>\r
                     <xs:extension base="xs:string">\r
-                      <xs:attribute name="key" form="unqualified" use="required" type="xs:string"/>\r
+                      <xs:attribute name="key" form="unqualified" use="required" type="xs:string" />\r
                     </xs:extension>\r
                   </xs:simpleContent>\r
                 </xs:complexType>\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-        \r
         <xs:element name="categories">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">カテゴリの定義リスト、出現順で画面に表示される。</xs:documentation>\r
                       <xs:complexType>\r
                         <xs:simpleContent>\r
                           <xs:extension base="tokenNotEmpty">\r
-                            <xs:attribute ref="xml:lang" use="required"/>\r
+                            <xs:attribute ref="xml:lang" use="required" />\r
                           </xs:extension>\r
                         </xs:simpleContent>\r
                       </xs:complexType>\r
                                   <xs:complexType>\r
                                     <xs:simpleContent>\r
                                       <xs:extension base="tokenNotEmpty">\r
-                                        <xs:attribute ref="xml:lang" use="required"/>\r
+                                        <xs:attribute ref="xml:lang" use="required" />\r
                                       </xs:extension>\r
                                     </xs:simpleContent>\r
                                   </xs:complexType>\r
                                       </xs:annotation>\r
                                       <xs:simpleType>\r
                                         <xs:restriction base="xs:boolean">\r
-                                          <xs:pattern value="true"/>\r
-                                          <xs:pattern value="false"/>\r
+                                          <xs:pattern value="true" />\r
+                                          <xs:pattern value="false" />\r
                                         </xs:restriction>\r
                                       </xs:simpleType>\r
                                     </xs:attribute>\r
                     </xs:annotation>\r
                     <xs:simpleType>\r
                       <xs:restriction base="xs:boolean">\r
-                        <xs:pattern value="true"/>\r
-                        <xs:pattern value="false"/>\r
+                        <xs:pattern value="true" />\r
+                        <xs:pattern value="false" />\r
                       </xs:restriction>\r
                     </xs:simpleType>\r
                   </xs:attribute>\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-\r
         <xs:element name="colorGroups" minOccurs="0" maxOccurs="1">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">カラーグループの定義リスト</xs:documentation>\r
                       <xs:complexType>\r
                         <xs:simpleContent>\r
                           <xs:extension base="tokenNotEmpty">\r
-                            <xs:attribute ref="xml:lang" use="required"/>\r
+                            <xs:attribute ref="xml:lang" use="required" />\r
                           </xs:extension>\r
                         </xs:simpleContent>\r
                       </xs:complexType>\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-        \r
         <xs:element name="recommendations" minOccurs="0" maxOccurs="1">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">お薦めリンクのリスト</xs:documentation>\r
             </xs:sequence>\r
           </xs:complexType>\r
         </xs:element>\r
-\r
         <xs:element name="presets" minOccurs="0" maxOccurs="1" type="presetsType">\r
           <xs:annotation>\r
             <xs:documentation xml:lang="ja">定義済みパーツ組み合わせ例(プリセット)の定義リスト、定義順に表示される。</xs:documentation>\r
           </xs:annotation>\r
-               </xs:element>\r
-\r
+        </xs:element>\r
       </xs:sequence>\r
-      <xs:attribute name="id" form="unqualified" type="tokenNotEmpty" use="required"/>\r
-      <xs:attribute name="rev" form="unqualified" type="tokenNotEmpty" use="required"/>\r
+      <xs:attribute name="id" form="unqualified" type="tokenNotEmpty" use="required" />\r
+      <xs:attribute name="rev" form="unqualified" type="tokenNotEmpty" use="required" />\r
       <xs:attribute name="version" form="unqualified" type="tokenNotEmpty" use="required">\r
         <xs:annotation>\r
           <xs:documentation xml:lang="ja">このXMLのバージョン番号、1.0固定。</xs:documentation>\r
         </xs:annotation>\r
       </xs:attribute>\r
     </xs:complexType>\r
-\r
     <xs:key name="category-id">\r
-      <xs:selector xpath="categories/category"/>\r
-      <xs:field xpath="@id"/>\r
+      <xs:selector xpath="categories/category" />\r
+      <xs:field xpath="@id" />\r
     </xs:key>\r
     <xs:key name="layer-id">\r
-      <xs:selector xpath="categories/category/layers/layer"/>\r
-      <xs:field xpath="@id"/>\r
+      <xs:selector xpath="categories/category/layers/layer" />\r
+      <xs:field xpath="@id" />\r
     </xs:key>\r
     <xs:key name="colorGroup-id">\r
-      <xs:selector xpath="colorGroups/colorGroup"/>\r
-      <xs:field xpath="@id"/>\r
+      <xs:selector xpath="colorGroups/colorGroup" />\r
+      <xs:field xpath="@id" />\r
     </xs:key>\r
   </xs:element>\r
-</xs:schema>\r
+</xs:schema>
\ No newline at end of file
index 0d6b079..da3d8b5 100644 (file)
@@ -1,39 +1,30 @@
-<xs:schema\r
-  targetNamespace="http://charactermanaj.sourceforge.jp/schema/charactermanaj"\r
-  xmlns="http://charactermanaj.sourceforge.jp/schema/charactermanaj"\r
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-  xmlns:xml="http://www.w3.org/XML/1998/namespace"\r
-  attributeFormDefault="qualified"\r
-  elementFormDefault="qualified">\r
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://charactermanaj.sourceforge.jp/schema/charactermanaj" targetNamespace="http://charactermanaj.sourceforge.jp/schema/charactermanaj" attributeFormDefault="qualified" elementFormDefault="qualified">\r
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" />\r
   <xs:simpleType name="tokenNotEmpty">\r
-       <xs:annotation>\r
-               <xs:documentation xml:lang="ja">空文字を許可しないトークンの定義</xs:documentation>\r
-       </xs:annotation>\r
+    <xs:annotation>\r
+      <xs:documentation xml:lang="ja">空文字を許可しないトークンの定義</xs:documentation>\r
+    </xs:annotation>\r
     <xs:restriction base="xs:token">\r
-        <xs:minLength value="1"/>\r
+      <xs:minLength value="1" />\r
     </xs:restriction>\r
   </xs:simpleType>\r
-  \r
   <xs:simpleType name="floatMax1">\r
     <xs:restriction base="xs:float">\r
-      <xs:minInclusive value="0"/>\r
-      <xs:maxInclusive value="1"/>\r
+      <xs:minInclusive value="0" />\r
+      <xs:maxInclusive value="1" />\r
     </xs:restriction>\r
   </xs:simpleType>\r
-  \r
   <xs:simpleType name="floatMax1Round">\r
     <xs:restriction base="xs:float">\r
-      <xs:minInclusive value="-1"/>\r
-      <xs:maxInclusive value="1"/>\r
+      <xs:minInclusive value="-1" />\r
+      <xs:maxInclusive value="1" />\r
     </xs:restriction>\r
   </xs:simpleType>\r
-\r
   <xs:complexType name="rgbvalue">\r
-       <xs:annotation>\r
-               <xs:documentation xml:lang="ja">RGB変換パラメータ</xs:documentation>\r
-       </xs:annotation>\r
+    <xs:annotation>\r
+      <xs:documentation xml:lang="ja">RGB変換パラメータ</xs:documentation>\r
+    </xs:annotation>\r
     <xs:attribute name="offset" form="unqualified" type="xs:integer" use="required">\r
       <xs:annotation>\r
         <xs:documentation xml:lang="ja">オフセット</xs:documentation>\r
       </xs:annotation>\r
     </xs:attribute>\r
   </xs:complexType>\r
-  \r
   <xs:complexType name="hsbvalue">\r
-       <xs:annotation>\r
-               <xs:documentation xml:lang="ja">HSB変換パラメータ</xs:documentation>\r
-       </xs:annotation>\r
-    <xs:attribute name="hue" form="unqualified" type="floatMax1Round" use="required"/>\r
-    <xs:attribute name="saturation" form="unqualified" type="floatMax1Round" use="required"/>\r
-    <xs:attribute name="brightness" form="unqualified" type="floatMax1Round" use="required"/>\r
-    <xs:attribute name="contrast" form="unqualified" type="floatMax1Round" use="optional"/><!-- ver0.96追加 -->\r
+    <xs:annotation>\r
+      <xs:documentation xml:lang="ja">HSB変換パラメータ</xs:documentation>\r
+    </xs:annotation>\r
+    <xs:attribute name="hue" form="unqualified" type="floatMax1Round" use="required" />\r
+    <xs:attribute name="saturation" form="unqualified" type="floatMax1Round" use="required" />\r
+    <xs:attribute name="brightness" form="unqualified" type="floatMax1Round" use="required" />\r
+    <xs:attribute name="contrast" form="unqualified" type="floatMax1Round" use="optional" />\r
+    <!-- ver0.96追加 -->\r
   </xs:complexType>\r
-  \r
   <xs:simpleType name="rgbreplacetype">\r
-       <xs:annotation>\r
-               <xs:documentation xml:lang="ja">RGB置換タイプ</xs:documentation>\r
-       </xs:annotation>\r
+    <xs:annotation>\r
+      <xs:documentation xml:lang="ja">RGB置換タイプ</xs:documentation>\r
+    </xs:annotation>\r
     <xs:restriction base="xs:string">\r
-      <xs:enumeration value="NONE"/>\r
-      <xs:enumeration value="BLUE"/>\r
-      <xs:enumeration value="VIOLET"/>\r
-      <xs:enumeration value="RED"/>\r
-      <xs:enumeration value="YELLOW"/>\r
-      <xs:enumeration value="GREEN"/>\r
-      <xs:enumeration value="CYAN"/>\r
-      <xs:enumeration value="BLACK"/>\r
-      <xs:enumeration value="WHITE"/>\r
+      <xs:enumeration value="NONE" />\r
+      <xs:enumeration value="BLUE" />\r
+      <xs:enumeration value="VIOLET" />\r
+      <xs:enumeration value="RED" />\r
+      <xs:enumeration value="YELLOW" />\r
+      <xs:enumeration value="GREEN" />\r
+      <xs:enumeration value="CYAN" />\r
+      <xs:enumeration value="BLACK" />\r
+      <xs:enumeration value="WHITE" />\r
     </xs:restriction>\r
   </xs:simpleType>\r
-  \r
   <xs:complexType name="rgbreplacevalue">\r
     <xs:attribute name="replace-type" form="unqualified" use="required" type="rgbreplacetype">\r
       <xs:annotation>\r
@@ -90,7 +79,6 @@
       </xs:annotation>\r
     </xs:attribute>\r
   </xs:complexType>\r
-\r
   <xs:complexType name="presetsType">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="ja">定義済みパーツ組み合わせ例(プリセット)の定義リスト、定義順に表示される。</xs:documentation>\r
               <xs:complexType>\r
                 <xs:simpleContent>\r
                   <xs:extension base="tokenNotEmpty">\r
-                    <xs:attribute ref="xml:lang" use="required"/>\r
+                    <xs:attribute ref="xml:lang" use="required" />\r
                   </xs:extension>\r
                 </xs:simpleContent>\r
               </xs:complexType>\r
                 <xs:documentation xml:lang="ja">背景色</xs:documentation>\r
               </xs:annotation>\r
               <xs:complexType>\r
-                <xs:attribute name="color" form="unqualified" use="required" type="xs:string"/>\r
+                <xs:attribute name="color" form="unqualified" use="required" type="xs:string" />\r
               </xs:complexType>\r
             </xs:element>\r
             <xs:element name="affine-transform-parameter" minOccurs="0" maxOccurs="1">\r
                 <xs:documentation xml:lang="ja">アフィン変換用パラメータ、4または6つの要素からなるマトリックス</xs:documentation>\r
               </xs:annotation>\r
               <xs:simpleType>\r
-                <xs:list itemType="xs:double"/>\r
+                <xs:list itemType="xs:double" />\r
               </xs:simpleType>\r
             </xs:element>\r
             <xs:element name="category" nillable="false" minOccurs="1" maxOccurs="unbounded">\r
                     </xs:annotation>\r
                     <xs:complexType>\r
                       <xs:sequence>\r
-                       <xs:element name="color" nillable="false" minOccurs="0" maxOccurs="1">\r
+                        <xs:element name="color" nillable="false" minOccurs="0" maxOccurs="1">\r
                           <xs:annotation>\r
                             <xs:documentation xml:lang="ja">色定義(オプション)</xs:documentation>\r
                           </xs:annotation>\r
                           <xs:complexType>\r
-                               <xs:sequence>\r
+                            <xs:sequence>\r
                               <xs:element name="layer" nillable="false" minOccurs="1" maxOccurs="unbounded">\r
-                                   <xs:complexType>\r
-                                         <xs:sequence>\r
-                                           <xs:element name="color-group" minOccurs="0" maxOccurs="1">\r
-                                             <xs:complexType>\r
-                                               <xs:attribute name="group" use="required" form="unqualified" type="tokenNotEmpty">\r
+                                <xs:complexType>\r
+                                  <xs:sequence>\r
+                                    <xs:element name="color-group" minOccurs="0" maxOccurs="1">\r
+                                      <xs:complexType>\r
+                                        <xs:attribute name="group" use="required" form="unqualified" type="tokenNotEmpty">\r
                                           <xs:annotation>\r
-                                                   <xs:documentation xml:lang="ja">カラーグループ</xs:documentation>\r
-                                                 </xs:annotation>\r
-                                               </xs:attribute>\r
-                                               <xs:attribute name="synchronized" use="required" form="unqualified">\r
+                                            <xs:documentation xml:lang="ja">カラーグループ</xs:documentation>\r
+                                          </xs:annotation>\r
+                                        </xs:attribute>\r
+                                        <xs:attribute name="synchronized" use="required" form="unqualified">\r
                                           <xs:annotation>\r
-                                                   <xs:documentation xml:lang="ja">カラーグループの同期を行う</xs:documentation>\r
-                                                 </xs:annotation>\r
-                                                 <xs:simpleType>\r
-                                                   <xs:restriction base="xs:boolean">\r
-                                                     <xs:pattern value="true"/>\r
-                                                     <xs:pattern value="false"/>\r
-                                                   </xs:restriction>\r
-                                                 </xs:simpleType>\r
-                                               </xs:attribute>\r
-                                             </xs:complexType>\r
-                                           </xs:element>\r
-                                           <xs:element name="rgb" nillable="false" minOccurs="0" maxOccurs="1">\r
-                                             <xs:annotation>\r
-                                               <xs:documentation xml:lang="ja">RGB変換</xs:documentation>\r
-                                             </xs:annotation>\r
-                                             <xs:complexType>\r
-                                               <xs:sequence>\r
-                                                 <xs:element name="red" type="rgbvalue"/>\r
-                                                 <xs:element name="green" type="rgbvalue"/>\r
-                                                 <xs:element name="blue" type="rgbvalue"/>\r
-                                                 <xs:element name="alpha" type="rgbvalue"/>\r
-                                               </xs:sequence>\r
-                                             </xs:complexType>\r
-                                           </xs:element>\r
-                                           <xs:element name="hsb" nillable="false" type="hsbvalue" minOccurs="0" maxOccurs="1">\r
-                                             <xs:annotation>\r
-                                               <xs:documentation xml:lang="ja">HSB変換</xs:documentation>\r
-                                             </xs:annotation>\r
-                                           </xs:element>\r
-                                           <xs:element name="rgb-replace"  nillable="false" type="rgbreplacevalue" minOccurs="0" maxOccurs="1">\r
-                                             <xs:annotation>\r
-                                               <xs:documentation xml:lang="ja">RGB置換</xs:documentation>\r
-                                             </xs:annotation>\r
-                                           </xs:element>\r
+                                            <xs:documentation xml:lang="ja">カラーグループの同期を行う</xs:documentation>\r
+                                          </xs:annotation>\r
+                                          <xs:simpleType>\r
+                                            <xs:restriction base="xs:boolean">\r
+                                              <xs:pattern value="true" />\r
+                                              <xs:pattern value="false" />\r
+                                            </xs:restriction>\r
+                                          </xs:simpleType>\r
+                                        </xs:attribute>\r
+                                      </xs:complexType>\r
+                                    </xs:element>\r
+                                    <xs:element name="rgb" nillable="false" minOccurs="0" maxOccurs="1">\r
+                                      <xs:annotation>\r
+                                        <xs:documentation xml:lang="ja">RGB変換</xs:documentation>\r
+                                      </xs:annotation>\r
+                                      <xs:complexType>\r
+                                        <xs:sequence>\r
+                                          <xs:element name="red" type="rgbvalue" />\r
+                                          <xs:element name="green" type="rgbvalue" />\r
+                                          <xs:element name="blue" type="rgbvalue" />\r
+                                          <xs:element name="alpha" type="rgbvalue" />\r
+                                        </xs:sequence>\r
+                                      </xs:complexType>\r
+                                    </xs:element>\r
+                                    <xs:element name="hsb" nillable="false" type="hsbvalue" minOccurs="0" maxOccurs="1">\r
+                                      <xs:annotation>\r
+                                        <xs:documentation xml:lang="ja">HSB変換</xs:documentation>\r
+                                      </xs:annotation>\r
+                                    </xs:element>\r
+                                    <xs:element name="rgb-replace" nillable="false" type="rgbreplacevalue" minOccurs="0" maxOccurs="1">\r
+                                      <xs:annotation>\r
+                                        <xs:documentation xml:lang="ja">RGB置換</xs:documentation>\r
+                                      </xs:annotation>\r
+                                    </xs:element>\r
                                   </xs:sequence>\r
                                   <xs:attribute name="refid" use="required" form="unqualified" type="tokenNotEmpty">\r
                                     <xs:annotation>\r
       </xs:annotation>\r
     </xs:attribute>\r
   </xs:complexType>\r
-\r
-</xs:schema>\r
+</xs:schema>
\ No newline at end of file
index 849aa11..02b1486 100644 (file)
@@ -27,7 +27,7 @@ import charactermanaj.util.ErrorMessageHelper;
 \r
 /**\r
  * エントリポイント用クラス\r
- *\r
+ * \r
  * @author seraphy\r
  */\r
 public final class Main implements Runnable {\r
@@ -89,7 +89,7 @@ public final class Main implements Runnable {
        /**\r
         * Javaの簡易なバージョンを取得する.<br>\r
         * 不明な場合は0を返す.<br>\r
-        *\r
+        * \r
         * @return バージョン\r
         */\r
        private static double getJavaVersion() {\r
@@ -107,7 +107,7 @@ public final class Main implements Runnable {
 \r
        /**\r
         * UIをセットアップする.\r
-        *\r
+        * \r
         * @throws Exception\r
         *             いろいろな失敗\r
         */\r
@@ -171,7 +171,7 @@ public final class Main implements Runnable {
                                logger.log(Level.WARNING, "failed to set the clipboard-support.");\r
                        }\r
 \r
-                       // LANG, LC_CTYPEが設定されていない場合はエラーを表示する\r
+                       // LANG, またはLC_CTYPEが設定されていない場合はエラーを表示する\r
                        // OSXのJava7(Oracle)を実行する場合、環境変数LANGまたはLC_CTYPEに正しくファイル名の文字コードが設定されていないと\r
                        // ファイル名を正しく取り扱えず文字化けするため、実行前に確認し警告を表示する。\r
                        if (isMacOSX() && getJavaVersion() >= 1.7) {\r
@@ -179,7 +179,10 @@ public final class Main implements Runnable {
                                String lcctype = System.getenv("LC_CTYPE");\r
                                if ((lang == null || lang.trim().length() == 0) &&\r
                                                (lcctype == null || lcctype.trim().length() == 0)) {\r
-                                       JOptionPane.showMessageDialog(null, "\"LANG\" environment variable is not set!.",\r
+                                       JOptionPane\r
+                                                       .showMessageDialog(\r
+                                                                       null,\r
+                                                                       "\"LANG\" or \"LC_CTYPE\" environment variable must be set.",\r
                                                        "Configuration Error", JOptionPane.ERROR_MESSAGE);\r
                                }\r
                        }\r
@@ -249,7 +252,7 @@ public final class Main implements Runnable {
        /**\r
         * エントリポイント.<br>\r
         * 最初のメインフレームを開いたときにMac OS Xであればスクリーンメニューの登録も行う.<br>\r
-        *\r
+        * \r
         * @param args\r
         *            引数(未使用)\r
         */\r
@@ -257,22 +260,22 @@ public final class Main implements Runnable {
                // ロガー等の初期化\r
                initLogger();\r
 \r
-        // MBeanのセットアップ\r
+               // MBeanのセットアップ\r
         try {\r
             ImageCacheMBeanImpl.setupMBean();\r
 \r
         } catch (JMException ex) {\r
-            // 失敗しても無視して継続する.\r
+                       // 失敗しても無視して継続する.\r
             logger.log(Level.SEVERE, ex.getMessage(), ex);\r
         }\r
 \r
-        // フレームの生成等は、SwingのEDTで実行する.\r
+               // フレームの生成等は、SwingのEDTで実行する.\r
                SwingUtilities.invokeLater(new Main());\r
        }\r
 \r
        /**\r
         * Mac OS Xで動作しているか?\r
-        *\r
+        * \r
         * @return Max OS X上であればtrue\r
         */\r
        public static boolean isMacOSX() {\r
@@ -281,7 +284,7 @@ public final class Main implements Runnable {
 \r
        /**\r
         * Mac OS X、もしくはlinuxで動作しているか?\r
-        *\r
+        * \r
         * @return Mac OS X、もしくはlinuxで動作していればtrue\r
         */\r
        public static boolean isLinuxOrMacOSX() {\r
diff --git a/src/charactermanaj/model/IndependentPartsColorInfo.java b/src/charactermanaj/model/IndependentPartsColorInfo.java
new file mode 100644 (file)
index 0000000..b8a5b10
--- /dev/null
@@ -0,0 +1,128 @@
+package charactermanaj.model;\r
+\r
+import java.io.Serializable;\r
+import java.util.List;\r
+import java.util.logging.Level;\r
+import java.util.logging.Logger;\r
+\r
+import charactermanaj.graphics.filters.ColorConvertParameter;\r
+\r
+/**\r
+ * 素のカラー情報.<br>\r
+ * レイヤーやカテゴリなどのリレーションシップがない、<br>\r
+ * 特定のキャラクターデータモデルのツリーの一部には組み込まれていない状態のもの.<br>\r
+ */\r
+public class IndependentPartsColorInfo implements Serializable {\r
+\r
+       /**\r
+        * シリアライズバージョンID\r
+        */\r
+       private static final long serialVersionUID = -8114086036157411198L;\r
+\r
+       /**\r
+        * ロガー\r
+        */\r
+       private static final Logger logger = Logger\r
+                       .getLogger(IndependentPartsColorInfo.class.getName());\r
+\r
+       /**\r
+        * layerID\r
+        */\r
+       private String layerId;\r
+\r
+       /**\r
+        * カラーグループのid\r
+        */\r
+       private String colorGroupId;\r
+\r
+       /**\r
+        * カラーの同期指定\r
+        */\r
+       private boolean syncColorGroup;\r
+       \r
+       /**\r
+        * カラー変換パラメータ.<br>\r
+        */\r
+       private ColorConvertParameter colorConvertParameter = new ColorConvertParameter();\r
+\r
+       public void setLayerId(String layerId) {\r
+               this.layerId = layerId;\r
+       }\r
+\r
+       public String getLayerId() {\r
+               return layerId;\r
+       }\r
+\r
+       public void setColorGroupId(String colorGroupId) {\r
+               this.colorGroupId = colorGroupId;\r
+       }\r
+\r
+       public String getColorGroupId() {\r
+               return colorGroupId;\r
+       }\r
+\r
+       public void setSyncColorGroup(boolean syncColorGroup) {\r
+               this.syncColorGroup = syncColorGroup;\r
+       }\r
+\r
+       public boolean isSyncColorGroup() {\r
+               return syncColorGroup;\r
+       }\r
+\r
+       public void setColorConvertParameter(\r
+                       ColorConvertParameter colorConvertParameter) {\r
+               this.colorConvertParameter = colorConvertParameter;\r
+       }\r
+\r
+       public ColorConvertParameter getColorConvertParameter() {\r
+               return colorConvertParameter;\r
+       }\r
+\r
+       /**\r
+        * インスタンス独立の素のカラー情報から、カテゴリやレイヤー、カラーグループのインスタンスと関連づけられたカラー情報に変換してかえす.\r
+        * \r
+        * @param characterData\r
+        *            キャラクターデータ\r
+        * @param category\r
+        *            パーツカテゴリインスタンス\r
+        * @param partsColorInfoList\r
+        *            素のパーツカラー情報、なければnull可\r
+        * @return パーツカラー情報、パーツカラー情報がなければnull\r
+        */\r
+       public static PartsColorInfo buildPartsColorInfo(\r
+                       CharacterData characterData,\r
+                       PartsCategory category,\r
+                       List<IndependentPartsColorInfo> partsColorInfoList) {\r
+               if (characterData == null || category == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               if (partsColorInfoList == null) {\r
+                       return null;\r
+               }\r
+               PartsColorInfo partsColorInfo = null;\r
+               for (IndependentPartsColorInfo info : partsColorInfoList) {\r
+                       String layerId = info.getLayerId();\r
+                       Layer layer = category.getLayer(layerId);\r
+                       if (layer == null) {\r
+                               logger.log(Level.WARNING, "undefined layer: " + layerId);\r
+                               break;\r
+                       }\r
+                       if (partsColorInfo == null) {\r
+                               partsColorInfo = new PartsColorInfo(category);\r
+                       }\r
+\r
+                       ColorInfo colorInfo = partsColorInfo.get(layer);\r
+\r
+                       // color group\r
+                       String colorGroupId = info.getColorGroupId();\r
+                       ColorGroup colorGroup = characterData.getColorGroup(colorGroupId);\r
+                       boolean syncColorGroup = info.isSyncColorGroup();\r
+                       colorInfo.setColorGroup(colorGroup);\r
+                       colorInfo.setSyncColorGroup(syncColorGroup);\r
+\r
+                       // color parameters\r
+                       colorInfo.setColorParameter(info.getColorConvertParameter());\r
+               }\r
+               return partsColorInfo;\r
+       }\r
+}
\ No newline at end of file
diff --git a/src/charactermanaj/model/IndependentPartsSetInfo.java b/src/charactermanaj/model/IndependentPartsSetInfo.java
new file mode 100644 (file)
index 0000000..5a585f2
--- /dev/null
@@ -0,0 +1,171 @@
+package charactermanaj.model;\r
+\r
+import java.awt.Color;\r
+import java.io.Serializable;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.logging.Level;\r
+import java.util.logging.Logger;\r
+\r
+/**\r
+ * 素のパーツセットの情報.<br>\r
+ * レイヤーやカテゴリなどのリレーションシップがない、<br>\r
+ * 特定のキャラクターデータモデルのツリーの一部には組み込まれていない状態のもの.<br>\r
+ */\r
+public class IndependentPartsSetInfo implements Serializable {\r
+\r
+       /**\r
+        * シリアライズバージョンID\r
+        */\r
+       private static final long serialVersionUID = 7280485045920860407L;\r
+\r
+       /**\r
+        * ロガー\r
+        */\r
+       private static final Logger logger = Logger\r
+                       .getLogger(IndependentPartsSetInfo.class.getName());\r
+\r
+       /**\r
+        * バーツセットのID\r
+        */\r
+       private String id;\r
+\r
+       /**\r
+        * パーツセットの表示名\r
+        */\r
+       private String displayName;\r
+\r
+       /**\r
+        * 背景色、未設定であればnull\r
+        */\r
+       private Color backgroundColor;\r
+\r
+       /**\r
+        * アフィン変換パラメータ、未設定であればnull\r
+        */\r
+       private double[] affineTransformParameter;\r
+\r
+       /**\r
+        * カテゴリIDをキーとし、パーツ名をキーとしカラー情報のリストを値とするマップを値とする.\r
+        */\r
+       private Map<String, Map<String, List<IndependentPartsColorInfo>>> partsMap = new HashMap<String, Map<String, List<IndependentPartsColorInfo>>>();\r
+\r
+       public String getId() {\r
+               return id;\r
+       }\r
+\r
+       public void setId(String id) {\r
+               this.id = id;\r
+       }\r
+\r
+       public String getDisplayName() {\r
+               return displayName;\r
+       }\r
+\r
+       public void setDisplayName(String displayName) {\r
+               this.displayName = displayName;\r
+       }\r
+\r
+       public Color getBackgroundColor() {\r
+               return backgroundColor;\r
+       }\r
+\r
+       public void setBackgroundColor(Color backgroundColor) {\r
+               this.backgroundColor = backgroundColor;\r
+       }\r
+\r
+       public double[] getAffineTransformParameter() {\r
+               return affineTransformParameter;\r
+       }\r
+\r
+       public void setAffineTransformParameter(\r
+                       double[] affineTransformParameter) {\r
+               this.affineTransformParameter = affineTransformParameter;\r
+       }\r
+\r
+       /**\r
+        * カテゴリIDをキーとし、パーツ名をキーとしカラー情報のリストを値とするマップを値とする.\r
+        * \r
+        * @return カテゴリIDをキーとし、パーツ名をキーとしカラー情報のリストを値とするマップを値とする.\r
+        */\r
+       public Map<String, Map<String, List<IndependentPartsColorInfo>>> getPartsMap() {\r
+               return partsMap;\r
+       }\r
+\r
+       public void setPartsMap(\r
+                       Map<String, Map<String, List<IndependentPartsColorInfo>>> partsMap) {\r
+               if (partsMap == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               this.partsMap = partsMap;\r
+       }\r
+\r
+       /**\r
+        * インスタンス独立のパーツセット情報から、指定されたキャラクターデータに関連づけられた パーツ情報に変換して返す.<br>\r
+        * \r
+        * @param partsSetInfo\r
+        *            インスタンス独立のパーツセット情報\r
+        * @param characterData\r
+        *            キャラクターデータ\r
+        * @param presetParts\r
+        *            プリセットか?\r
+        * @return キャラクターデータに関連づけられたパーツセットインスタンス\r
+        */\r
+       public static PartsSet convertPartsSet(\r
+                       IndependentPartsSetInfo partsSetInfo, CharacterData characterData,\r
+                       boolean presetParts) {\r
+               if (partsSetInfo == null || characterData == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               PartsSet partsSet = new PartsSet();\r
+               partsSet.setPartsSetId(partsSetInfo.getId());\r
+               partsSet.setLocalizedName(partsSetInfo.getDisplayName());\r
+               partsSet.setPresetParts(presetParts);\r
+\r
+               Color backgroundColor = partsSetInfo.getBackgroundColor();\r
+               if (backgroundColor != null) {\r
+                       partsSet.setBgColor(backgroundColor);\r
+               }\r
+\r
+               double[] affineTrans = partsSetInfo.getAffineTransformParameter();\r
+               if (affineTrans != null) {\r
+                       partsSet.setAffineTransformParameter(affineTrans);\r
+               }\r
+\r
+               Map<String, Map<String, List<IndependentPartsColorInfo>>> partsMap = partsSetInfo\r
+                               .getPartsMap();\r
+               for (Map.Entry<String, Map<String, List<IndependentPartsColorInfo>>> categoryEntry : partsMap\r
+                               .entrySet()) {\r
+                       String categoryId = categoryEntry.getKey();\r
+                       Map<String, List<IndependentPartsColorInfo>> categoryPartsMap = categoryEntry\r
+                                       .getValue();\r
+\r
+                       PartsCategory partsCategory = characterData\r
+                                       .getPartsCategory(categoryId);\r
+                       if (partsCategory == null) {\r
+                               logger.log(Level.WARNING, "undefined category-id: "\r
+                                               + categoryId);\r
+                               continue;\r
+                       }\r
+\r
+                       for (Map.Entry<String, List<IndependentPartsColorInfo>> partsEntry : categoryPartsMap\r
+                                       .entrySet()) {\r
+                               String partsName = partsEntry.getKey();\r
+                               List<IndependentPartsColorInfo> colorInfoList = partsEntry\r
+                                               .getValue();\r
+\r
+                               PartsIdentifier partsIdentifier = new PartsIdentifier(\r
+                                               partsCategory, partsName, partsName);\r
+\r
+                               PartsColorInfo partsColorInfo = IndependentPartsColorInfo\r
+                                               .buildPartsColorInfo(characterData, partsCategory,\r
+                                                               colorInfoList);\r
+\r
+                               partsSet.appendParts(partsCategory, partsIdentifier,\r
+                                               partsColorInfo);\r
+                       }\r
+               }\r
+               return partsSet;\r
+       }\r
+}\r
diff --git a/src/charactermanaj/model/IndependentPartsSetInfoList.java b/src/charactermanaj/model/IndependentPartsSetInfoList.java
new file mode 100644 (file)
index 0000000..fd0a364
--- /dev/null
@@ -0,0 +1,63 @@
+package charactermanaj.model;\r
+\r
+import java.util.ArrayList;\r
+\r
+/**\r
+ * 素のパーツセットのコレクション.<br>\r
+ * レイヤーやカテゴリなどのリレーションシップがない、<br>\r
+ * 特定のキャラクターデータモデルのツリーの一部には組み込まれていない状態のもの.<br>\r
+ */\r
+public class IndependentPartsSetInfoList\r
+               extends\r
+                       ArrayList<IndependentPartsSetInfo> {\r
+\r
+       /**\r
+        * シリアライズバージョンID\r
+        */\r
+       private static final long serialVersionUID = -6121741586284912547L;\r
+\r
+       /**\r
+        * デフォルトのパーツセットID.<br>\r
+        * ない場合はnull.<br>\r
+        */\r
+       private String defaultPresetId;\r
+\r
+       public String getDefaultPresetId() {\r
+               return defaultPresetId;\r
+       }\r
+\r
+       /**\r
+        * デフォルトパーツセットIDを設定する.<br>\r
+        * nullはパーツセットIDがないことを示す.<br>\r
+        * 空文字はnullとみなされる.<br>\r
+        * \r
+        * @param defaultPresetId\r
+        */\r
+       public void setDefaultPresetId(String defaultPresetId) {\r
+               if (defaultPresetId != null) {\r
+                       defaultPresetId = defaultPresetId.trim();\r
+                       if (defaultPresetId.length() == 0) {\r
+                               // デフォルトパーツセットがないことを示すためのnull\r
+                               defaultPresetId = null;\r
+                       }\r
+               }\r
+               this.defaultPresetId = defaultPresetId;\r
+       }\r
+\r
+       @Override\r
+       public boolean add(IndependentPartsSetInfo o) {\r
+               if (o == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               return super.add(o);\r
+       }\r
+\r
+       @Override\r
+       public IndependentPartsSetInfo set(int index,\r
+                       IndependentPartsSetInfo element) {\r
+               if (element == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               return super.set(index, element);\r
+       }\r
+}
\ No newline at end of file
index 1489122..f3e3c55 100644 (file)
@@ -27,6 +27,9 @@ public class WorkingSet implements Serializable {
        \r
        private String characterDataRev;\r
        \r
+       /**\r
+        * 現在の選択中のパーツと色設定からのパーツセット\r
+        */\r
        private PartsSet partsSet;\r
        \r
        private URI characterDocBase;\r
@@ -47,9 +50,13 @@ public class WorkingSet implements Serializable {
 \r
        /**\r
         * デシリアライズ\r
-        * @param inp オブジェクトの復元ストリーム\r
-        * @throws IOException 例外\r
-        * @throws ClassNotFoundException 例外\r
+        * \r
+        * @param inp\r
+        *            オブジェクトの復元ストリーム\r
+        * @throws IOException\r
+        *             例外\r
+        * @throws ClassNotFoundException\r
+        *             例外\r
         */\r
        @SuppressWarnings("unchecked")\r
        private void readObject(ObjectInputStream inp) throws IOException,\r
@@ -96,6 +103,7 @@ public class WorkingSet implements Serializable {
         * REV情報.<br>\r
         * キャラクターデータが設定されていない場合に使用される.<br>\r
         * (ver0.96以前旧シリアライズデータ互換用)<br>\r
+        * \r
         * @return\r
         */\r
        public String getCharacterDataRev() {\r
@@ -147,6 +155,7 @@ public class WorkingSet implements Serializable {
         * 最後に使用したお気に入りの情報.<br>\r
         * 一度もプリセットを使ってなければnull.<br>\r
         * ver0.94以前には存在しなかったため、nullになりえます。\r
+        * \r
         * @return\r
         */\r
        public PartsSet getLastUsePresetParts() {\r
@@ -154,10 +163,10 @@ public class WorkingSet implements Serializable {
        }\r
 \r
        /**\r
-       /**\r
-        * 最後に使用したお気に入りの情報.<br>\r
+        * /** 最後に使用したお気に入りの情報.<br>\r
         * 一度もプリセットを使ってなければnull.<br>\r
         * (ver0.94以前には存在しなかったため、nullになりえます。)\r
+        * \r
         * @param lastUsePresetParts\r
         */\r
        public void setLastUsePresetParts(PartsSet lastUsePresetParts) {\r
@@ -171,6 +180,7 @@ public class WorkingSet implements Serializable {
        /**\r
         * 使用していたキャラクター定義を取得します.<br>\r
         * ver0.95よりも以前には存在しないため、nullとなりえます.<br>\r
+        * \r
         * @return キャラクターデータ\r
         */\r
        public CharacterData getCharacterData() {\r
@@ -180,6 +190,7 @@ public class WorkingSet implements Serializable {
        /**\r
         * 壁紙情報を取得します.<br>\r
         * ver0.97よりも以前には存在しないため、nullとなりえます.<br>\r
+        * \r
         * @return 壁紙情報\r
         */\r
        public WallpaperInfo getWallpaperInfo() {\r
diff --git a/src/charactermanaj/model/WorkingSet2.java b/src/charactermanaj/model/WorkingSet2.java
new file mode 100644 (file)
index 0000000..62e7790
--- /dev/null
@@ -0,0 +1,189 @@
+package charactermanaj.model;\r
+\r
+import java.io.File;\r
+import java.net.URI;\r
+import java.util.Collections;\r
+import java.util.List;\r
+import java.util.Map;\r
+\r
+import charactermanaj.ui.model.WallpaperInfo;\r
+\r
+/**\r
+ * WorkingSetのXMLの読み込み時に使用する.<br>\r
+ * 特定のキャラクターデータのインスタンスとの関連を持たない状態の設定値を保持している.<br>\r
+ * \r
+ * @author seraphy\r
+ */\r
+public class WorkingSet2 {\r
+\r
+       /**\r
+        * ドキュメントベース\r
+        */\r
+       private URI characterDocBase;\r
+\r
+       /**\r
+        * キャラクターデータのID, Revと基本構造のシグネチャ\r
+        */\r
+       private String characterDataSig;\r
+\r
+       /**\r
+        * キーはカテゴリid, 値は、パーツ名をキーとしレイヤーごとのカラー情報のリストを値とするマップ\r
+        */\r
+       private Map<String, Map<String, List<IndependentPartsColorInfo>>> partsColorMap = Collections\r
+                       .emptyMap();\r
+\r
+       /**\r
+        * 現在の選択中のパーツと色設定からのパーツセット\r
+        */\r
+       private IndependentPartsSetInfo currentPartsSet;\r
+\r
+       /**\r
+        * 最後に使用したディレクトリ(保存用)\r
+        */\r
+       private File lastUsedSaveDir;\r
+\r
+       /**\r
+        * 最後に使用したディレクトリ(Export用)\r
+        */\r
+       private File lastUsedExportDir;\r
+\r
+       /**\r
+        * 最後に使用したお気に入り情報.<br>\r
+        * (最後に使用したお気に入り情報は、ver0.92からサポート)<br>\r
+        */\r
+       private IndependentPartsSetInfo lastUsePresetParts;\r
+\r
+       /**\r
+        * 壁紙情報.<br>\r
+        * (壁紙はver0.97からサポート)<br>\r
+        */\r
+       private WallpaperInfo wallpaperInfo;\r
+\r
+       public void setCharacterDocBase(URI characterDocBase) {\r
+               this.characterDocBase = characterDocBase;\r
+       }\r
+\r
+       public URI getCharacterDocBase() {\r
+               return characterDocBase;\r
+       }\r
+\r
+       public String getCharacterDataSig() {\r
+               return characterDataSig;\r
+       }\r
+\r
+       public void setCharacterDataSig(String characterDataSig) {\r
+               this.characterDataSig = characterDataSig;\r
+       }\r
+\r
+       /**\r
+        * パーツカラーマップ\r
+        * \r
+        * @return キーはカテゴリid, 値は、パーツ名をキーとしレイヤーごとのカラー情報のリストを値とするマップ\r
+        */\r
+       public Map<String, Map<String, List<IndependentPartsColorInfo>>> getPartsColorMap() {\r
+               return partsColorMap;\r
+       }\r
+\r
+       public void setPartsColorMap(\r
+                       Map<String, Map<String, List<IndependentPartsColorInfo>>> partsColorMap) {\r
+               if (partsColorMap == null) {\r
+                       this.partsColorMap = Collections.emptyMap();\r
+               }\r
+               this.partsColorMap = partsColorMap;\r
+       }\r
+\r
+       public void setLastUsedExportDir(File lastUsedExportDir) {\r
+               this.lastUsedExportDir = lastUsedExportDir;\r
+       }\r
+\r
+       public File getLastUsedExportDir() {\r
+               return lastUsedExportDir;\r
+       }\r
+\r
+       public void setLastUsedSaveDir(File lastUsedSaveDir) {\r
+               this.lastUsedSaveDir = lastUsedSaveDir;\r
+       }\r
+\r
+       public File getLastUsedSaveDir() {\r
+               return lastUsedSaveDir;\r
+       }\r
+\r
+       public void setWallpaperInfo(WallpaperInfo wallpaperInfo) {\r
+               this.wallpaperInfo = wallpaperInfo;\r
+       }\r
+\r
+       public WallpaperInfo getWallpaperInfo() {\r
+               return wallpaperInfo;\r
+       }\r
+\r
+       public IndependentPartsSetInfo getCurrentPartsSet() {\r
+               return currentPartsSet;\r
+       }\r
+\r
+       public void setCurrentPartsSet(IndependentPartsSetInfo currentPartsSet) {\r
+               this.currentPartsSet = currentPartsSet;\r
+       }\r
+\r
+       public IndependentPartsSetInfo getLastUsePresetParts() {\r
+               return lastUsePresetParts;\r
+       }\r
+\r
+       public void setLastUsePresetParts(IndependentPartsSetInfo lastUsePresetParts) {\r
+               this.lastUsePresetParts = lastUsePresetParts;\r
+       }\r
+\r
+       /**\r
+        * キャラクターデータを指定して、指定されたキャラクターデータ上のインスタンスと関連づけられた\r
+        * カテゴリおよびパーツ名などのインスタンスで構成されるパーツ識別名とカラー情報を、 引数で指定したマップに出力する.\r
+        * \r
+        * @param characterData\r
+        *            キャラクターデータ\r
+        * @param partsColorInfoMap\r
+        *            パーツ識別名とカラー情報を出力するマップ\r
+        */\r
+       public void createCompatible(CharacterData characterData,\r
+                       Map<PartsIdentifier, PartsColorInfo> partsColorInfoMap) {\r
+               if (characterData == null || partsColorInfoMap == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+\r
+               for (Map.Entry<String, Map<String, List<IndependentPartsColorInfo>>> catEntry : partsColorMap\r
+                               .entrySet()) {\r
+                       String categoryId = catEntry.getKey();\r
+                       for (Map.Entry<String, List<IndependentPartsColorInfo>> layerEntry : catEntry\r
+                                       .getValue().entrySet()) {\r
+                               String partsName = layerEntry.getKey();\r
+                               List<IndependentPartsColorInfo> partsColorInfos = layerEntry\r
+                                               .getValue();\r
+\r
+                               PartsCategory partsCategory = characterData\r
+                                               .getPartsCategory(categoryId);\r
+                               if (partsCategory != null) {\r
+                                       String localizedName = partsName;\r
+                                       PartsIdentifier partsIdentifier = new PartsIdentifier(\r
+                                                       partsCategory, partsName, localizedName);\r
+\r
+                                       PartsColorInfo partsColorInfo = IndependentPartsColorInfo\r
+                                                       .buildPartsColorInfo(characterData, partsCategory,\r
+                                                                       partsColorInfos);\r
+                                       if (partsColorInfo != null) {\r
+                                               partsColorInfoMap.put(partsIdentifier, partsColorInfo);\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       @Override\r
+       public String toString() {\r
+               StringBuilder buf = new StringBuilder();\r
+               buf.append("(characterDocBase=").append(characterDocBase);\r
+               buf.append(", characterDataSig=").append(characterDataSig);\r
+               buf.append(", partsColorMap=").append(partsColorMap);\r
+               buf.append(", currentPartsSet=").append(currentPartsSet);\r
+               buf.append(", lastUsedSaveDir=").append(lastUsedSaveDir);\r
+               buf.append(", lastUsedExportDir=").append(lastUsedExportDir);\r
+               buf.append(")");\r
+               return buf.toString();\r
+       }\r
+}\r
index 5840e81..38fb6b7 100644 (file)
@@ -46,6 +46,7 @@ import charactermanaj.util.DirectoryConfig;
 import charactermanaj.util.FileNameNormalizer;\r
 import charactermanaj.util.FileUserData;\r
 import charactermanaj.util.UserData;\r
+import charactermanaj.util.UserDataFactory;\r
 \r
 public class CharacterDataPersistent {\r
 \r
@@ -720,10 +721,12 @@ public class CharacterDataPersistent {
                }\r
 \r
                // ワーキングセットの削除\r
-               UserData workingSetSer = MainFrame.getWorkingSetUserData(cd, true);\r
-               if (workingSetSer != null && workingSetSer.exists()) {\r
-                       logger.log(Level.INFO, "remove file: " + workingSetSer);\r
-                       workingSetSer.delete();\r
+               UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
+               UserData workingSetXmlData = userDataFactory.getMangledNamedUserData(\r
+                               cd.getDocBase(), MainFrame.WORKINGSET_FILE_SUFFIX);\r
+               if (workingSetXmlData != null && workingSetXmlData.exists()) {\r
+                       logger.log(Level.INFO, "remove file: " + workingSetXmlData);\r
+                       workingSetXmlData.delete();\r
                }\r
 \r
                // xmlファイルの拡張子を変更することでキャラクター定義として認識させない.\r
index 37e6a32..cc31636 100644 (file)
@@ -12,8 +12,10 @@ import java.io.InputStream;
 import java.net.URI;\r
 import java.net.URL;\r
 import java.util.ArrayList;\r
+import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Locale;\r
+import java.util.Map;\r
 import java.util.logging.Level;\r
 import java.util.logging.Logger;\r
 \r
@@ -25,11 +27,11 @@ import charactermanaj.graphics.filters.ColorConv;
 import charactermanaj.graphics.filters.ColorConvertParameter;\r
 import charactermanaj.model.CharacterData;\r
 import charactermanaj.model.ColorGroup;\r
-import charactermanaj.model.ColorInfo;\r
+import charactermanaj.model.IndependentPartsColorInfo;\r
+import charactermanaj.model.IndependentPartsSetInfo;\r
+import charactermanaj.model.IndependentPartsSetInfoList;\r
 import charactermanaj.model.Layer;\r
 import charactermanaj.model.PartsCategory;\r
-import charactermanaj.model.PartsColorInfo;\r
-import charactermanaj.model.PartsIdentifier;\r
 import charactermanaj.model.PartsSet;\r
 import charactermanaj.model.RecommendationURL;\r
 import charactermanaj.util.XMLUtilities;\r
@@ -422,208 +424,291 @@ public class CharacterDataXMLReader {
         */\r
        protected void loadPartsSet(CharacterData characterData,\r
                        Element nodePartssets, boolean presetParts, String lang) {\r
+               IndependentPartsSetInfoList partsSetLst = loadPartsSetList(\r
+                               nodePartssets, lang);\r
+               logger.info("partsSetList: size=" + partsSetLst.size());\r
+\r
+               if (presetParts) {\r
+                       characterData\r
+                                       .setDefaultPartsSetId(partsSetLst.getDefaultPresetId());\r
+               }\r
+\r
+               for (IndependentPartsSetInfo partsSetInfo : partsSetLst) {\r
+                       PartsSet partsSet = IndependentPartsSetInfo.convertPartsSet(\r
+                                       partsSetInfo, characterData, presetParts);\r
+                       characterData.addPartsSet(partsSet);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * CharacterDataのプリセットまたはFavoritesのパーツセットのXMLからパーツセットを読み取って登録する.<br>\r
+        * \r
+        * @param nodePartssets\r
+        *            パーツセットのノード、プリセットまたはパーツセットノード\r
+        * @param lang\r
+        *            言語\r
+        */\r
+       public IndependentPartsSetInfoList loadPartsSetList(Element nodePartssets,\r
+                       String lang) {\r
+               if (nodePartssets == null || lang == null || lang.length() == 0) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+\r
+               IndependentPartsSetInfoList partsSetLst = new IndependentPartsSetInfoList();\r
 \r
                // デフォルトのパーツセットID\r
-               String defaultPresetId = nodePartssets.getAttribute("default-preset")\r
-                               .trim();\r
+               String defaultPresetId = nodePartssets.getAttribute("default-preset");\r
+               if (defaultPresetId != null) {\r
+                       defaultPresetId = defaultPresetId.trim();\r
+               }\r
 \r
                // パーツセットリストの読み込み\r
                for (Element presetElm : getChildElements(nodePartssets, "preset")) {\r
-                       String partsSetId = presetElm.getAttribute("id").trim();\r
-                       if (defaultPresetId == null || defaultPresetId.length() == 0) {\r
-                               defaultPresetId = partsSetId;\r
-                       }\r
-                       String displayName = getLocalizedElementText(presetElm,\r
-                                       "display-name", lang);\r
-\r
-                       PartsSet partsSet = new PartsSet();\r
-\r
-                       partsSet.setPartsSetId(partsSetId);\r
-                       partsSet.setLocalizedName(displayName);\r
-                       partsSet.setPresetParts(presetParts);\r
-\r
-                       // bgColor\r
-                       Element bgColorElm = getFirstChildElement(presetElm,\r
-                                       "background-color");\r
-                       if (bgColorElm != null) {\r
-                               String tmpBgColor = bgColorElm.getAttribute("color");\r
-                               try {\r
-                                       Color bgColor = Color.decode(tmpBgColor);\r
-                                       partsSet.setBgColor(bgColor);\r
-\r
-                               } catch (Exception ex) {\r
-                                       logger.log(Level.WARNING, "bgColor parameter is invalid. :"\r
-                                                       + tmpBgColor, ex);\r
-                                       // 無視する\r
+                       IndependentPartsSetInfo partsSetInfo = loadPartsSet(presetElm, lang);\r
+                       if (partsSetInfo != null) {\r
+                               String partsSetId = partsSetInfo.getId();\r
+\r
+                               // デフォルトのパーツセットIDがない場合は先頭をデフォルトとみなす.\r
+                               if (defaultPresetId == null || defaultPresetId.length() == 0) {\r
+                                       defaultPresetId = partsSetId;\r
                                }\r
+\r
+                               partsSetLst.add(partsSetInfo);\r
                        }\r
+               }\r
 \r
-                       // affine-transform-parameter\r
-                       String tmpAffienTrans = getElementText(presetElm,\r
-                                       "affine-transform-parameter");\r
-                       if (tmpAffienTrans != null && tmpAffienTrans.trim().length() > 0) {\r
-                               try {\r
-                                       ArrayList<Double> affineTransformParameterArr = new ArrayList<Double>();\r
-                                       for (String strParam : tmpAffienTrans.split("\\s+")) {\r
-                                               affineTransformParameterArr.add(Double\r
-                                                               .valueOf(strParam));\r
-                                       }\r
-                                       double[] affineTransformParameter = new double[affineTransformParameterArr\r
-                                                       .size()];\r
-                                       int idx = 0;\r
-                                       for (double aaffineItem : affineTransformParameterArr) {\r
-                                               affineTransformParameter[idx++] = aaffineItem;\r
-                                       }\r
-                                       partsSet.setAffineTransformParameter(affineTransformParameter);\r
+               if (defaultPresetId.length() == 0) {\r
+                       // デフォルトパーツセットがないことを示すためのnull\r
+                       defaultPresetId = null;\r
+               }\r
+               partsSetLst.setDefaultPresetId(defaultPresetId);\r
 \r
-                               } catch (Exception ex) {\r
-                                       logger.log(Level.WARNING,\r
-                                                       "affine transform parameter is invalid. :"\r
-                                                                       + tmpAffienTrans, ex);\r
-                                       // 無視する.\r
-                               }\r
+               return partsSetLst;\r
+       }\r
+\r
+       /**\r
+        * CharacterDataのプリセットまたはFavoritesのパーツセットのXMLからパーツセットを読み取る.<br>\r
+        * \r
+        * @param nodePartssets\r
+        *            パーツセットのノード、プリセットまたはパーツセットノード\r
+        * @param lang\r
+        *            言語\r
+        * @return 素のパーツセット情報、無ければnull\r
+        */\r
+       public IndependentPartsSetInfo loadPartsSet(Element presetElm, String lang) {\r
+               if (presetElm == null || lang == null) {\r
+                       return null;\r
+               }\r
+\r
+               IndependentPartsSetInfo partsSetInfo = new IndependentPartsSetInfo();\r
+\r
+               // id\r
+               String partsSetId = presetElm.getAttribute("id");\r
+               if (partsSetId != null) {\r
+                       partsSetId = partsSetId.trim();\r
+               }\r
+               if (partsSetId != null && partsSetId.length() == 0) {\r
+                       partsSetId = null;\r
+               }\r
+               partsSetInfo.setId(partsSetId);\r
+\r
+               // display-name\r
+               String displayName = getLocalizedElementText(presetElm, "display-name",\r
+                               lang);\r
+               partsSetInfo.setDisplayName(displayName);\r
+\r
+               // bgColor\r
+               Element bgColorElm = getFirstChildElement(presetElm, "background-color");\r
+               if (bgColorElm != null) {\r
+                       String tmpBgColor = bgColorElm.getAttribute("color");\r
+                       try {\r
+                               Color bgColor = Color.decode(tmpBgColor);\r
+                               partsSetInfo.setBackgroundColor(bgColor);\r
+\r
+                       } catch (Exception ex) {\r
+                               logger.log(Level.WARNING, "bgColor parameter is invalid. :"\r
+                                               + tmpBgColor, ex);\r
+                               // 無視する\r
                        }\r
+               }\r
 \r
-                       // Category\r
-                       for (Element catElm : getChildElements(presetElm, "category")) {\r
-                               String categoryId = catElm.getAttribute("refid").trim();\r
-                               PartsCategory category = characterData\r
-                                               .getPartsCategory(categoryId);\r
-                               if (category == null) {\r
-                                       System.err.println("undefined category: " + categoryId);\r
-                                       continue;\r
+               // affine-transform-parameter\r
+               String tmpAffienTrans = getElementText(presetElm,\r
+                               "affine-transform-parameter");\r
+               if (tmpAffienTrans != null && tmpAffienTrans.trim().length() > 0) {\r
+                       try {\r
+                               ArrayList<Double> affineTransformParameterArr = new ArrayList<Double>();\r
+                               for (String strParam : tmpAffienTrans.split("\\s+")) {\r
+                                       affineTransformParameterArr.add(Double.valueOf(strParam));\r
+                               }\r
+                               double[] affineTransformParameter = new double[affineTransformParameterArr\r
+                                               .size()];\r
+                               int idx = 0;\r
+                               for (double aaffineItem : affineTransformParameterArr) {\r
+                                       affineTransformParameter[idx++] = aaffineItem;\r
                                }\r
+                               partsSetInfo\r
+                                               .setAffineTransformParameter(affineTransformParameter);\r
+\r
+                       } catch (Exception ex) {\r
+                               logger.log(Level.WARNING,\r
+                                               "affine transform parameter is invalid. :"\r
+                                                               + tmpAffienTrans, ex);\r
+                               // 無視する.\r
+                       }\r
+               }\r
 \r
-                               // Parts\r
-                               for (Element partsElm : getChildElements(catElm, "parts")) {\r
-                                       String partsName = partsElm.getAttribute("name").trim();\r
+               // カテゴリIDをキーとし、パーツ名をキーとしカラー情報のリストを値とするマップを値とする.\r
+               Map<String, Map<String, List<IndependentPartsColorInfo>>> partsMap = partsSetInfo\r
+                               .getPartsMap();\r
 \r
-                                       PartsIdentifier partsIdentifier = new PartsIdentifier(\r
-                                                       category, partsName, partsName);\r
+               // Category\r
+               for (Element catElm : getChildElements(presetElm, "category")) {\r
+                       String categoryId = catElm.getAttribute("refid");\r
+                       if (categoryId != null) {\r
+                               categoryId = categoryId.trim();\r
+                       }\r
+                       if (categoryId == null || categoryId.length() == 0) {\r
+                               logger.log(Level.WARNING, "missing category refid: " + catElm);\r
+                               continue;\r
+                       }\r
 \r
-                                       // Color/Layer\r
-                                       PartsColorInfo partsColorInfo = null;\r
-                                       for (Element colorElm : getChildElements(partsElm, "color")) {\r
-                                               for (Element layerElm : getChildElements(colorElm,\r
-                                                               "layer")) {\r
-                                                       String layerId = layerElm.getAttribute("refid")\r
-                                                                       .trim();\r
-                                                       Layer layer = category.getLayer(layerId);\r
-                                                       if (layer == null) {\r
-                                                               logger.log(Level.WARNING, "undefined layer: "\r
-                                                                               + layerId);\r
-                                                               continue;\r
-                                                       }\r
+                       // パーツ名をキーとしカラー情報のリストを値とするマップ.\r
+                       Map<String, List<IndependentPartsColorInfo>> categoryPartsMap = partsMap\r
+                                       .get(categoryId);\r
+                       if (categoryPartsMap == null) {\r
+                               categoryPartsMap = new HashMap<String, List<IndependentPartsColorInfo>>();\r
+                               partsMap.put(categoryId, categoryPartsMap);\r
+                       }\r
 \r
-                                                       if (partsColorInfo == null) {\r
-                                                               partsColorInfo = new PartsColorInfo(category);\r
-                                                       }\r
-                                                       ColorInfo colorInfo = partsColorInfo.get(layer);\r
-\r
-                                                       // color-group\r
-                                                       Element colorGroupElm = getFirstChildElement(\r
-                                                                       layerElm, "color-group");\r
-                                                       if (colorGroupElm != null) {\r
-                                                               ColorGroup colorGroup = characterData\r
-                                                                               .getColorGroup(colorGroupElm\r
-                                                                                               .getAttribute("group").trim());\r
-                                                               boolean syncColorGroup = Boolean\r
-                                                                               .parseBoolean(colorGroupElm\r
-                                                                                               .getAttribute("synchronized")\r
-                                                                                               .trim());\r
-                                                               colorInfo.setColorGroup(colorGroup);\r
-                                                               colorInfo.setSyncColorGroup(syncColorGroup);\r
-                                                       }\r
+                       // Parts\r
+                       for (Element partsElm : getChildElements(catElm, "parts")) {\r
+                               String partsName = partsElm.getAttribute("name");\r
+                               if (partsName != null) {\r
+                                       partsName = partsName.trim();\r
+                               }\r
+                               if (partsName == null || partsName.length() == 0) {\r
+                                       logger.log(Level.WARNING, "missing parts name. " + partsElm);\r
+                                       continue;\r
+                               }\r
 \r
-                                                       // rgb\r
-                                                       ColorConvertParameter param = colorInfo\r
-                                                                       .getColorParameter();\r
-                                                       Element nodeRgb = getFirstChildElement(layerElm,\r
-                                                                       "rgb");\r
-                                                       if (nodeRgb != null) {\r
-                                                               for (Element elmRgb : getChildElements(nodeRgb,\r
-                                                                               null)) {\r
-                                                                       String rgbName = elmRgb.getNodeName();\r
-                                                                       int offset = Integer.parseInt(elmRgb\r
-                                                                                       .getAttribute("offset"));\r
-                                                                       float factor = Float.parseFloat(elmRgb\r
-                                                                                       .getAttribute("factor"));\r
-                                                                       float gamma = Float.parseFloat(elmRgb\r
-                                                                                       .getAttribute("gamma"));\r
-                                                                       if ("red".equals(rgbName)) {\r
-                                                                               param.setOffsetR(offset);\r
-                                                                               param.setFactorR(factor);\r
-                                                                               param.setGammaR(gamma);\r
-                                                                       } else if ("green".equals(rgbName)) {\r
-                                                                               param.setOffsetG(offset);\r
-                                                                               param.setFactorG(factor);\r
-                                                                               param.setGammaG(gamma);\r
-                                                                       } else if ("blue".equals(rgbName)) {\r
-                                                                               param.setOffsetB(offset);\r
-                                                                               param.setFactorB(factor);\r
-                                                                               param.setGammaB(gamma);\r
-                                                                       } else if ("alpha".equals(rgbName)) {\r
-                                                                               param.setOffsetA(offset);\r
-                                                                               param.setFactorA(factor);\r
-                                                                               param.setGammaA(gamma);\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
+                               // Color/Layer\r
+                               List<IndependentPartsColorInfo> infoList = null;\r
+                               for (Element colorElm : getChildElements(partsElm, "color")) {\r
+                                       infoList = readPartsColor(colorElm);\r
+                                       break;\r
+                               }\r
+                               categoryPartsMap.put(partsName, infoList);\r
+                       }\r
+               }\r
+               return partsSetInfo;\r
+       }\r
 \r
-                                                       // hsb\r
-                                                       Element elmHsb = getFirstChildElement(layerElm,\r
-                                                                       "hsb");\r
-                                                       if (elmHsb != null) {\r
-                                                               float hue = Float.parseFloat(elmHsb\r
-                                                                               .getAttribute("hue"));\r
-                                                               float saturation = Float.parseFloat(elmHsb\r
-                                                                               .getAttribute("saturation"));\r
-                                                               float brightness = Float.parseFloat(elmHsb\r
-                                                                               .getAttribute("brightness"));\r
-                                                               String strContrast = elmHsb.getAttribute(\r
-                                                                               "contrast").trim();\r
-                                                               param.setHue(hue);\r
-                                                               param.setSaturation(saturation);\r
-                                                               param.setBrightness(brightness);\r
-                                                               if (strContrast != null\r
-                                                                               && strContrast.length() > 0) {\r
-                                                                       // ver0.96追加 optional\r
-                                                                       float contrast = Float\r
-                                                                                       .parseFloat(strContrast);\r
-                                                                       param.setContrast(contrast);\r
-                                                               }\r
-                                                       }\r
+       /**\r
+        * パーツごとのカラー情報のXMLを読み込んで返す.<br>\r
+        * パーツは複数のレイヤーから構成されるので、複数レイヤーのカラー情報のリストとして返される.<br>\r
+        * (パーツは複数レイヤーをまとめる1つのカテゴリになるので、カテゴリ単位の情報となる.)<br>\r
+        * \r
+        * @param colorElm\r
+        *            カラーのXML要素\r
+        * @return 素のカラー情報\r
+        */\r
+       public List<IndependentPartsColorInfo> readPartsColor(Element colorElm) {\r
+               if (colorElm == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
 \r
-                                                       // rgb-replace\r
-                                                       Element elmRgbReplace = getFirstChildElement(\r
-                                                                       layerElm, "rgb-replace");\r
-                                                       if (elmRgbReplace != null) {\r
-                                                               Float grayLevel = Float\r
-                                                                               .parseFloat(elmRgbReplace\r
-                                                                                               .getAttribute("gray"));\r
-                                                               ColorConv colorType = ColorConv\r
-                                                                               .valueOf(elmRgbReplace\r
-                                                                                               .getAttribute("replace-type"));\r
-                                                               param.setGrayLevel(grayLevel);\r
-                                                               param.setColorReplace(colorType);\r
-                                                       }\r
-                                               }\r
+               ArrayList<IndependentPartsColorInfo> infoList = new ArrayList<IndependentPartsColorInfo>();\r
+               for (Element layerElm : getChildElements(colorElm, "layer")) {\r
+                       IndependentPartsColorInfo info = new IndependentPartsColorInfo();\r
+\r
+                       String layerId = layerElm.getAttribute("refid");\r
+                       if (layerId != null) {\r
+                               layerId = layerId.trim();\r
+                       }\r
+                       if (layerId == null || layerId.length() == 0) {\r
+                               logger.log(Level.WARNING, "missing layer-id: " + layerElm);\r
+                               continue;\r
+                       }\r
+                       info.setLayerId(layerId);\r
+\r
+                       // color-group\r
+                       Element colorGroupElm = getFirstChildElement(layerElm,\r
+                                       "color-group");\r
+                       if (colorGroupElm != null) {\r
+                               String colorGroupId = colorGroupElm.getAttribute("group")\r
+                                               .trim();\r
+                               info.setColorGroupId(colorGroupId);\r
+                               boolean syncColorGroup = Boolean.parseBoolean(colorGroupElm\r
+                                               .getAttribute("synchronized").trim());\r
+                               info.setSyncColorGroup(syncColorGroup);\r
+                       }\r
+\r
+                       // rgb\r
+                       ColorConvertParameter param = info.getColorConvertParameter();\r
+                       Element nodeRgb = getFirstChildElement(layerElm, "rgb");\r
+                       if (nodeRgb != null) {\r
+                               for (Element elmRgb : getChildElements(nodeRgb, null)) {\r
+                                       String rgbName = elmRgb.getNodeName();\r
+                                       int offset = Integer\r
+                                                       .parseInt(elmRgb.getAttribute("offset"));\r
+                                       float factor = Float.parseFloat(elmRgb\r
+                                                       .getAttribute("factor"));\r
+                                       float gamma = Float\r
+                                                       .parseFloat(elmRgb.getAttribute("gamma"));\r
+                                       if ("red".equals(rgbName)) {\r
+                                               param.setOffsetR(offset);\r
+                                               param.setFactorR(factor);\r
+                                               param.setGammaR(gamma);\r
+                                       } else if ("green".equals(rgbName)) {\r
+                                               param.setOffsetG(offset);\r
+                                               param.setFactorG(factor);\r
+                                               param.setGammaG(gamma);\r
+                                       } else if ("blue".equals(rgbName)) {\r
+                                               param.setOffsetB(offset);\r
+                                               param.setFactorB(factor);\r
+                                               param.setGammaB(gamma);\r
+                                       } else if ("alpha".equals(rgbName)) {\r
+                                               param.setOffsetA(offset);\r
+                                               param.setFactorA(factor);\r
+                                               param.setGammaA(gamma);\r
                                        }\r
-                                       partsSet.appendParts(category, partsIdentifier,\r
-                                                       partsColorInfo);\r
                                }\r
                        }\r
 \r
-                       characterData.addPartsSet(partsSet);\r
-               }\r
+                       // hsb\r
+                       Element elmHsb = getFirstChildElement(layerElm, "hsb");\r
+                       if (elmHsb != null) {\r
+                               float hue = Float.parseFloat(elmHsb.getAttribute("hue"));\r
+                               float saturation = Float.parseFloat(elmHsb\r
+                                               .getAttribute("saturation"));\r
+                               float brightness = Float.parseFloat(elmHsb\r
+                                               .getAttribute("brightness"));\r
+                               String strContrast = elmHsb.getAttribute("contrast").trim();\r
+                               param.setHue(hue);\r
+                               param.setSaturation(saturation);\r
+                               param.setBrightness(brightness);\r
+                               if (strContrast != null && strContrast.length() > 0) {\r
+                                       // ver0.96追加 optional\r
+                                       float contrast = Float.parseFloat(strContrast);\r
+                                       param.setContrast(contrast);\r
+                               }\r
+                       }\r
 \r
-               if (presetParts) {\r
-                       if (defaultPresetId.length() == 0) {\r
-                               // デフォルトパーツセットがないことを示すためのnull\r
-                               defaultPresetId = null;\r
+                       // rgb-replace\r
+                       Element elmRgbReplace = getFirstChildElement(layerElm,\r
+                                       "rgb-replace");\r
+                       if (elmRgbReplace != null) {\r
+                               Float grayLevel = Float.parseFloat(elmRgbReplace\r
+                                               .getAttribute("gray"));\r
+                               ColorConv colorType = ColorConv.valueOf(elmRgbReplace\r
+                                               .getAttribute("replace-type"));\r
+                               param.setGrayLevel(grayLevel);\r
+                               param.setColorReplace(colorType);\r
                        }\r
-                       characterData.setDefaultPartsSetId(defaultPresetId);\r
+\r
+                       infoList.add(info);\r
                }\r
+               return infoList;\r
        }\r
-\r
 }\r
index 2692a9b..7bc29e2 100644 (file)
@@ -403,9 +403,13 @@ public class CharacterDataXMLWriter {
        \r
        /**\r
         * パーツセットのXM要素を生成して返す.\r
-        * @param doc ノードを生成するためのファクトリ\r
-        * @param lang 言語識別用(パーツセット名などの登録時のlang属性に必要)\r
-        * @param partsSet パーツセット、nullの場合はxsi:nul="true"が返される.\r
+        * \r
+        * @param doc\r
+        *            ノードを生成するためのファクトリ\r
+        * @param lang\r
+        *            言語識別用(パーツセット名などの登録時のlang属性に必要)\r
+        * @param partsSet\r
+        *            パーツセット、nullの場合はxsi:nul="true"が返される.\r
         * @return パーツセット1つ分のXML要素\r
         */\r
        public Element createPartsSetXML(Document doc, String lang, PartsSet partsSet) {\r
@@ -493,8 +497,11 @@ public class CharacterDataXMLWriter {
        \r
        /**\r
         * パーツカラー情報のXML要素を生成して返す.<br>\r
-        * @param doc 要素を作成するためのファクトリ\r
-        * @param partsColorInfo パーツカラー情報\r
+        * \r
+        * @param doc\r
+        *            要素を作成するためのファクトリ\r
+        * @param partsColorInfo\r
+        *            パーツカラー情報\r
         * @return パーツカラー情報の要素\r
         */\r
        public Element createPartsColorInfoXML(Document doc, PartsColorInfo partsColorInfo) {\r
diff --git a/src/charactermanaj/model/io/WorkingSetXMLReader.java b/src/charactermanaj/model/io/WorkingSetXMLReader.java
new file mode 100644 (file)
index 0000000..1be0120
--- /dev/null
@@ -0,0 +1,247 @@
+package charactermanaj.model.io;\r
+\r
+import static charactermanaj.util.XMLUtilities.getChildElements;\r
+import static charactermanaj.util.XMLUtilities.getElementText;\r
+\r
+import java.awt.Color;\r
+import java.io.File;\r
+import java.io.IOException;\r
+import java.io.InputStream;\r
+import java.net.URI;\r
+import java.net.URISyntaxException;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Locale;\r
+import java.util.Map;\r
+import java.util.logging.Logger;\r
+\r
+import org.w3c.dom.Document;\r
+import org.w3c.dom.Element;\r
+\r
+import charactermanaj.model.IndependentPartsColorInfo;\r
+import charactermanaj.model.IndependentPartsSetInfo;\r
+import charactermanaj.model.WorkingSet2;\r
+import charactermanaj.ui.model.WallpaperInfo;\r
+import charactermanaj.ui.model.WallpaperInfo.WallpaperResourceType;\r
+import charactermanaj.util.XMLUtilities;\r
+\r
+/**\r
+ * ワーキングセットのXMLデータを読み込む.<br>\r
+ * \r
+ * @author seraphy\r
+ */\r
+public class WorkingSetXMLReader {\r
+\r
+       /**\r
+        * ロガー\r
+        */\r
+       private static final Logger logger = Logger\r
+                       .getLogger(WorkingSetXMLReader.class.getCanonicalName());\r
+\r
+       /**\r
+        * WorkingSetのXMLファイルの名前空間\r
+        */\r
+       private static final String NS_PREFIX = "http://charactermanaj.sourceforge.jp/schema/charactermanaj-workingset";\r
+\r
+       /**\r
+        * XMLコンテンツに対する入力ストリームからワーキングセットを取り出す.<br>\r
+        * \r
+        * @param is\r
+        *            入力ストリーム\r
+        * @throws IOException\r
+        *             読み取りに失敗\r
+        */\r
+       public WorkingSet2 loadWorkingSet(InputStream is)\r
+                       throws IOException {\r
+               if (is == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+\r
+               WorkingSet2 workingSet = new WorkingSet2();\r
+\r
+               CharacterDataXMLReader characterDataXMLReader = new CharacterDataXMLReader();\r
+               \r
+               Document doc = XMLUtilities.loadDocument(is);\r
+\r
+               String lang = Locale.getDefault().getLanguage();\r
+\r
+               try {\r
+                       Element docElm = doc.getDocumentElement();\r
+                       if (!"character-workingset".equals(docElm.getNodeName())) {\r
+                               throw new IOException("Invalid Format.");\r
+                       }\r
+                       String ns = docElm.getNamespaceURI();\r
+                       if (ns == null || !ns.startsWith(NS_PREFIX)) {\r
+                               throw new IOException("unsupported xml format");\r
+                       }\r
+\r
+                       String docVersion = docElm.getAttribute("version").trim();\r
+                       if (!"1.0".equals(docVersion)) {\r
+                               throw new IOException("unsupported version: " + docVersion);\r
+                       }\r
+\r
+                       // docbase\r
+                       String characterDocBase = docElm.getAttribute("characterDocBase")\r
+                                       .trim();\r
+                       try {\r
+                               workingSet.setCharacterDocBase(new URI(characterDocBase));\r
+\r
+                       } catch (URISyntaxException ex) {\r
+                               IOException ex2 = new IOException("WorkingSet invalid format.");\r
+                               ex2.initCause(ex);\r
+                               throw ex2;\r
+                       }\r
+\r
+                       // character data signature\r
+                       String characterDataSig = getElementText(docElm, "characterDataSig");\r
+                       workingSet.setCharacterDataSig(characterDataSig);\r
+\r
+                       // キーはカテゴリid, 値は、パーツ名をキーとしレイヤーごとのカラー情報のリストを値とするマップ\r
+                       HashMap<String, Map<String, List<IndependentPartsColorInfo>>> partsColorMap = new HashMap<String, Map<String, List<IndependentPartsColorInfo>>>();\r
+                       for (Element partsColorInfoMapElm : getChildElements(docElm,\r
+                                       "partsColorInfoMap")) {\r
+                               // カラー定義マップを読み込む\r
+                               HashMap<String, List<IndependentPartsColorInfo>> colorMap = new HashMap<String, List<IndependentPartsColorInfo>>();\r
+                               for (Element colorsElm : getChildElements(partsColorInfoMapElm,\r
+                                               "colors")) {\r
+                                       for (Element colorElm : getChildElements(colorsElm, "color")) {\r
+                                               String colorId = colorElm.getAttribute("id");\r
+                                               List<IndependentPartsColorInfo> colorInfoList = characterDataXMLReader\r
+                                                               .readPartsColor(colorElm);\r
+                                               colorMap.put(colorId, colorInfoList);\r
+                                       }\r
+                               }\r
+\r
+                               // パーツごとのカラー情報を読み込む\r
+                               for (Element partsListElm : getChildElements(\r
+                                               partsColorInfoMapElm, "partsList")) {\r
+                                       for (Element partsElm : getChildElements(partsListElm,\r
+                                                       "partsIdentifier")) {\r
+                                               String categoryId = partsElm.getAttribute("categoryId");\r
+                                               String name = partsElm.getAttribute("name");\r
+                                               String colorId = partsElm.getAttribute("colorId");\r
+\r
+                                               Map<String, List<IndependentPartsColorInfo>> partsMap = partsColorMap\r
+                                                               .get(categoryId);\r
+                                               if (partsMap == null) {\r
+                                                       partsMap = new HashMap<String, List<IndependentPartsColorInfo>>();\r
+                                                       partsColorMap.put(categoryId, partsMap);\r
+                                               }\r
+                                               List<IndependentPartsColorInfo> colorInfo = colorMap\r
+                                                               .get(colorId);\r
+                                               if (colorInfo == null) {\r
+                                                       logger.warning("undefined colorId:" + colorId);\r
+                                               } else {\r
+                                                       partsMap.put(name, colorInfo);\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+                       workingSet.setPartsColorMap(partsColorMap);\r
+\r
+                       // 最後に使用した保存先ディレクトリ\r
+                       String lastUsedSaveDirStr = getElementText(docElm,\r
+                                       "lastUsedSaveDir");\r
+                       if (lastUsedSaveDirStr != null\r
+                                       && lastUsedSaveDirStr.trim().length() > 0) {\r
+                               workingSet.setLastUsedSaveDir(new File(lastUsedSaveDirStr\r
+                                               .trim()));\r
+                       }\r
+\r
+                       // 最後に使用したエクスポート先ディレクトリ\r
+                       String lastUsedExportDirStr = getElementText(docElm,\r
+                                       "lastUsedExportDir");\r
+                       if (lastUsedExportDirStr != null\r
+                                       && lastUsedExportDirStr.trim().length() > 0) {\r
+                               workingSet.setLastUsedExportDir(new File(lastUsedExportDirStr\r
+                                               .trim()));\r
+                       }\r
+\r
+                       // 壁紙情報\r
+                       WallpaperInfo wallpaperInfo = null;\r
+                       for (Element wallpaperElm : getChildElements(docElm,\r
+                                       "wallpaperInfo")) {\r
+                               wallpaperInfo = readWallpaperInfo(wallpaperElm);\r
+                               break; // wallpaperInfoは最初の一要素しか想定しない.\r
+                       }\r
+                       workingSet.setWallpaperInfo(wallpaperInfo);\r
+\r
+                       // 現在のパーツ情報\r
+                       for (Element currentPartsSetsElm : getChildElements(docElm,\r
+                                       "currentPartsSet")) {\r
+                               for (Element presetElm : getChildElements(currentPartsSetsElm,\r
+                                               "preset")) {\r
+                                       IndependentPartsSetInfo currentPartsSet = characterDataXMLReader\r
+                                                       .loadPartsSet(presetElm, lang);\r
+                                       workingSet.setCurrentPartsSet(currentPartsSet);\r
+                                       break; // 最初の一要素のみ\r
+                               }\r
+                               break; // 最初の一要素のみ\r
+                       }\r
+\r
+                       // 最後に使ったお気に入り情報\r
+                       for (Element lastUsePresetPartsElm : getChildElements(docElm,\r
+                                       "lastUsePresetParts")) {\r
+                               for (Element presetElm : getChildElements(\r
+                                               lastUsePresetPartsElm, "preset")) {\r
+                                       IndependentPartsSetInfo lastUsePresetParts = characterDataXMLReader\r
+                                                       .loadPartsSet(presetElm, lang);\r
+                                       workingSet.setLastUsePresetParts(lastUsePresetParts);\r
+                                       break; // 最初の一要素のみ\r
+                               }\r
+                               break; // 最初の一要素のみ\r
+                       }\r
+\r
+                       return workingSet;\r
+\r
+               } catch (RuntimeException ex) {\r
+                       IOException ex2 = new IOException("WorkingSet invalid format.");\r
+                       ex2.initCause(ex);\r
+                       throw ex2;\r
+               }\r
+       }\r
+\r
+       /**\r
+        * 壁紙情報を読み込む\r
+        * \r
+        * @param elm\r
+        *            壁紙要素\r
+        * @return 壁紙情報、elmがnullの場合はnullを返す.\r
+        */\r
+       private WallpaperInfo readWallpaperInfo(Element elm) {\r
+               if (elm == null) {\r
+                       return null;\r
+               }\r
+               WallpaperInfo wallpaperInfo = new WallpaperInfo();\r
+\r
+               String typStr = getElementText(elm, "type");\r
+               WallpaperResourceType typ = WallpaperResourceType.valueOf(typStr);\r
+               wallpaperInfo.setType(typ);\r
+\r
+               String res = getElementText(elm, "resource");\r
+               if (res != null && res.trim().length() > 0) {\r
+                       wallpaperInfo.setResource(res.trim());\r
+               }\r
+\r
+               String fileStr = getElementText(elm, "file");\r
+               if (fileStr != null && fileStr.trim().length() > 0) {\r
+                       wallpaperInfo.setFile(new File(fileStr.trim()));\r
+               }\r
+\r
+               float alpha = 0f;\r
+               String alphaStr = getElementText(elm, "alpha");\r
+               if (alphaStr != null && alphaStr.trim().length() > 0) {\r
+                       alpha = Float.parseFloat(alphaStr);\r
+                       wallpaperInfo.setAlpha(alpha);\r
+               }\r
+\r
+               String backgroundColorStr = getElementText(elm, "backgroundColor");\r
+               if (backgroundColorStr != null\r
+                               && backgroundColorStr.trim().length() > 0) {\r
+                       Color backgroundColor = Color.decode(backgroundColorStr.trim());\r
+                       wallpaperInfo.setBackgroundColor(backgroundColor);\r
+               }\r
+\r
+               return wallpaperInfo;\r
+       }\r
+}\r
index 9e84abd..d05d81e 100644 (file)
-package charactermanaj.model.io;
-
-import java.awt.Color;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import charactermanaj.model.CharacterData;
-import charactermanaj.model.PartsColorInfo;
-import charactermanaj.model.PartsIdentifier;
-import charactermanaj.model.PartsSet;
-import charactermanaj.model.WorkingSet;
-import charactermanaj.ui.model.WallpaperInfo;
-import charactermanaj.ui.model.WallpaperInfo.WallpaperResourceType;
-
-/**
- * WorkingSetのXMLへの書き込み
- */
-public class WorkingSetXMLWriter {
-       
-       /**
-        * WorkingSetのバージョン
-        */
-       private static final String VERSION_SIG_1_0 = "1.0";
-
-       /**
-        * WorkingSetのXMLファイルの名前空間
-        */
-       private static final String NS = "http://charactermanaj.sourceforge.jp/schema/charactermanaj-workingset";
-
-       /**
-        * キャラクターデータのXML化
-        */
-       private CharacterDataXMLWriter characterDataXmlWriter =
-                       new CharacterDataXMLWriter(NS);
-
-       /**
-        * ワーキングセットをXML表現で出力ストリームに出力します.<br>
-        * @param ws ワーキングセット
-        * @param outstm 出力先ストリーム
-        * @throws IOException 失敗
-        */
-       public void writeWorkingSet(WorkingSet ws, OutputStream outstm) throws IOException {
-               if (ws == null || outstm == null) {
-                       throw new IllegalArgumentException();
-               }
-               
-               Document doc = createWorkingSetXML(ws);
-
-               // output xml
-               TransformerFactory txFactory = TransformerFactory.newInstance();
-               txFactory.setAttribute("indent-number", Integer.valueOf(4));
-               Transformer tfmr;
-               try {
-                       tfmr = txFactory.newTransformer();
-               } catch (TransformerConfigurationException ex) {
-                       throw new RuntimeException("JAXP Configuration Failed.", ex);
-               }
-               tfmr.setOutputProperty(OutputKeys.INDENT, "yes");
-
-               // JDK-4504745 : javax.xml.transform.Transformer encoding does not work properly
-               // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4504745
-               final String encoding = "UTF-8";
-               tfmr.setOutputProperty("encoding", encoding);
-               try {
-                       tfmr.transform(new DOMSource(doc), new StreamResult(
-                                       new OutputStreamWriter(outstm, Charset.forName(encoding))));
-
-               } catch (TransformerException ex) {
-                       IOException ex2 = new IOException("XML Convert failed.");
-                       ex2.initCause(ex);
-                       throw ex2;
-               }
-       }
-       
-       /**
-        * ワーキングセットのXMLドキュメントを生成します.
-        * @param ws ワーキングセット
-        * @return XMLドキュメント
-        */
-       public Document createWorkingSetXML(WorkingSet ws) {
-               if (ws == null) {
-                       throw new IllegalArgumentException();
-               }
-
-               Document doc;
-               try {
-                       DocumentBuilderFactory factory = DocumentBuilderFactory
-                                       .newInstance();
-                       factory.setNamespaceAware(true);
-                       DocumentBuilder builder = factory.newDocumentBuilder();
-                       doc = builder.newDocument();
-               } catch (ParserConfigurationException ex) {
-                       throw new RuntimeException("JAXP Configuration failed.", ex);
-               }
-
-               Locale locale = Locale.getDefault();
-               String lang = locale.getLanguage();
-
-               Element root = doc.createElementNS(NS, "character-workingset");
-               root.setAttribute("version", VERSION_SIG_1_0);
-
-               root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:xsi",
-                               XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);           
-               root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:xml",
-                               XMLConstants.XML_NS_URI);               
-               root.setAttribute("xsi:schemaLocation", NS + " character_ws.xsd");
-
-               // ドキュメントベース
-               URI docbase = ws.getCharacterDocBase();
-               root.setAttribute("characterDocBase", docbase == null ? "" : docbase.toString());
-               
-               // キャラクターデータのシグネチャ
-               CharacterData cd = ws.getCharacterData();
-               Element characterDataSigElm = doc.createElementNS(NS, "characterDataSig");
-               if (cd == null || !cd.isValid()) {
-                       // 指定されていないか有効でない場合は無しとみなす.
-                       characterDataSigElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-               } else {
-                       characterDataSigElm.setTextContent(cd.toSignatureString());
-               }
-               root.appendChild(characterDataSigElm);
-
-               // パーツカラー情報
-               root.appendChild(writePartsColorInfoMap(doc, ws.getPartsColorInfoMap()));
-               
-               // パーツセット
-               PartsSet partsSet = ws.getPartsSet();
-               Element partsSetElm = doc.createElementNS(NS, "partsSet");
-               if (partsSet == null || partsSet.isEmpty()) {
-                       partsSetElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       
-               } else {
-                       Element elm = characterDataXmlWriter.createPartsSetXML(doc, lang, partsSet);
-                       partsSetElm.appendChild(elm);
-               }
-               root.appendChild(partsSetElm);
-               
-               // 最後に使用した保存先ディレクトリ
-               Element lastUsedSaveDirElm = doc.createElementNS(NS, "lastUsedSaveDir");
-               File lastUsedSaveDir = ws.getLastUsedSaveDir();
-               if (lastUsedSaveDir == null) {
-                       lastUsedSaveDirElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       
-               } else {
-                       lastUsedSaveDirElm.setTextContent(lastUsedSaveDir.getPath());
-               }
-               root.appendChild(lastUsedSaveDirElm);
-               
-               // 最後に使用したエクスポート先ディレクトリ
-               Element lastUsedExportDirElm = doc.createElementNS(NS, "lastUsedExportDir");
-               File lastUsedExportDir = ws.getLastUsedExportDir();
-               if (lastUsedExportDir == null) {
-                       lastUsedExportDirElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       
-               } else {
-                       lastUsedExportDirElm.setTextContent(lastUsedExportDir.getPath());
-               }
-               root.appendChild(lastUsedExportDirElm);
-               
-               // 最後に使用したパーツセット情報、なければnull
-               PartsSet lastUsePresetParts = ws.getLastUsePresetParts();
-               Element lastUsePresetPartsElm = doc.createElementNS(NS, "lastUsePresetParts");
-               if (lastUsePresetParts == null || lastUsePresetParts.isEmpty()) {
-                       lastUsePresetPartsElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       
-               } else {
-                       Element elm = characterDataXmlWriter.createPartsSetXML(doc, lang, lastUsePresetParts);
-                       lastUsePresetPartsElm.appendChild(elm);
-               }
-               root.appendChild(lastUsePresetPartsElm);
-               
-               // 壁紙情報
-               root.appendChild(writeWallpaper(doc, ws.getWallpaperInfo()));
-               
-               doc.appendChild(root);
-               return doc;
-       }
-       
-       /**
-        * パーツごとのカラー情報のXML要素を生成して返します.
-        * @param doc 要素のファクトリ
-        * @param partsColorMap パーツごとのカラー情報のマップ
-        * @return パーツごとのカラー情報のXML要素
-        */
-       public Element writePartsColorInfoMap(Document doc, Map<PartsIdentifier, PartsColorInfo> partsColorMap) {
-               Element partsColorInfoMapElm = doc.createElementNS(NS, "partsColorInfoMap");
-               if (partsColorMap != null) {
-                       // 使用しているカラーの設定ごとに番号を振る
-                       // (同じカラー設定であれば同じ番号とする.)
-                       LinkedHashMap<PartsColorInfo, String> colorMap = new LinkedHashMap<PartsColorInfo, String>();
-                       for (Map.Entry<PartsIdentifier, PartsColorInfo> partsColorEntry : partsColorMap.entrySet()) {
-                               PartsColorInfo partsColorInfo = partsColorEntry.getValue();
-                               if (partsColorInfo != null && !partsColorInfo.isEmpty()) {
-                                       if (!colorMap.containsKey(partsColorInfo)) {
-                                               colorMap.put(partsColorInfo, Integer.toString(colorMap.size() + 1));
-                                       }
-                               }
-                       }
-                       
-                       // すべてのカラー設定を出力する.
-                       Element colorsElm = doc.createElementNS(NS, "colors");
-                       for (Map.Entry<PartsColorInfo, String> colorMapEntry : colorMap.entrySet()) {
-                               PartsColorInfo partsColorInfo = colorMapEntry.getKey();
-                               String id = colorMapEntry.getValue();
-                               Element partsColorElm = characterDataXmlWriter.createPartsColorInfoXML(doc, partsColorInfo);
-                               partsColorElm.setAttribute("id", id);
-                               colorsElm.appendChild(partsColorElm);
-                       }
-                       partsColorInfoMapElm.appendChild(colorsElm);
-                       
-                       // パーツと、そのパーツのカラー設定番号の一覧を出力する.
-                       Element partsListElm = doc.createElementNS(NS, "partsList");
-                       for (Map.Entry<PartsIdentifier, PartsColorInfo> partsColorEntry : partsColorMap.entrySet()) {
-                               PartsIdentifier partsIdentifier = partsColorEntry.getKey();
-                               PartsColorInfo partsColorInfo = partsColorEntry.getValue();
-                               if (partsColorInfo != null && !partsColorInfo.isEmpty()) {
-                                       String colorId = colorMap.get(partsColorInfo);
-                                       if (colorId == null) {
-                                               throw new RuntimeException("colorMapが不整合です");
-                                       }
-                                       Element partsElm = doc.createElementNS(NS, "partsIdentifier");
-                                       String categoryId = partsIdentifier.getPartsCategory().getCategoryId();
-                                       partsElm.setAttribute("categoryId", categoryId);
-                                       partsElm.setAttribute("name", partsIdentifier.getPartsName());
-                                       partsElm.setAttribute("colorId", colorId);
-                                       partsListElm.appendChild(partsElm);
-                               }
-                       }
-                       partsColorInfoMapElm.appendChild(partsListElm);
-               }
-               return partsColorInfoMapElm;
-       }
-       
-       /**
-        * 壁紙情報をXML要素として生成する.
-        * @param doc XML要素のファクトリ
-        * @param wallpaperInfo 壁紙情報
-        * @return 壁紙情報のXML要素
-        */
-       public Element writeWallpaper(Document doc, WallpaperInfo wallpaperInfo) {
-               Element elm = doc.createElementNS(NS, "wallpaperInfo");
-               
-               if (wallpaperInfo == null) {
-                       elm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-
-               } else {
-                       // タイプ
-                       WallpaperResourceType typ = wallpaperInfo.getType();
-                       Element typElm = doc.createElementNS(NS, "type");
-                       typElm.setTextContent(typ.name());
-                       elm.appendChild(typElm);
-                       
-                       // リソース
-                       String res = wallpaperInfo.getResource();
-                       Element resElm = doc.createElementNS(NS, "resource");
-                       if (res == null || res.trim().length() == 0) {
-                               resElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       } else {
-                               resElm.setTextContent(res);
-                       }
-                       elm.appendChild(resElm);
-                       
-                       // ファイル
-                       File file = wallpaperInfo.getFile();
-                       Element fileElm = doc.createElementNS(NS, "file");
-                       if (file == null) {
-                               fileElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");
-                       } else {
-                               fileElm.setTextContent(file.getPath());
-                       }
-                       elm.appendChild(fileElm);
-                       
-                       // アルファ
-                       float alpha = wallpaperInfo.getAlpha();
-                       Element alphaElm = doc.createElementNS(NS, "alpha");
-                       alphaElm.setTextContent(Float.toString(alpha));
-                       elm.appendChild(alphaElm);
-                       
-                       // 背景色
-                       Color backgroundColor = wallpaperInfo.getBackgroundColor();
-                       Element bgColorElm = doc.createElementNS(NS, "backgroundColor");
-                       bgColorElm.setTextContent("#" + Integer.toHexString(backgroundColor.getRGB() & 0xffffff));
-                       elm.appendChild(bgColorElm);
-               }
-               
-               return elm;
-       }
-       
-}
+package charactermanaj.model.io;\r
+\r
+import java.awt.Color;\r
+import java.io.File;\r
+import java.io.IOException;\r
+import java.io.OutputStream;\r
+import java.io.OutputStreamWriter;\r
+import java.net.URI;\r
+import java.nio.charset.Charset;\r
+import java.util.LinkedHashMap;\r
+import java.util.Locale;\r
+import java.util.Map;\r
+\r
+import javax.xml.XMLConstants;\r
+import javax.xml.parsers.DocumentBuilder;\r
+import javax.xml.parsers.DocumentBuilderFactory;\r
+import javax.xml.parsers.ParserConfigurationException;\r
+import javax.xml.transform.OutputKeys;\r
+import javax.xml.transform.Transformer;\r
+import javax.xml.transform.TransformerConfigurationException;\r
+import javax.xml.transform.TransformerException;\r
+import javax.xml.transform.TransformerFactory;\r
+import javax.xml.transform.dom.DOMSource;\r
+import javax.xml.transform.stream.StreamResult;\r
+\r
+import org.w3c.dom.Document;\r
+import org.w3c.dom.Element;\r
+\r
+import charactermanaj.model.CharacterData;\r
+import charactermanaj.model.PartsColorInfo;\r
+import charactermanaj.model.PartsIdentifier;\r
+import charactermanaj.model.PartsSet;\r
+import charactermanaj.model.WorkingSet;\r
+import charactermanaj.ui.model.WallpaperInfo;\r
+import charactermanaj.ui.model.WallpaperInfo.WallpaperResourceType;\r
+\r
+/**\r
+ * WorkingSetのXMLへの書き込み\r
+ */\r
+public class WorkingSetXMLWriter {\r
+       \r
+       /**\r
+        * WorkingSetのバージョン\r
+        */\r
+       private static final String VERSION_SIG_1_0 = "1.0";\r
+\r
+       /**\r
+        * WorkingSetのXMLファイルの名前空間\r
+        */\r
+       private static final String NS = "http://charactermanaj.sourceforge.jp/schema/charactermanaj-workingset";\r
+\r
+       /**\r
+        * キャラクターデータのXML化\r
+        */\r
+       private CharacterDataXMLWriter characterDataXmlWriter =\r
+                       new CharacterDataXMLWriter(NS);\r
+\r
+       /**\r
+        * ワーキングセットをXML表現で出力ストリームに出力します.<br>\r
+        * \r
+        * @param ws\r
+        *            ワーキングセット\r
+        * @param outstm\r
+        *            出力先ストリーム\r
+        * @throws IOException\r
+        *             失敗\r
+        */\r
+       public void writeWorkingSet(WorkingSet ws, OutputStream outstm) throws IOException {\r
+               if (ws == null || outstm == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+               \r
+               Document doc = createWorkingSetXML(ws);\r
+\r
+               // output xml\r
+               TransformerFactory txFactory = TransformerFactory.newInstance();\r
+               txFactory.setAttribute("indent-number", Integer.valueOf(4));\r
+               Transformer tfmr;\r
+               try {\r
+                       tfmr = txFactory.newTransformer();\r
+               } catch (TransformerConfigurationException ex) {\r
+                       throw new RuntimeException("JAXP Configuration Failed.", ex);\r
+               }\r
+               tfmr.setOutputProperty(OutputKeys.INDENT, "yes");\r
+\r
+               // JDK-4504745 : javax.xml.transform.Transformer encoding does not work properly\r
+               // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4504745\r
+               final String encoding = "UTF-8";\r
+               tfmr.setOutputProperty("encoding", encoding);\r
+               try {\r
+                       tfmr.transform(new DOMSource(doc), new StreamResult(\r
+                                       new OutputStreamWriter(outstm, Charset.forName(encoding))));\r
+\r
+               } catch (TransformerException ex) {\r
+                       IOException ex2 = new IOException("XML Convert failed.");\r
+                       ex2.initCause(ex);\r
+                       throw ex2;\r
+               }\r
+       }\r
+       \r
+       /**\r
+        * ワーキングセットのXMLドキュメントを生成します.\r
+        * \r
+        * @param ws\r
+        *            ワーキングセット\r
+        * @return XMLドキュメント\r
+        */\r
+       public Document createWorkingSetXML(WorkingSet ws) {\r
+               if (ws == null) {\r
+                       throw new IllegalArgumentException();\r
+               }\r
+\r
+               Document doc;\r
+               try {\r
+                       DocumentBuilderFactory factory = DocumentBuilderFactory\r
+                                       .newInstance();\r
+                       factory.setNamespaceAware(true);\r
+                       DocumentBuilder builder = factory.newDocumentBuilder();\r
+                       doc = builder.newDocument();\r
+               } catch (ParserConfigurationException ex) {\r
+                       throw new RuntimeException("JAXP Configuration failed.", ex);\r
+               }\r
+\r
+               Locale locale = Locale.getDefault();\r
+               String lang = locale.getLanguage();\r
+\r
+               Element root = doc.createElementNS(NS, "character-workingset");\r
+               root.setAttribute("version", VERSION_SIG_1_0);\r
+\r
+               root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:xsi",\r
+                               XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);           \r
+               root.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:xml",\r
+                               XMLConstants.XML_NS_URI);               \r
+               root.setAttribute("xsi:schemaLocation", NS + " character_ws.xsd");\r
+\r
+               // ドキュメントベース\r
+               URI docbase = ws.getCharacterDocBase();\r
+               root.setAttribute("characterDocBase", docbase == null ? "" : docbase.toString());\r
+               \r
+               // キャラクターデータのシグネチャ\r
+               CharacterData cd = ws.getCharacterData();\r
+               Element characterDataSigElm = doc.createElementNS(NS, "characterDataSig");\r
+               if (cd == null || !cd.isValid()) {\r
+                       // 指定されていないか有効でない場合は無しとみなす.\r
+                       characterDataSigElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+               } else {\r
+                       characterDataSigElm.setTextContent(cd.toSignatureString());\r
+               }\r
+               root.appendChild(characterDataSigElm);\r
+\r
+               // パーツカラー情報\r
+               root.appendChild(writePartsColorInfoMap(doc, ws.getPartsColorInfoMap()));\r
+               \r
+               // 現在のパーツセット\r
+               PartsSet currentPartsSet = ws.getPartsSet();\r
+               Element partsSetElm = doc.createElementNS(NS, "currentPartsSet");\r
+               if (currentPartsSet == null || currentPartsSet.isEmpty()) {\r
+                       partsSetElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       \r
+               } else {\r
+                       Element elm = characterDataXmlWriter.createPartsSetXML(doc, lang,\r
+                                       currentPartsSet);\r
+                       partsSetElm.appendChild(elm);\r
+               }\r
+               root.appendChild(partsSetElm);\r
+               \r
+               // 最後に使用した保存先ディレクトリ\r
+               Element lastUsedSaveDirElm = doc.createElementNS(NS, "lastUsedSaveDir");\r
+               File lastUsedSaveDir = ws.getLastUsedSaveDir();\r
+               if (lastUsedSaveDir == null) {\r
+                       lastUsedSaveDirElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       \r
+               } else {\r
+                       lastUsedSaveDirElm.setTextContent(lastUsedSaveDir.getPath());\r
+               }\r
+               root.appendChild(lastUsedSaveDirElm);\r
+               \r
+               // 最後に使用したエクスポート先ディレクトリ\r
+               Element lastUsedExportDirElm = doc.createElementNS(NS, "lastUsedExportDir");\r
+               File lastUsedExportDir = ws.getLastUsedExportDir();\r
+               if (lastUsedExportDir == null) {\r
+                       lastUsedExportDirElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       \r
+               } else {\r
+                       lastUsedExportDirElm.setTextContent(lastUsedExportDir.getPath());\r
+               }\r
+               root.appendChild(lastUsedExportDirElm);\r
+               \r
+               // 最後に使用したパーツセット情報、なければnull\r
+               PartsSet lastUsePresetParts = ws.getLastUsePresetParts();\r
+               Element lastUsePresetPartsElm = doc.createElementNS(NS, "lastUsePresetParts");\r
+               if (lastUsePresetParts == null || lastUsePresetParts.isEmpty()) {\r
+                       lastUsePresetPartsElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       \r
+               } else {\r
+                       Element elm = characterDataXmlWriter.createPartsSetXML(doc, lang, lastUsePresetParts);\r
+                       lastUsePresetPartsElm.appendChild(elm);\r
+               }\r
+               root.appendChild(lastUsePresetPartsElm);\r
+               \r
+               // 壁紙情報\r
+               root.appendChild(writeWallpaper(doc, ws.getWallpaperInfo()));\r
+               \r
+               doc.appendChild(root);\r
+               return doc;\r
+       }\r
+       \r
+       /**\r
+        * パーツごとのカラー情報のXML要素を生成して返します.\r
+        * \r
+        * @param doc\r
+        *            要素のファクトリ\r
+        * @param partsColorMap\r
+        *            パーツごとのカラー情報のマップ\r
+        * @return パーツごとのカラー情報のXML要素\r
+        */\r
+       public Element writePartsColorInfoMap(Document doc, Map<PartsIdentifier, PartsColorInfo> partsColorMap) {\r
+               Element partsColorInfoMapElm = doc.createElementNS(NS, "partsColorInfoMap");\r
+               if (partsColorMap != null) {\r
+                       // 使用しているカラーの設定ごとに番号を振る\r
+                       // (同じカラー設定であれば同じ番号とする.)\r
+                       LinkedHashMap<PartsColorInfo, String> colorMap = new LinkedHashMap<PartsColorInfo, String>();\r
+                       for (Map.Entry<PartsIdentifier, PartsColorInfo> partsColorEntry : partsColorMap.entrySet()) {\r
+                               PartsColorInfo partsColorInfo = partsColorEntry.getValue();\r
+                               if (partsColorInfo != null && !partsColorInfo.isEmpty()) {\r
+                                       if (!colorMap.containsKey(partsColorInfo)) {\r
+                                               colorMap.put(partsColorInfo, Integer.toString(colorMap.size() + 1));\r
+                                       }\r
+                               }\r
+                       }\r
+                       \r
+                       // すべてのカラー設定を出力する.\r
+                       Element colorsElm = doc.createElementNS(NS, "colors");\r
+                       for (Map.Entry<PartsColorInfo, String> colorMapEntry : colorMap.entrySet()) {\r
+                               PartsColorInfo partsColorInfo = colorMapEntry.getKey();\r
+                               String id = colorMapEntry.getValue();\r
+                               Element partsColorElm = characterDataXmlWriter.createPartsColorInfoXML(doc, partsColorInfo);\r
+                               partsColorElm.setAttribute("id", id);\r
+                               colorsElm.appendChild(partsColorElm);\r
+                       }\r
+                       partsColorInfoMapElm.appendChild(colorsElm);\r
+                       \r
+                       // パーツと、そのパーツのカラー設定番号の一覧を出力する.\r
+                       Element partsListElm = doc.createElementNS(NS, "partsList");\r
+                       for (Map.Entry<PartsIdentifier, PartsColorInfo> partsColorEntry : partsColorMap.entrySet()) {\r
+                               PartsIdentifier partsIdentifier = partsColorEntry.getKey();\r
+                               PartsColorInfo partsColorInfo = partsColorEntry.getValue();\r
+                               if (partsColorInfo != null && !partsColorInfo.isEmpty()) {\r
+                                       String colorId = colorMap.get(partsColorInfo);\r
+                                       if (colorId == null) {\r
+                                               throw new RuntimeException("colorMapが不整合です");\r
+                                       }\r
+                                       Element partsElm = doc.createElementNS(NS, "partsIdentifier");\r
+                                       String categoryId = partsIdentifier.getPartsCategory().getCategoryId();\r
+                                       partsElm.setAttribute("categoryId", categoryId);\r
+                                       partsElm.setAttribute("name", partsIdentifier.getPartsName());\r
+                                       partsElm.setAttribute("colorId", colorId);\r
+                                       partsListElm.appendChild(partsElm);\r
+                               }\r
+                       }\r
+                       partsColorInfoMapElm.appendChild(partsListElm);\r
+               }\r
+               return partsColorInfoMapElm;\r
+       }\r
+       \r
+       /**\r
+        * 壁紙情報をXML要素として生成する.\r
+        * \r
+        * @param doc\r
+        *            XML要素のファクトリ\r
+        * @param wallpaperInfo\r
+        *            壁紙情報\r
+        * @return 壁紙情報のXML要素\r
+        */\r
+       public Element writeWallpaper(Document doc, WallpaperInfo wallpaperInfo) {\r
+               Element elm = doc.createElementNS(NS, "wallpaperInfo");\r
+               \r
+               if (wallpaperInfo == null) {\r
+                       elm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+\r
+               } else {\r
+                       // タイプ\r
+                       WallpaperResourceType typ = wallpaperInfo.getType();\r
+                       Element typElm = doc.createElementNS(NS, "type");\r
+                       typElm.setTextContent(typ.name());\r
+                       elm.appendChild(typElm);\r
+                       \r
+                       // リソース\r
+                       String res = wallpaperInfo.getResource();\r
+                       Element resElm = doc.createElementNS(NS, "resource");\r
+                       if (res == null || res.trim().length() == 0) {\r
+                               resElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       } else {\r
+                               resElm.setTextContent(res);\r
+                       }\r
+                       elm.appendChild(resElm);\r
+                       \r
+                       // ファイル\r
+                       File file = wallpaperInfo.getFile();\r
+                       Element fileElm = doc.createElementNS(NS, "file");\r
+                       if (file == null) {\r
+                               fileElm.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:nil", "true");\r
+                       } else {\r
+                               fileElm.setTextContent(file.getPath());\r
+                       }\r
+                       elm.appendChild(fileElm);\r
+                       \r
+                       // アルファ\r
+                       float alpha = wallpaperInfo.getAlpha();\r
+                       Element alphaElm = doc.createElementNS(NS, "alpha");\r
+                       alphaElm.setTextContent(Float.toString(alpha));\r
+                       elm.appendChild(alphaElm);\r
+                       \r
+                       // 背景色\r
+                       Color backgroundColor = wallpaperInfo.getBackgroundColor();\r
+                       Element bgColorElm = doc.createElementNS(NS, "backgroundColor");\r
+                       bgColorElm.setTextContent("#" + Integer.toHexString(backgroundColor.getRGB() & 0xffffff));\r
+                       elm.appendChild(bgColorElm);\r
+               }\r
+               \r
+               return elm;\r
+       }\r
+       \r
+}\r
index 4c3afff..3f8c12c 100644 (file)
@@ -1,12 +1,19 @@
 package charactermanaj.model.util;\r
 \r
 import java.io.File;\r
+import java.io.FileFilter;\r
+import java.io.OutputStream;\r
+import java.net.URI;\r
 import java.util.logging.Level;\r
 import java.util.logging.Logger;\r
 \r
 import charactermanaj.model.AppConfig;\r
+import charactermanaj.model.WorkingSet;\r
+import charactermanaj.model.io.WorkingSetXMLWriter;\r
+import charactermanaj.ui.MainFrame;\r
 import charactermanaj.ui.RecentCharactersDir;\r
 import charactermanaj.util.FileUserData;\r
+import charactermanaj.util.UserData;\r
 import charactermanaj.util.UserDataFactory;\r
 \r
 \r
@@ -33,10 +40,8 @@ public abstract class StartupSupport {
                                public void doStartup() {\r
                                        StartupSupport[] startups = {\r
                                                        new PurgeOldLogs(),\r
-                                                       // new UpgradeCache(),\r
-                                                       // new UpgradeFavoritesXml(),\r
-                                                       // new PurgeUnusedCache(),\r
                                                        new ConvertRecentCharDirsSerToXmlProps(),\r
+                                                       new ConvertWorkingSetSerToXml(),\r
                                        };\r
                                        for (StartupSupport startup : startups) {\r
                                                logger.log(Level.FINE, "startup operation start. class="\r
@@ -100,362 +105,74 @@ class ConvertRecentCharDirsSerToXmlProps extends StartupSupport {
        }\r
 }\r
 \r
-// /**\r
-// * 古い形式のCacheを移動する.\r
-// *\r
-// * @author seraphy\r
-// *\r
-// */\r
-// class UpgradeCache extends StartupSupport {\r
-//\r
-// /**\r
-// * ロガー\r
-// */\r
-// private final Logger logger = Logger.getLogger(getClass().getName());\r
-//\r
-// @Override\r
-// public void doStartup() {\r
-// UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-// File appData = userDataFactory.getSpecialDataDir(null);\r
-//\r
-// // ver0.94まではユーザディレクトリ直下に*.serファイルを配置していたが、\r
-// // ver0.95以降はcachesに移動したため、旧ファイルがのこっていれば移動する.\r
-// for (File file : appData.listFiles()) {\r
-// try {\r
-// String name = file.getName();\r
-// if (file.isFile() && name.endsWith(".ser")) {\r
-// File toDir = userDataFactory.getSpecialDataDir(name);\r
-// if ( !appData.equals(toDir)) {\r
-// String convertedName = convertName(name);\r
-// File toFile = new File(toDir, convertedName);\r
-// boolean ret = file.renameTo(toFile);\r
-// logger.log(Level.INFO, "move file " + file + " to " + toFile + " ;successed="\r
-// + ret);\r
-// }\r
-// }\r
-// } catch (Exception ex) {\r
-// logger.log(Level.WARNING, "file move failed. " + file, ex);\r
-// }\r
-// }\r
-// }\r
-//\r
-// protected String convertName(String name) {\r
-// if (name.endsWith("-workingset.ser") || name.endsWith("-favorites.ser")) {\r
-// // {UUID}-CharacterID-workingset.ser もしくは、-favorites.serの場合は、\r
-// // {UUID}-workingset.ser / {UUID}-favorites.serに変更する.\r
-// String[] splitedName = name.split("-");\r
-// if (splitedName.length >= 7) {\r
-// StringBuilder buf = new StringBuilder();\r
-// for (int idx = 0; idx < 5; idx++) {\r
-// if (idx > 0) {\r
-// buf.append("-");\r
-// }\r
-// buf.append(splitedName[idx]);\r
-// }\r
-// buf.append("-");\r
-// buf.append(splitedName[splitedName.length - 1]);\r
-// return buf.toString();\r
-// }\r
-// }\r
-// return name;\r
-// }\r
-// }\r
+/**\r
+ * シリアライズによるキャラクターディレクトリリストの保存をXML形式のPropertiesにアップグレードします。\r
+ * \r
+ * @author seraphy\r
+ * \r
+ */\r
+class ConvertWorkingSetSerToXml extends StartupSupport {\r
+       /**\r
+        * ロガー\r
+        */\r
+       private final Logger logger = Logger.getLogger(getClass().getName());\r
 \r
-// /**\r
-// * DocBaseのハッシュ値をもとにしたデータをサポートする抽象クラス.\r
-// *\r
-// * @author seraphy\r
-// *\r
-// */\r
-// abstract class StartupSupportForDocBasedData extends StartupSupport {\r
-//\r
-// /**\r
-// * character.xmlのファイル位置を示すUUID表現を算定するためのアルゴリズムの選択肢.<br>\r
-// *\r
-// * @author seraphy\r
-// */\r
-// protected enum DocBaseSignatureStoratage {\r
-//\r
-// /**\r
-// * 新形式のcharacter.xmlのUUIDを取得(もしくは生成)する.\r
-// * charatcer.xmlファイルのURIを文字列にしたもののタイプ3-UUID表現.<br>\r
-// */\r
-// NEW_FORMAT() {\r
-// @Override\r
-// public Map<File, String> getDocBaseSignature(Collection<File>\r
-// characterXmlFiles) {\r
-// HashMap<URI, File> uris = new HashMap<URI, File>();\r
-// for (File characterXmlFile : characterXmlFiles) {\r
-// uris.put(characterXmlFile.toURI(), characterXmlFile);\r
-// }\r
-// UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-// HashMap<File, String> results = new HashMap<File, String>();\r
-// File storeDir = userDataFactory.getSpecialDataDir("*.ser");\r
-// for (Map.Entry<URI, String> entry : userDataFactory\r
-// .getMangledNameMap(uris.keySet(), storeDir, true).entrySet()) {\r
-// File characterXmlFile = uris.get(entry.getKey());\r
-// String mangledName = entry.getValue();\r
-// results.put(characterXmlFile, mangledName);\r
-// }\r
-// return results;\r
-// }\r
-// },\r
-//\r
-// /**\r
-// * 旧形式のcharacter.xmlのUUIDを取得する.<br>\r
-// * charatcer.xmlファイルのURLを文字列にしたもののタイプ3-UUID表現.<br>\r
-// */\r
-// OLD_FORMAT() {\r
-// @Override\r
-// public Map<File, String> getDocBaseSignature(Collection<File>\r
-// characterXmlFiles) {\r
-// HashMap<File, String> results = new HashMap<File, String>();\r
-// for (File characterXmlFile : characterXmlFiles) {\r
-// String mangledName;\r
-// try {\r
-// @SuppressWarnings("deprecation")\r
-// URL url = characterXmlFile.toURL();\r
-// mangledName = UUID.nameUUIDFromBytes(url.toString().getBytes()).toString();\r
-//\r
-// } catch (Exception ex) {\r
-// logger.log(Level.WARNING,\r
-// "character.xmlのファイル位置をUUID化できません。:"\r
-// + characterXmlFile, ex);\r
-// mangledName = null;\r
-// }\r
-// results.put(characterXmlFile, mangledName);\r
-// }\r
-// return results;\r
-// }\r
-// },\r
-// ;\r
-//\r
-// /**\r
-// * ロガー\r
-// */\r
-// private static Logger logger = Logger.getLogger(\r
-// DocBaseSignatureStoratage.class.getName());\r
-//\r
-// /**\r
-// * character.xmlからuuid表現のプレフィックスを算定する.\r
-// *\r
-// * @param characterXmlFile\r
-// * character.xmlのファイルのコレクション\r
-// * @return character.xmlファイルと、それに対応するUUIDのマップ、(UUIDは該当がなければnull)\r
-// */\r
-// public abstract Map<File, String> getDocBaseSignature(Collection<File>\r
-// characterXmlFiles);\r
-// }\r
-//\r
-// /**\r
-// * すべてのユーザおよびシステムのキャラクターデータのDocBaseをもととした、\r
-// * キャッシュディレクトリ上のハッシュ値(Prefix)の文字列をキーとし、 そのキャラクターディレクトリを値とするマップを返す.<br>\r
-// * (新タイプの場合は実在するcharacter.xmlに対するmangledNameが生成され登録される.)<br>\r
-// *\r
-// * @param storatage\r
-// * ハッシュ値を生成する戦略(旧タイプ・新タイプのUUIDの区別のため)\r
-// * @return DocBaseをもととしたハッシュ値の文字列表記をキー、キャラクターディレクトリを値とするマップ\r
-// */\r
-// protected Map<String, File> getDocBaseMapInCaches(DocBaseSignatureStoratage\r
-// storatage) {\r
-// if (storatage == null) {\r
-// throw new IllegalArgumentException();\r
-// }\r
-//\r
-// // キャラクターデータフォルダ\r
-// DirectoryConfig dirConfig = DirectoryConfig.getInstance();\r
-// File[] charactersDirs = {\r
-// dirConfig.getCharactersDir() // 現在のキャラクターデータフォルダ\r
-// };\r
-//\r
-// // キャラクターデータディレクトリを走査し、character.xmlファイルを収集する.\r
-// ArrayList<File> characterXmlFiles = new ArrayList<File>();\r
-// for (File charactersDir : charactersDirs) {\r
-// if (charactersDir == null || !charactersDir.exists()\r
-// || !charactersDir.isDirectory()) {\r
-// continue;\r
-// }\r
-// for (File characterDir : charactersDir.listFiles()) {\r
-// if ( !characterDir.isDirectory()) {\r
-// continue;\r
-// }\r
-// File characterXml = new File(characterDir,\r
-// CharacterDataPersistent.CONFIG_FILE);\r
-// if ( !characterXml.exists()) {\r
-// continue;\r
-// }\r
-// characterXmlFiles.add(characterXml);\r
-// }\r
-// }\r
-//\r
-// // character.xmlファイルに対するハッシュ化文字列を取得する.\r
-// Map<File, String> docBaseSigMap =\r
-// storatage.getDocBaseSignature(characterXmlFiles);\r
-//\r
-// // ハッシュ化文字列をキーとし、そのcharacter.xmlファイルを値とするマップに変換する.\r
-// HashMap<String, File> docBaseSignatures = new HashMap<String, File>();\r
-// for (Map.Entry<File, String> entry : docBaseSigMap.entrySet()) {\r
-// docBaseSignatures.put(entry.getValue(), entry.getKey());\r
-// }\r
-// return docBaseSignatures;\r
-// }\r
-//\r
-// /**\r
-// * 指定したディレクトリ直下にあるDocBaseのUUIDと推定される文字列で始まり、suffixで終わる\r
-// * ファイルのUUIDの部分文字列をキーとし、そのファイルを値とするマップを返す.\r
-// *\r
-// * @param dataDir\r
-// * 対象ディレクトリ\r
-// * @param suffix\r
-// * 対象となるファイル名の末尾文字列、nullまたは空文字の場合は全て\r
-// * @return DocBaseのUUID表現と思われる部分文字列をキーとし、そのファイルを値とするマップ\r
-// */\r
-// protected Map<String, File> getUUIDMangledNamedMap(File dataDir, String\r
-// suffix) {\r
-// if (dataDir == null || !dataDir.exists() || !dataDir.isDirectory()) {\r
-// throw new IllegalArgumentException();\r
-// }\r
-//\r
-// Map<String, File> uuidMangledFiles = new HashMap<String, File>();\r
-// for (File file : dataDir.listFiles()) {\r
-// String name = file.getName();\r
-// if (file.isFile() && (suffix == null || suffix.length() == 0 ||\r
-// name.endsWith(suffix))) {\r
-// String[] sigParts = name.split("-");\r
-// if (sigParts.length >= 5) {\r
-// // UUIDはa-b-c-d-eの5パーツになり、更に末尾に何らかの文字列が付与されるので\r
-// // 区切り文字は5つ以上になる.\r
-// // UUIDの部分だけ結合し直して復元する.\r
-// StringBuilder sig = new StringBuilder();\r
-// for (int idx = 0; idx < 5; idx++) {\r
-// if (idx != 0) {\r
-// sig.append("-");\r
-// }\r
-// sig.append(sigParts[idx]);\r
-// }\r
-// uuidMangledFiles.put(sig.toString(), file);\r
-// }\r
-// }\r
-// }\r
-// return uuidMangledFiles;\r
-// }\r
-//\r
-// }\r
+       @Override\r
+       public void doStartup() {\r
+               // 旧形式(ver0.991以前)\r
+               UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
+               final String FILENAME = "workingset.ser";\r
+               File dir = userDataFactory.getSpecialDataDir(FILENAME);\r
+               try {\r
+                       File[] files = dir.listFiles(new FileFilter() {\r
+                               public boolean accept(File pathname) {\r
+                                       String name = pathname.getName();\r
+                                       return name.endsWith(FILENAME);\r
+                               }\r
+                       });\r
+                       if (files != null) {\r
+                               WorkingSetXMLWriter wr = new WorkingSetXMLWriter();\r
+                               for (File file : files) {\r
+                                       FileUserData fileData = new FileUserData(file);\r
+                                       if (fileData.exists()) {\r
+                                               try {\r
+                                                       // serファイルをデシリアライズする.\r
+                                                       WorkingSet ws = (WorkingSet) fileData.load();\r
+                                                       URI docBase = ws.getCharacterDocBase();\r
+                                                       if (docBase != null) {\r
+                                                               // XML形式で保存しなおす.\r
+                                                               UserData workingSetXmlData = userDataFactory\r
+                                                                               .getMangledNamedUserData(\r
+                                                                                               docBase,\r
+                                                                                               MainFrame.WORKINGSET_FILE_SUFFIX);\r
+                                                               if (!workingSetXmlData.exists()) {\r
+                                                                       // XML形式データがまだない場合のみ保存しなおす.\r
+                                                                       OutputStream outstm = workingSetXmlData\r
+                                                                                       .getOutputStream();\r
+                                                                       try {\r
+                                                                               wr.writeWorkingSet(ws, outstm);\r
+                                                                       } finally {\r
+                                                                               outstm.close();\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
+\r
+                                                       // serファイルは削除する.\r
+                                                       fileData.delete();\r
 \r
-// /**\r
-// * 古い形式のFavorites.xmlを移動する.\r
-// *\r
-// * @author seraphy\r
-// */\r
-// class UpgradeFavoritesXml extends StartupSupportForDocBasedData {\r
-//\r
-// /**\r
-// * ロガー\r
-// */\r
-// private final Logger logger = Logger.getLogger(getClass().getName());\r
-//\r
-// @Override\r
-// public void doStartup() {\r
-// UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-// File appData = userDataFactory.getSpecialDataDir(null);\r
-//\r
-// // キャラクターデータディレクトリを走査しdocBaseの識別子の一覧を取得する\r
-// Map<String, File> docBaseSignatures = getDocBaseMapInCaches(\r
-// DocBaseSignatureStoratage.OLD_FORMAT);\r
-//\r
-// // ver0.94までは*.favorite.xmlはユーザディレクトリ直下に配備していたが\r
-// // ver0.95以降は各キャラクターディレクトリに移動するため、旧docbase-id-favorites.xmlが残っていれば移動する\r
-// // ユーザディレクトリ直下にある*-facotites.xmlを列挙する\r
-// Map<String, File> favorites = getUUIDMangledNamedMap(appData,\r
-// "-favorites.xml");\r
-//\r
-// // 旧式の*-favorites.xmlを各キャラクターディレクトリに移動する.\r
-// for (Map.Entry<String, File> favoritesEntry : favorites.entrySet()) {\r
-// String sig = favoritesEntry.getKey();\r
-// File file = favoritesEntry.getValue();\r
-// try {\r
-// File characterDir = docBaseSignatures.get(sig);\r
-// if (characterDir != null) {\r
-// File toFile = new File(characterDir, "favorites.xml");\r
-// boolean ret = file.renameTo(toFile);\r
-// logger.log(Level.INFO, "move file " + file + " to " + toFile + " ;successed="\r
-// + ret);\r
-// }\r
-//\r
-// } catch (Exception ex) {\r
-// logger.log(Level.INFO, "move file failed." + file, ex);\r
-// }\r
-// }\r
-// }\r
-// }\r
+                                               } catch (Exception ex) {\r
+                                                       logger.log(Level.WARNING, FILENAME\r
+                                                                       + " convert failed.", ex);\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
 \r
-// /**\r
-// * 存在しないDocBaseを参照するキャッシュ(*.ser)を削除する.<br>\r
-// * (キャラクターディレクトリを変更した場合は、以前のデータは削除される.)<br>\r
-// *\r
-// * @author seraphy\r
-// */\r
-// class PurgeUnusedCache extends StartupSupportForDocBasedData {\r
-//\r
-// /**\r
-// * ロガー\r
-// */\r
-// private final Logger logger = Logger.getLogger(getClass().getName());\r
-//\r
-// @Override\r
-// public void doStartup() {\r
-// // キャッシュの保存先を取得する.\r
-// UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-// File cacheDir = userDataFactory.getSpecialDataDir("*.ser");\r
-//\r
-// // 現在選択されているキャラクターデータディレクトリ上のUUIDの登録を保証する.\r
-// // (character.xmlに対するUUIDの問い合わせ時に登録がなければ登録される.)\r
-// // (現在選択されていないディレクトリについてはUUIDの登録が行われないので、もしデータベースファイルが\r
-// // 作成されていない場合はキャッシュは一旦削除されることになる.)\r
-// getDocBaseMapInCaches(DocBaseSignatureStoratage.NEW_FORMAT);\r
-//\r
-// // キャッシュ上にあるDocBaseのUUID表現で始まる*.serを列挙\r
-// String[] suffixes = {\r
-// "-character.xml-cache.ser", // character.xmlのキャッシュ\r
-// "-workingset.ser", // 作業状態のキャッシュ\r
-// "-favorites.ser" // お気に入りのキャッシュ\r
-// };\r
-//\r
-// // UUIDからURIの索引\r
-// final Map<String, URI> mangledURIMap =\r
-// userDataFactory.getMangledNameMap(cacheDir);\r
-//\r
-// // キャッシュファイルで使用されているUUIDの示す実体のURIが実在しない場合は、そのキャッシュは不要と見なす.\r
-// for (String suffix : suffixes) {\r
-// Map<String, File> caches = getUUIDMangledNamedMap(cacheDir, suffix);\r
-// for (Map.Entry<String, File> cacheEntry : caches.entrySet()) {\r
-// String mangledUUID = cacheEntry.getKey();\r
-// File cacheFile = cacheEntry.getValue();\r
-// try {\r
-// URI uri = mangledURIMap.get(mangledUUID);\r
-// boolean remove = true;\r
-// if (uri != null) {\r
-// File characterXmlFile = new File(uri);\r
-// if (characterXmlFile.exists() || characterXmlFile.isFile()) {\r
-// // UUIDデータベースに登録があり、且つ、\r
-// // character.xmlが実在する場合のみ削除しない.\r
-// remove = false;\r
-// }\r
-// }\r
-// if (remove) {\r
-// // キャッシュファイルを削除する.\r
-// boolean result = cacheFile.delete();\r
-// logger.log(Level.INFO, "purge unused cache: " + cacheFile\r
-// + "/succeeded=" + result);\r
-// }\r
-//\r
-// } catch (Exception ex) {\r
-// logger.log(Level.WARNING, "remove file failed. " + cacheFile, ex);\r
-// }\r
-// }\r
-// }\r
-// }\r
-// }\r
+               } catch (Exception ex) {\r
+                       logger.log(Level.WARNING, FILENAME + " convert failed.", ex);\r
+               }\r
+       }\r
+}\r
 \r
 /**\r
  * 古いログファイルを消去する.\r
index f9365c1..085cad0 100644 (file)
@@ -1,6 +1,7 @@
 package charactermanaj.ui;\r
 \r
-import static java.lang.Math.*;\r
+import static java.lang.Math.max;\r
+import static java.lang.Math.min;\r
 \r
 import java.awt.BorderLayout;\r
 import java.awt.Color;\r
@@ -22,8 +23,10 @@ import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;\r
 import java.io.File;\r
 import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.io.OutputStream;\r
 import java.lang.reflect.InvocationTargetException;\r
+import java.net.URI;\r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r
@@ -67,6 +70,7 @@ import charactermanaj.graphics.io.UkagakaImageSaveHelper;
 import charactermanaj.model.AppConfig;\r
 import charactermanaj.model.CharacterData;\r
 import charactermanaj.model.ColorGroup;\r
+import charactermanaj.model.IndependentPartsSetInfo;\r
 import charactermanaj.model.PartsCategory;\r
 import charactermanaj.model.PartsColorInfo;\r
 import charactermanaj.model.PartsColorManager;\r
@@ -74,12 +78,14 @@ import charactermanaj.model.PartsIdentifier;
 import charactermanaj.model.PartsSet;\r
 import charactermanaj.model.RecommendationURL;\r
 import charactermanaj.model.WorkingSet;\r
+import charactermanaj.model.WorkingSet2;\r
 import charactermanaj.model.io.CharacterDataPersistent;\r
 import charactermanaj.model.io.PartsImageDirectoryWatchAgent;\r
 import charactermanaj.model.io.PartsImageDirectoryWatchAgentFactory;\r
 import charactermanaj.model.io.PartsImageDirectoryWatchEvent;\r
 import charactermanaj.model.io.PartsImageDirectoryWatchListener;\r
 import charactermanaj.model.io.RecentDataPersistent;\r
+import charactermanaj.model.io.WorkingSetXMLReader;\r
 import charactermanaj.model.io.WorkingSetXMLWriter;\r
 import charactermanaj.ui.ImageSelectPanel.ImageSelectPanelEvent;\r
 import charactermanaj.ui.ImageSelectPanel.ImageSelectPanelListener;\r
@@ -108,7 +114,7 @@ import charactermanaj.util.UserDataFactory;
 /**\r
  * メインフレーム.<br>\r
  * アプリケーションがアクティブである場合は最低でも1つのメインフレームが表示されている.<br>\r
- *\r
+ * \r
  * @author seraphy\r
  */\r
 public class MainFrame extends JFrame {\r
@@ -122,6 +128,7 @@ public class MainFrame extends JFrame {
 \r
        protected static final String MENU_STRINGS_RESOURCE = "menu/menu";\r
 \r
+       public static final String WORKINGSET_FILE_SUFFIX = "workingset.xml";\r
 \r
        /**\r
         * メインフレームのアイコン.<br>\r
@@ -235,7 +242,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * アクティブなメインフレームを設定する.\r
-        *\r
+        * \r
         * @param mainFrame\r
         *            メインフレーム\r
         */\r
@@ -249,7 +256,7 @@ public class MainFrame extends JFrame {
        /**\r
         * 現在アクティブなメインフレームを取得する. まだメインフレームが開かれていない場合はnull.<br>\r
         * 最後のメインフレームが破棄中、もしくは破棄済みであれば破棄されたフレームを示すことに注意.<br>\r
-        *\r
+        * \r
         * @return メインフレーム、もしくはnull\r
         */\r
        public static MainFrame getActivedMainFrame() {\r
@@ -258,7 +265,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * インポートされパーツが増減した可能性がある場合に呼び出される.\r
-        *\r
+        * \r
         * @param cd\r
         *            対象\r
         * @param newCd\r
@@ -325,7 +332,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * キャラクターデータが変更されたことを通知される.<br>\r
-        *\r
+        * \r
         * @param cd\r
         *            キャラクターデータ(変更前)\r
         * @param newCd\r
@@ -412,7 +419,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * お気に入りデータが変更されたことを通知される.\r
-        *\r
+        * \r
         * @param cd\r
         *            キャラクターデータ\r
         */\r
@@ -441,7 +448,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * メインフレームを構築する.\r
-        *\r
+        * \r
         * @param characterData\r
         *            キャラクターデータ\r
         */\r
@@ -885,7 +892,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * 指定したパーツカテゴリ以外のパーツ選択パネルを最小化する.\r
-        *\r
+        * \r
         * @param partsCategory\r
         *            パーツカテゴリ、nullの場合は全て最小化する.\r
         * @param dblClick\r
@@ -932,7 +939,7 @@ public class MainFrame extends JFrame {
         * デフォルトパーツがなければお気に入りの最初のものを選択する.<br>\r
         * それもなければ空として表示する.<br>\r
         * パーツの適用に失敗した場合はfalseを返します.(例外は返されません.)<br>\r
-        *\r
+        * \r
         * @param force\r
         *            すでに選択があっても選択しなおす場合はtrue、falseの場合は選択があれば何もしない.\r
         * @return パーツ選択された場合。force=trueの場合はエラーがなければ常にtrueとなります。\r
@@ -982,7 +989,7 @@ public class MainFrame extends JFrame {
        /**\r
         * プリセットを適用しキャラクターイメージを再構築します.<br>\r
         * 実行時エラーは画面のレポートされます.<br>\r
-        *\r
+        * \r
         * @param presetParts\r
         *            パーツセット, nullの場合は何もしない.\r
         */\r
@@ -1007,7 +1014,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * プリセットとお気に入りを表示順に並べて返す.\r
-        *\r
+        * \r
         * @return プリセットとお気に入りのリスト(表示順)\r
         */\r
        protected List<PartsSet> getPartsSetList() {\r
@@ -1030,7 +1037,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * お気に入りメニューが開いたとき\r
-        *\r
+        * \r
         * @param menu\r
         */\r
        protected void onSelectedFavoriteMenu(JMenu menu) {\r
@@ -1075,7 +1082,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * ヘルプメニューを開いたときにお勧めメニューを構築する.\r
-        *\r
+        * \r
         * @param menu\r
         */\r
        protected void onSelectedRecommendationMenu(JMenu mnuRecomendation) {\r
@@ -1114,7 +1121,7 @@ public class MainFrame extends JFrame {
         * 最後に選択されたお気に入りと同じ構成であれば、 このお気に入りの名前をプレビューペインのタイトルに設定する.<br>\r
         * そうでなければデフォルトのパーツセット名(no titleとか)を表示する.<br>\r
         * 色情報が異なる場合に末尾に「*」マークがつけられる.<br>\r
-        *\r
+        * \r
         * @param requestPartsSet\r
         *            表示するパーツセット(名前は設定されていなくて良い。お気に入り側を使うので。), nullの場合はデフォルトのパーツ名\r
         */\r
@@ -1130,7 +1137,7 @@ public class MainFrame extends JFrame {
         * パーツセット名を推定する.<br>\r
         * 最後に選択されたお気に入りと同じ構成であれば、 このお気に入りの名前を返す.<br>\r
         * お気に入りが選択されていないか構成が異なる場合、お気に入りに名前がない場合はnullを返す.<br>\r
-        *\r
+        * \r
         * @param requestPartsSet\r
         *            表示するパーツセット(名前は設定されていなくて良い。お気に入り側を使うので。)\r
         * @param markColorChange\r
@@ -1314,7 +1321,7 @@ public class MainFrame extends JFrame {
        /**\r
         * 背景色のみ変更し、背景を再描画する.<br>\r
         * 壁紙情報全体の更新よりも効率化するためのメソッドである.<br>\r
-        *\r
+        * \r
         * @param bgColor\r
         *            背景色\r
         */\r
@@ -1327,7 +1334,7 @@ public class MainFrame extends JFrame {
        /**\r
         * 壁紙情報を保存し、その情報をもとに背景を再描画する.<br>\r
         * ignoreErrorがtrueである場合、適用に失敗した場合はログに記録するのみで、 壁紙情報は保存されず、壁紙も更新されない.<br>\r
-        *\r
+        * \r
         * @param wallpaperInfo\r
         *            壁紙情報、null不可\r
         * @param ignoreError\r
@@ -1557,7 +1564,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * クリップボードにコピー\r
-        *\r
+        * \r
         * @param screenImage\r
         *            スクリーンイメージ\r
         */\r
@@ -1630,7 +1637,7 @@ public class MainFrame extends JFrame {
         * 現在のプロファイルに対するインポートウィザードを実行する.<br>\r
         * インポートが実行された場合は、パーツをリロードする.<br>\r
         * インポートウィザード表示中は監視スレッドは停止される.<br>\r
-        *\r
+        * \r
         * @param initFile\r
         *            アーカイブファィルまたはディレクトリ、指定がなければnull\r
         */\r
@@ -1667,7 +1674,7 @@ public class MainFrame extends JFrame {
         * まだロードされていない場合はあらたにロードする.<br>\r
         * 引数newCdが指定されている場合は、現在のキャラクター定義の説明文を更新する.<br>\r
         * (説明文の更新以外には使用されない.)<br>\r
-        *\r
+        * \r
         * @param newCd\r
         *            説明文更新のための更新されたキャラクターデータを指定する。null可\r
         * @param forceRepaint\r
@@ -1813,36 +1820,6 @@ public class MainFrame extends JFrame {
        }\r
 \r
        /**\r
-        * 画面の作業状態を保存するユーザーデータを取得する.\r
-        *\r
-        * @param modeRead\r
-        *            読み込みモード\r
-        * @return ユーザーデータ\r
-        */\r
-       protected UserData getWorkingSetUserData(boolean modeRead) {\r
-               return getWorkingSetUserData(characterData, modeRead);\r
-       }\r
-\r
-       /**\r
-        * 画面の作業状態を保存するユーザーデータを取得する.<br>\r
-        * キャラクターデータがnullまたは有効でない場合はnullを返す.<br>\r
-        *\r
-        * @param cd\r
-        *            キャラクターデータ\r
-        * @param modeRead\r
-        *            読み込みモード\r
-        * @return 作業状態を保存するユーザーデータ、もしくはnull\r
-        */\r
-       public static UserData getWorkingSetUserData(CharacterData cd, boolean modeRead) {\r
-               if (cd == null || !cd.isValid()) {\r
-                       return null;\r
-               }\r
-\r
-               UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-               return userDataFactory.getMangledNamedUserData(cd.getDocBase(), "workingset.ser");\r
-       }\r
-\r
-       /**\r
         * 画面の作業状態を保存する.\r
         */\r
        protected void saveWorkingSet() {\r
@@ -1850,12 +1827,14 @@ public class MainFrame extends JFrame {
                        return;\r
                }\r
                try {\r
+                       // ワーキングセットの作成\r
                        WorkingSet workingSet = new WorkingSet();\r
                        workingSet.setCharacterDocBase(characterData.getDocBase());\r
                        workingSet.setCharacterDataRev(characterData.getRev());\r
                        PartsSet partsSet = partsSelectionManager.createPartsSet();\r
                        workingSet.setPartsSet(partsSet);\r
-                       workingSet.setPartsColorInfoMap(characterData.getPartsColorManager().getPartsColorInfoMap());\r
+                       workingSet.setPartsColorInfoMap(characterData\r
+                                       .getPartsColorManager().getPartsColorInfoMap());\r
                        workingSet.setLastUsedSaveDir(imageSaveHelper.getLastUsedSaveDir());\r
                        workingSet.setLastUsedExportDir(ExportWizardDialog.getLastUsedDir());\r
                        workingSet.setLastUsePresetParts(lastUsePresetParts);\r
@@ -1863,13 +1842,11 @@ public class MainFrame extends JFrame {
                                        .setCharacterData(characterData.duplicateBasicInfo(false)); // パーツセットは保存しない.\r
                        workingSet.setWallpaperInfo(wallpaperInfo);\r
 \r
-                       UserData workingSetStore = getWorkingSetUserData(false);\r
-                       workingSetStore.save(workingSet);\r
-\r
                        // XML形式でのワーキングセットの保存\r
                        UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
-                       UserData xmlData = userDataFactory.getMangledNamedUserData(characterData.getDocBase(), "workingset.xml");\r
-                       OutputStream outstm = xmlData.getOutputStream();\r
+                       UserData workingSetXmlData = userDataFactory.getMangledNamedUserData(\r
+                                       characterData.getDocBase(), WORKINGSET_FILE_SUFFIX);\r
+                       OutputStream outstm = workingSetXmlData.getOutputStream();\r
                        try {\r
                                WorkingSetXMLWriter workingSetXmlWriter = new WorkingSetXMLWriter();\r
                                workingSetXmlWriter.writeWorkingSet(workingSet, outstm);\r
@@ -1884,7 +1861,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * 画面の作業状態を復元する.\r
-        *\r
+        * \r
         * @return\r
         */\r
        protected boolean loadWorkingSet() {\r
@@ -1892,72 +1869,79 @@ public class MainFrame extends JFrame {
                        return false;\r
                }\r
                try {\r
-                       UserData workingSetStore = getWorkingSetUserData(true);\r
-                       if (workingSetStore != null && workingSetStore.exists()) {\r
-                               WorkingSet workingSet = (WorkingSet) workingSetStore.load();\r
-                               if (!characterData.getDocBase().equals(workingSet.getCharacterDocBase())) {\r
-                                       // ワーキングセットのキャラクターデータとキャラクターデータを定義しているDocBaseが異なる場合はワーキングセットを無視する\r
-                                       logger.info("workingset data mismatch:" + characterData);\r
-                                       return false;\r
-                               }\r
+                       // XML形式でのワーキングセットの復元\r
+                       UserDataFactory userDataFactory = UserDataFactory.getInstance();\r
+                       UserData workingSetXmlData = userDataFactory.getMangledNamedUserData(\r
+                                       characterData.getDocBase(), WORKINGSET_FILE_SUFFIX);\r
+                       if (workingSetXmlData == null || !workingSetXmlData.exists()) {\r
+                               // 保存されていない場合\r
+                               return false;\r
+                       }\r
+                       WorkingSet2 workingSet2;\r
 \r
-                               CharacterData workingCd = workingSet.getCharacterData();\r
-                               if (workingCd == null) {\r
-                                       // ワーキングセットにキャラクターデータが設定されていない場合はREVで比較する.(ver0.96以前旧シリアライズデータ互換用)\r
-                                       String docRev = characterData.getRev();\r
-                                       String workRev = workingSet.getCharacterDataRev();\r
-                                       if (docRev == null || workRev == null || !docRev.equals(workRev)) {\r
-                                               // ワーキングセットが保存されてからrevisionが変更されていれば無視する.\r
-                                               logger.info("workingset revision mismatch: actual=" + characterData + "/workingSet=" + workingSet);\r
-                                               return false;\r
-                                       }\r
+                       InputStream is = workingSetXmlData.openStream();\r
+                       try {\r
+                               WorkingSetXMLReader WorkingSetXMLReader = new WorkingSetXMLReader();\r
+                               workingSet2 = WorkingSetXMLReader.loadWorkingSet(is);\r
 \r
-                               } else if ( !workingCd.isUpperCompatibleStructure(characterData)) {\r
-                                       // ワーキングセットにキャラクターデータが設定されており、且つ、構造が一致しない場合は無視する.(ver0.96以降)\r
-                                       logger.info("workingset cd-structure mismatch: actual=" + characterData + "/workingSet=" + workingSet);\r
-                                       return false;\r
-                               }\r
+                       } finally {\r
+                               is.close();\r
+                       }\r
 \r
-                               // 現在のパーツ色情報にワーキングセットで保存した内容を設定する.\r
-                               Map<PartsIdentifier, PartsColorInfo> partsColorInfoMap = characterData.getPartsColorManager().getPartsColorInfoMap();\r
-                               Map<PartsIdentifier, PartsColorInfo> workingPartsColorInfoMap = workingSet.getPartsColorInfoMap();\r
-                               if (workingPartsColorInfoMap != null) {\r
-                                       for (Map.Entry<PartsIdentifier, PartsColorInfo> entry : workingPartsColorInfoMap.entrySet()) {\r
-                                               PartsIdentifier partsIdentifier = entry.getKey();\r
-                                               PartsColorInfo partsColorInfo = entry.getValue();\r
-                                               partsColorInfoMap.put(partsIdentifier, partsColorInfo);\r
-                                       }\r
-                               }\r
+                       URI docBase = characterData.getDocBase();\r
+                       if (docBase != null\r
+                                       && !docBase.equals(workingSet2.getCharacterDocBase())) {\r
+                               // docBaseが一致せず\r
+                               return false;\r
+                       }\r
+                       String sig = characterData.toSignatureString();\r
+                       if (!sig.equals(workingSet2.getCharacterDataSig())) {\r
+                               // 構造が一致せず.\r
+                               return false;\r
+                       }\r
+\r
+                       // パーツの色情報を復元する.\r
+                       Map<PartsIdentifier, PartsColorInfo> partsColorInfoMap = characterData\r
+                                       .getPartsColorManager().getPartsColorInfoMap();\r
+                       workingSet2.createCompatible(characterData, partsColorInfoMap);\r
 \r
-                               // 選択されているパーツの復元\r
-                               PartsSet partsSet = workingSet.getPartsSet();\r
-                               if (partsSet != null) {\r
-                                       partsSet = partsSet.createCompatible(characterData);\r
-                                       selectPresetParts(partsSet);\r
+                       // 選択されているパーツの復元\r
+                       IndependentPartsSetInfo partsSetInfo = workingSet2\r
+                                       .getCurrentPartsSet();\r
+                       if (partsSetInfo != null) {\r
+                               PartsSet partsSet = IndependentPartsSetInfo.convertPartsSet(\r
+                                               partsSetInfo, characterData, false);\r
+                               selectPresetParts(partsSet);\r
 \r
-                                       // 最後に選択したお気に入り情報の復元\r
-                                       PartsSet lastUsePresetParts = workingSet.getLastUsePresetParts();\r
-                                       if (lastUsePresetParts != null && lastUsePresetParts.hasName()\r
-                                                       && lastUsePresetParts.isSameStructure(partsSet)) {\r
+                               // 最後に選択したお気に入り情報の復元\r
+                               IndependentPartsSetInfo lastUsePresetPartsInfo = workingSet2\r
+                                               .getLastUsePresetParts();\r
+                               if (lastUsePresetPartsInfo != null\r
+                                               && lastUsePresetPartsInfo.getId() != null\r
+                                               && lastUsePresetPartsInfo.getId().trim().length() > 0) {\r
+                                       PartsSet lastUsePresetParts = IndependentPartsSetInfo\r
+                                                       .convertPartsSet(lastUsePresetPartsInfo,\r
+                                                                       characterData, false);\r
+                                       if (lastUsePresetParts.isSameStructure(partsSet)) {\r
                                                this.lastUsePresetParts = lastUsePresetParts;\r
                                                showPresetName(lastUsePresetParts);\r
                                        }\r
                                }\r
+                       }\r
 \r
-                               // 最後に保存したディレクトリを復元する.\r
-                               imageSaveHelper.setLastUseSaveDir(workingSet.getLastUsedSaveDir());\r
-                               ExportWizardDialog.setLastUsedDir(workingSet.getLastUsedExportDir());\r
-\r
-                               // 壁紙情報を取得する.\r
-                               WallpaperInfo wallpaperInfo = workingSet.getWallpaperInfo();\r
-                               if (wallpaperInfo != null) {\r
-                                       // 壁紙情報を保存し、その情報をもとに背景を再描画する.\r
-                                       // (適用に失敗した場合はエラーは無視し、壁紙情報は保存しない.)\r
-                                       applyWallpaperInfo(wallpaperInfo, true);\r
-                               }\r
+                       // 最後に保存したディレクトリを復元する.\r
+                       imageSaveHelper.setLastUseSaveDir(workingSet2.getLastUsedSaveDir());\r
+                       ExportWizardDialog.setLastUsedDir(workingSet2\r
+                                       .getLastUsedExportDir());\r
 \r
-                               return true;\r
+                       // 壁紙情報を取得する.\r
+                       WallpaperInfo wallpaperInfo = workingSet2.getWallpaperInfo();\r
+                       if (wallpaperInfo != null) {\r
+                               // 壁紙情報を保存し、その情報をもとに背景を再描画する.\r
+                               // (適用に失敗した場合はエラーは無視し、壁紙情報は保存しない.)\r
+                               applyWallpaperInfo(wallpaperInfo, true);\r
                        }\r
+                       return true;\r
 \r
                } catch (Exception ex) {\r
                        ErrorMessageHelper.showErrorDialog(this, ex);\r
@@ -2216,7 +2200,7 @@ public class MainFrame extends JFrame {
 \r
        /**\r
         * メニューバーを構築します.\r
-        *\r
+        * \r
         * @return メニューバー\r
         */\r
        protected JMenuBar createMenuBar() {\r