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

更新日時:

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

更新者:

h

ログメッセージ:

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

パス:

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

ファイル:

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

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

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.SPLITCOMMA;
-import static org.rayflood.mikuvat.io.VSQDecoder.adjustMaxMin;
-import static org.rayflood.mikuvat.io.VSQDecoder.getBigDecimalString;
-import static org.rayflood.mikuvat.io.VSQDecoder.getVibratoBPList;
-import static org.rayflood.mikuvat.io.VSQDecoder.getVibratoBPMap;
-import static org.rayflood.mikuvat.io.VSQDecoder.splitEqual;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.Utilities.SPLITCOMMA;
+import static org.rayflood.mikuvat.Utilities.adjustMaxMin;
+import static org.rayflood.mikuvat.Utilities.getBigDecimalString;
+import static org.rayflood.mikuvat.Utilities.getVibratoBPList;
+import static org.rayflood.mikuvat.Utilities.getVibratoBPMap;
+import static org.rayflood.mikuvat.Utilities.splitEqual;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -14 +16 @@
 import java.util.TreeMap;
 
-public class VibratoHandle extends ImmutableObject{
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
+
+public class VibratoHandle extends BaseObject{
         private static final long serialVersionUID = 7575294004927556748L;
         public static final String ICONID = "IconID";
@@ -208 +213 @@
                         TreeMap<BigDecimal, Integer> bps = getDepthBP();
                         BigDecimal xs[] = bps.keySet().toArray(new BigDecimal[0]);
-                        StringBuffer xsb = new StringBuffer();
-                        StringBuffer ysb = new StringBuffer();
+                        StringBuilder xsb = new StringBuilder();
+                        StringBuilder ysb = new StringBuilder();
                         xsb.append(getBigDecimalString(xs[0]));
                         ysb.append(bps.get(xs[0]));
@@ -224 +229 @@
                         TreeMap<BigDecimal, Integer> bps = getRateBP();
                         BigDecimal xs[] = bps.keySet().toArray(new BigDecimal[0]);
-                        StringBuffer xsb = new StringBuffer();
-                        StringBuffer ysb = new StringBuffer();
+                        StringBuilder xsb = new StringBuilder();
+                        StringBuilder ysb = new StringBuilder();
                         xsb.append(getBigDecimalString(xs[0]));
                         ysb.append(bps.get(xs[0]));
@@ -284 +289 @@
                         TreeMap<BigDecimal, Integer> bps = getDepthBP();
                         BigDecimal xs[] = bps.keySet().toArray(new BigDecimal[0]);
-                        StringBuffer xsb = new StringBuffer();
-                        StringBuffer ysb = new StringBuffer();
+                        StringBuilder xsb = new StringBuilder();
+                        StringBuilder ysb = new StringBuilder();
                         xsb.append(getBigDecimalString(xs[0]));
                         ysb.append(bps.get(xs[0]));
@@ -304 +309 @@
                         TreeMap<BigDecimal, Integer> bps = getRateBP();
                         BigDecimal xs[] = bps.keySet().toArray(new BigDecimal[0]);
-                        StringBuffer xsb = new StringBuffer();
-                        StringBuffer ysb = new StringBuffer();
+                        StringBuilder xsb = new StringBuilder();
+                        StringBuilder ysb = new StringBuilder();
                         xsb.append(getBigDecimalString(xs[0]));
                         ysb.append(bps.get(xs[0]));
@@ -316 +321 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("VibratoHandle={");
                 if(!sl.isEmpty()){
@@ -328 +333 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
                 ready &= hasIconID();
@@ -342 +347 @@
                 ready &= hasRateBPNum();
                 ready &= (getRateBPNum() == getRateBP().size());
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
+                }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 VibratoHandle vibratoHandle = (VibratoHandle)obj;
                 int c = compare(getIconID(), vibratoHandle.getIconID());
@@ -354 +362 @@
         }
 
-        public VibratoHandle over(Object obj, boolean fill, boolean has){
+        public VibratoHandle over(BaseObject obj, boolean fill, boolean has){
                 VibratoHandle vibratoHandle = ((VibratoHandle)obj).clone();
                 if(vibratoHandle.hasIconID() && (fill || has == hasIconID())){
@@ -717 +725 @@
         }
 
-        public static VibratoHandle load(String file) throws Exception{
-                return (VibratoHandle)ImmutableObject.load(file);
-        }
-
-        public static VibratoHandle load(File file) throws Exception{
-                return (VibratoHandle)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static VibratoHandle load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (VibratoHandle)BaseObject.load(file);
+        }
+
+        public static VibratoHandle load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (VibratoHandle)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 VibratoHandle unzip(String file) throws Exception{
-                return (VibratoHandle)ImmutableObject.unzip(file);
-        }
-
-        public static VibratoHandle unzip(File file) throws Exception{
-                return (VibratoHandle)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static VibratoHandle unzip(String file) throws IOException, ClassNotFoundException{
+                return (VibratoHandle)BaseObject.unzip(file);
+        }
+
+        public static VibratoHandle unzip(File file) throws IOException, ClassNotFoundException{
+                return (VibratoHandle)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);
         }