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

更新日時:

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

更新者:

h

ログメッセージ:

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

パス:

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

ファイル:

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

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

@@ -1 @@
-package org.rayflood.mikuvat.io;
-
-import static org.rayflood.mikuvat.io.VSQDecoder.WIN31J;
-import static org.rayflood.mikuvat.io.VSQFile.COMMON;
+package org.rayflood.mikuvat.io.vsq;
+
+import static org.rayflood.mikuvat.io.vsq.VSQFile.COMMON;
 
 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 javax.sound.midi.MetaMessage;
-import javax.sound.midi.MidiEvent;
-
-public class VSQTrack extends ImmutableObject{
+import org.rayflood.mikuvat.io.BaseObject;
+import org.rayflood.mikuvat.io.InvalidBaseObjectException;
+
+public class VSQTrack extends BaseObject{
         private static final long serialVersionUID = 6296614810415852578L;
-        private String trackName;
         private CommonSection common;
         private MixerSetting mixer;
         private TimeLine timeLine;
 
-        public VSQTrack(MidiEvent trackName, MixerSetting mixer, Map<String, List<String>> sections){
+        public VSQTrack(MixerSetting mixer, Map<String, List<String>> sections){
                 this();
-                setTrack(trackName, mixer, sections);
-        }
-
-        public VSQTrack(String trackName, MixerSetting mixer, Map<String, List<String>> sections){
-                this();
-                setTrack(trackName, mixer, sections);
+                setTrack(mixer, sections);
         }
 
@@ -34 +29 @@
         }
 
-        public void setTrack(MidiEvent trackName, MixerSetting mixer, Map<String, List<String>> sections){
+        public void setTrack(MixerSetting mixer, Map<String, List<String>> sections){
                 setMixer(mixer);
                 setTrack(sections);
-                setTrackName(trackName);
-        }
-
-        public void setTrack(String trackName, MixerSetting mixer, Map<String, List<String>> sections){
-                setMixer(mixer);
-                setTrack(sections);
-                setTrackName(trackName);
         }
 
@@ -53 +41 @@
         public String toString(){
                 List<String> sl = new ArrayList<String>();
-                if(hasTrackName()){
-                        sl.add("TrackName=" + getTrackName());
-                }
                 if(hasCommon()){
                         sl.add("Common={" + getCommon().toString() + "}");
@@ -66 +51 @@
                 }
 
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("VSQTrack={");
                 if(!sl.isEmpty()){
@@ -78 +63 @@
         }
 
-        public boolean isReadied(){
+        public boolean validate() throws InvalidBaseObjectException{
                 boolean ready = true;
-                ready &= hasTrackName();
-                ready &= hasCommon() && getCommon().isReadied();
-                ready &= hasMixer() && getMixer().isReadied();
-                ready &= hasTimeLine() && getTimeLine().isReadied();
+                ready &= hasCommon() && getCommon().validate();
+                ready &= hasMixer() && getMixer().validate();
+                ready &= hasTimeLine() && getTimeLine().validate();
+                if(!ready){
+                        throw new InvalidBaseObjectException(this);
+                }
                 return ready;
         }
 
-        public int compareTo(ImmutableObject obj){
+        public int compareTo(BaseObject obj){
                 VSQTrack vsqTrack = (VSQTrack)obj;
-                return compare(this.getTrackName(), vsqTrack.getTrackName());
-        }
-
-        public VSQTrack over(Object obj, boolean fill, boolean has){
+                return compare(getCommon().getName(), vsqTrack.getCommon().getName());
+        }
+
+        public VSQTrack over(BaseObject obj, boolean fill, boolean has){
                 VSQTrack vsqTrack = ((VSQTrack)obj).clone();
                 if(vsqTrack.hasCommon()){
@@ -105 +92 @@
                         TimeLine timeLine = hasTimeLine() ? getTimeLine() : new TimeLine();
                         setTimeLine(timeLine.over(vsqTrack.getTimeLine(), fill, has));
-                }
-                if(vsqTrack.hasTrackName() && (fill || has == hasTrackName())){
-                        setTrackName(vsqTrack.getTrackName());
                 }
                 return this;
@@ -126 +110 @@
 
         public VSQTrack delete(){
-                deleteTrackName();
                 deleteCommon();
                 deleteMixer();
@@ -135 +118 @@
         public boolean isDeleted(){
                 boolean has = false;
-                has |= hasTrackName();
                 has |= hasCommon();
                 has |= hasMixer();
@@ -146 +128 @@
         }
 
-        public String getTrackName(){
-                return trackName;
-        }
-
-        public MidiEvent getTrackNameME() throws Exception{
-                byte mb[] = getTrackName().getBytes(WIN31J);
-                MetaMessage mm = new MetaMessage();
-                mm.setMessage(1, mb, mb.length);
-                return new MidiEvent(mm, 0);
-        }
-
-        public void setTrackName(String trackName){
-                this.trackName = trackName;
-        }
-
-        public void setTrackName(MidiEvent trackName){
-                MetaMessage mm = (MetaMessage)trackName.getMessage();
-                setTrackName(new String(mm.getData(), WIN31J));
-        }
-
-        public void deleteTrackName(){
-                trackName = null;
-        }
-
-        public boolean hasTrackName(){
-                return trackName != null;
-        }
-
         public CommonSection getCommon(){
                 return common;
@@ -184 +138 @@
                 }
                 this.common = common;
-                setTrackName(common.getName());
         }
 
@@ -239 +192 @@
         }
 
-        public static VSQTrack load(String file) throws Exception{
-                return (VSQTrack)ImmutableObject.load(file);
-        }
-
-        public static VSQTrack load(File file) throws Exception{
-                return (VSQTrack)ImmutableObject.load(file);
-        }
-
-        public void store(String file) throws Exception{
+        public static VSQTrack load(String file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (VSQTrack)BaseObject.load(file);
+        }
+
+        public static VSQTrack load(File file) throws FileNotFoundException, IOException, ClassNotFoundException{
+                return (VSQTrack)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 VSQTrack unzip(String file) throws Exception{
-                return (VSQTrack)ImmutableObject.unzip(file);
-        }
-
-        public static VSQTrack unzip(File file) throws Exception{
-                return (VSQTrack)ImmutableObject.unzip(file);
-        }
-
-        public void zip(String file) throws Exception{
+        public static VSQTrack unzip(String file) throws IOException, ClassNotFoundException{
+                return (VSQTrack)BaseObject.unzip(file);
+        }
+
+        public static VSQTrack unzip(File file) throws IOException, ClassNotFoundException{
+                return (VSQTrack)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);
         }