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

更新日時:

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

更新者:

h

ログメッセージ:

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

パス:

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

ファイル:

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

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

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.setSectionBracket;
-import static org.rayflood.mikuvat.io.VSQDecoder.splitEqual;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.Utilities.setSectionBracket;
+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;
@@ -10 +12 @@
 import java.util.TreeMap;
 
-public class TimeLine extends ImmutableObject{
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
+
+public class TimeLine extends BaseObject{
         private static final long serialVersionUID = -3486238291169847310L;
         public static final String PITCHBEND = "PitchBendBPList";
@@ -580 +585 @@
                 }
                 if(hasEventTimes()){
-                        StringBuffer sb = new StringBuffer();
+                        StringBuilder sb = new StringBuilder();
                         Long ticks[] = getTicks();
                         sb.append(ticks[0] + "={" + getEventBPTime(ticks[0]).toString() + "}");
@@ -589 +594 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("TimeLine={");
                 if(!sl.isEmpty()){
@@ -601 +606 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
-                ready &= hasInitialSinger() && getInitialSinger().isReadied();
+                ready &= hasInitialSinger() && getInitialSinger().validate();
                 Long ticks[] = getTicks();
                 for(int i = 0; i < ticks.length; i++){
-                        ready &= getEventBPTime(ticks[i]).isReadied();
+                        ready &= getEventBPTime(ticks[i]).validate();
+                }
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
                 }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 TimeLine timeLine = (TimeLine)obj;
                 return compare(getInitialSinger(), timeLine.getInitialSinger());
         }
 
-        public TimeLine over(Object obj, boolean fill, boolean has){
+        public TimeLine over(BaseObject obj, boolean fill, boolean has){
                 TimeLine timeLine = ((TimeLine)obj).clone();
                 if(timeLine.hasInitialSinger()){
@@ -872 +880 @@
         }
 
-        public static TimeLine load(String file) throws Exception{
-                return (TimeLine)ImmutableObject.load(file);
-        }
-
-        public static TimeLine load(File file) throws Exception{
-                return (TimeLine)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static TimeLine load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (TimeLine)BaseObject.load(file);
+        }
+
+        public static TimeLine load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (TimeLine)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 TimeLine unzip(String file) throws Exception{
-                return (TimeLine)ImmutableObject.unzip(file);
-        }
-
-        public static TimeLine unzip(File file) throws Exception{
-                return (TimeLine)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static TimeLine unzip(String file) throws IOException, ClassNotFoundException{
+                return (TimeLine)BaseObject.unzip(file);
+        }
+
+        public static TimeLine unzip(File file) throws IOException, ClassNotFoundException{
+                return (TimeLine)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);
         }