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

更新日時:

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

更新者:

h

ログメッセージ:

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

パス:

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

ファイル:

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

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

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.adjustMaxMin;
-import static org.rayflood.mikuvat.io.VSQDecoder.setSectionBracket;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.Utilities.adjustMaxMin;
+import static org.rayflood.mikuvat.Utilities.setSectionBracket;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
 
 public class AnoteEvent extends Event{
@@ -292 +297 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("AnoteEvent={");
                 if(!sl.isEmpty()){
@@ -304 +309 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
                 ready &= hasLength();
@@ -314 +319 @@
                 ready &= hasDecay();
                 ready &= hasAccent();
-                ready &= hasLyricHandle() && getLyricHandle().isReadied();
-                ready &= !hasVibratoHandle() || getVibratoHandle().isReadied();
+                ready &= hasLyricHandle() && getLyricHandle().validate();
+                ready &= !hasVibratoHandle() || getVibratoHandle().validate();
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
+                }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 AnoteEvent anoteEvent = (AnoteEvent)obj;
                 int c = compare(getLyricHandle(), anoteEvent.getLyricHandle());
@@ -331 +339 @@
         }
 
-        public AnoteEvent over(Object obj, boolean fill, boolean has){
+        public AnoteEvent over(BaseObject obj, boolean fill, boolean has){
                 AnoteEvent anoteEvent = ((AnoteEvent)obj).clone();
                 if(anoteEvent.hasLength() && (fill || has == hasLength())){
@@ -657 +665 @@
         }
 
-        public static AnoteEvent load(String file) throws Exception{
-                return (AnoteEvent)ImmutableObject.load(file);
-        }
-
-        public static AnoteEvent load(File file) throws Exception{
-                return (AnoteEvent)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static AnoteEvent load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (AnoteEvent)BaseObject.load(file);
+        }
+
+        public static AnoteEvent load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (AnoteEvent)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 AnoteEvent unzip(String file) throws Exception{
-                return (AnoteEvent)ImmutableObject.unzip(file);
-        }
-
-        public static AnoteEvent unzip(File file) throws Exception{
-                return (AnoteEvent)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static AnoteEvent unzip(String file) throws IOException, ClassNotFoundException{
+                return (AnoteEvent)BaseObject.unzip(file);
+        }
+
+        public static AnoteEvent unzip(File file) throws IOException, ClassNotFoundException{
+                return (AnoteEvent)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);
         }