チェンジセット 4 : trunk/src/org/rayflood/mikuvat/io/vsq/IconHandle.java

更新日時:

2010/05/11 20:15:55 (2 年 前)

更新者:

h

ログメッセージ:

refs #2 #8 #9 #7 #6
現状のソースをコミット。一部完了。一部未完了。
関連づいてない完了チケットのチェンジセットもまとめて。
パッケージ階層も大幅に変更。

パス:

trunk/src/org/rayflood/mikuvat/io/vsq

ファイル:

• . (追加)
• IconHandle.java (移動) (移動元: trunk/src/org/rayflood/mikuvat/io/IconHandle.java) (5 diff)

trunk/src/org/rayflood/mikuvat/io/vsq/IconHandle.java

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.splitEqual;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.Utilities.splitEqual;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class IconHandle extends ImmutableObject{
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
+
+public class IconHandle extends BaseObject{
         private static final long serialVersionUID = 6787028875195143543L;
         public static final String ICONID = "IconID";
@@ -93 +98 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("IconHandle={");
                 if(!sl.isEmpty()){
@@ -105 +110 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
                 ready &= hasIconID();
@@ -114 +119 @@
                 ready &= hasLanguage();
                 ready &= hasProgram();
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
+                }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 IconHandle iconHandle = (IconHandle)obj;
                 return compare(getIconID(), iconHandle.getIconID());
         }
 
-        public IconHandle over(Object obj, boolean fill, boolean has){
+        public IconHandle over(BaseObject obj, boolean fill, boolean has){
                 IconHandle iconHandle = ((IconHandle)obj).clone();
                 if(iconHandle.hasIconID() && (fill || has == hasIconID())){
@@ -340 +348 @@
         }
 
-        public static IconHandle load(String file) throws Exception{
-                return (IconHandle)ImmutableObject.load(file);
-        }
-
-        public static IconHandle load(File file) throws Exception{
-                return (IconHandle)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static IconHandle load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (IconHandle)BaseObject.load(file);
+        }
+
+        public static IconHandle load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (IconHandle)BaseObject.load(file);
+        }
+
+        public void store(String file) throws FileNotFoundException, IOException{
                 super.store(file);
         }
 
-        public void store(File file) throws Exception{
+        public void store(File file) throws FileNotFoundException, IOException{
                 super.store(file);
         }
 
-        public static IconHandle unzip(String file) throws Exception{
-                return (IconHandle)ImmutableObject.unzip(file);
-        }
-
-        public static IconHandle unzip(File file) throws Exception{
-                return (IconHandle)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static IconHandle unzip(String file) throws IOException, ClassNotFoundException{
+                return (IconHandle)BaseObject.unzip(file);
+        }
+
+        public static IconHandle unzip(File file) throws IOException, ClassNotFoundException{
+                return (IconHandle)BaseObject.unzip(file);
+        }
+
+        public void zip(String file) throws IOException{
                 super.zip(file);
         }
 
-        public void zip(File file) throws Exception{
+        public void zip(File file) throws IOException{
                 super.zip(file);
         }