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

更新日時:

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

更新者:

h

ログメッセージ:

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

パス:

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

ファイル:

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

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

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.SPLITCOMMA;
-import static org.rayflood.mikuvat.io.VSQDecoder.SPLITDQUOTE;
-import static org.rayflood.mikuvat.io.VSQDecoder.adjustMaxMin;
-import static org.rayflood.mikuvat.io.VSQDecoder.getBigDecimalString;
-import static org.rayflood.mikuvat.io.VSQDecoder.getBooleanValue;
-import static org.rayflood.mikuvat.io.VSQDecoder.getStringValue;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.Utilities.SPLITCOMMA;
+import static org.rayflood.mikuvat.Utilities.SPLITDQUOTE;
+import static org.rayflood.mikuvat.Utilities.adjustMaxMin;
+import static org.rayflood.mikuvat.Utilities.getBigDecimalString;
+import static org.rayflood.mikuvat.Utilities.getBooleanValue;
+import static org.rayflood.mikuvat.Utilities.getStringValue;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-public class LyricNote extends ImmutableObject{
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
+
+public class LyricNote extends BaseObject{
         private static final long serialVersionUID = -119405351990339359L;
         public static final BigDecimal A_MAX = new BigDecimal("1.0");
@@ -78 +83 @@
                 }
                 if(hasB()){
-                        StringBuffer sb = new StringBuffer();
+                        StringBuilder sb = new StringBuilder();
                         sb.append(b[0]);
                         for(int i = 1; i < b.length; i++){
@@ -89 +94 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("LyricNote={");
                 if(!sl.isEmpty()){
@@ -101 +106 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
                 ready &= hasCaption();
@@ -108 +113 @@
                 ready &= hasB();
                 ready &= hasProtect();
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
+                }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 LyricNote lyricNote = (LyricNote)obj;
                 int c = compare(getCaption(), lyricNote.getCaption());
@@ -123 +131 @@
         }
 
-        public LyricNote over(Object obj, boolean fill, boolean has){
+        public LyricNote over(BaseObject obj, boolean fill, boolean has){
                 LyricNote lyricNote = ((LyricNote)obj).clone();
                 if(lyricNote.hasCaption() && (fill || has == hasCaption())){
@@ -281 +289 @@
         }
 
-        public static LyricNote load(String file) throws Exception{
-                return (LyricNote)ImmutableObject.load(file);
-        }
-
-        public static LyricNote load(File file) throws Exception{
-                return (LyricNote)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static LyricNote load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (LyricNote)BaseObject.load(file);
+        }
+
+        public static LyricNote load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (LyricNote)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 LyricNote unzip(String file) throws Exception{
-                return (LyricNote)ImmutableObject.unzip(file);
-        }
-
-        public static LyricNote unzip(File file) throws Exception{
-                return (LyricNote)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static LyricNote unzip(String file) throws IOException, ClassNotFoundException{
+                return (LyricNote)BaseObject.unzip(file);
+        }
+
+        public static LyricNote unzip(File file) throws IOException, ClassNotFoundException{
+                return (LyricNote)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);
         }