WebSVN - svn.mios - Diff - Rev 846 and 850 - /trunk/java/org/midibox/midi/SysexSendReceive.java

 package org.midibox.midi;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.util.LinkedList;
 import java.util.Observable;
 import javax.sound.midi.InvalidMidiDataException;
 import javax.sound.midi.SysexMessage;
 public class SysexSendReceive extends Observable implements Receiver {
     public final static Object WORKER = new Object();
+    public final static Object SEND_SYSEX_FILE = new Object();
+    public final static Object RECEIVE_SYSEX_FILE = new Object();
+    public final static Object SEND_DELAY_TIME = new Object();
+    public final static Object RECEIVED_BYTES = new Object();
     protected Receiver receiver;
     protected File sendFile;
     protected long sendFileLastModified;
     protected File receiveFile;
     protected SysexFile sysexFile;
-    protected SysexSendReceiveWorkerTask sysexSendReceiveWorkerTask;
     protected int sendBufferSize;
     protected int sendDelayTime;
     protected boolean receiveStopped = true;
     public SysexSendReceive(Receiver receiver) {
         super();
         this.receiver = receiver;
-        sendBufferSize = 100000; // TK: shouldn't be changed by user since Java doesn't allow to split SysEx streams properly
+        sendBufferSize = 100000; // TK: shouldn't be changed by user since Java
+                                    // doesn't allow to split SysEx streams
+                                    // properly
         sendDelayTime = 750; // delay between F0
         receivedBytes = new LinkedList();
+    }
     public File getSendFile() {
     public boolean sendFileChanged() {
         return sendFile.lastModified() != sendFileLastModified;
+    }
     public void setSendFile(File file) {
         this.sendFile = file;
         sendFileLastModified = sendFile.lastModified();
         readSysexFile();
         setChanged();
-        notifyObservers(sendFile);
+        notifyObservers(SEND_SYSEX_FILE);
         clearChanged();
+    }
     public void readSysexFile() {
         sysexFile = new SysexFile();
         if (!sysexFile.read(sendFile.getPath())) {
             // TODO
+        }
+    }
     public File getReceiveFile() {
         return receiveFile;
+    }
     public void setReceiveFile(File file) {
         this.receiveFile = file;
         setChanged();
-        notifyObservers(receiveFile);
+        notifyObservers(RECEIVE_SYSEX_FILE);
         clearChanged();
+    }
     public SysexFile getSysexFile() {
         return sysexFile;
+    }
     public int getSendDelayTime() {
         return sendDelayTime;
+    }
     public void setSendDelayTime(int sendDelayTime) {
         this.sendDelayTime = sendDelayTime;
+        setChanged();
+        notifyObservers(SEND_DELAY_TIME);
+        clearChanged();
+    }
     public LinkedList getReceivedBytes() {
         return receivedBytes;
+    }
     public void clearReceivedBytes() {
         receivedBytes.clear();
+    }
     public boolean writeSysexFile(File file, byte[] data, int dataLen) {
         // could also be located in SysexFile.java?
         try {
             return false;
+        }
         return true;
+    }
     public boolean isSendDone() {
         return sendDone;
+    }
+    }
-    public void setReceiveStopped(boolean receiveStopped ) {
+    public void setReceiveStopped(boolean receiveStopped) {
         this.receiveStopped = receiveStopped;
+    }
     public void close() {
+    }
     public void setReceiver(Receiver receiver) {
         this.receiver = receiver;
+    }
-    public class SysexSendReceiveWorkerTask extends Thread {
-        public void run() {
-        }
-    }
     public void send(MidiMessage message, long timestamp) {
         if (!isReceiveStopped()) {
             if (message instanceof SysexMessage) {
                 receivedBytes.add(((SysexMessage) message).getData());
                 setChanged();
-                notifyObservers(receivedBytes);
+                notifyObservers(RECEIVED_BYTES);
                 clearChanged();
+            }
+        }
+    }
-    /////////////////////////////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////////////////////////////
     // SysEx File Sender Functions
-    /////////////////////////////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////////////////////////////
     public void startSend(byte[] sysexData, int sysexDataLen) {
         int offset = 0;
         sendCancelled = false;
                 // update GUI
                 setChanged();
                 notifyObservers(WORKER);
                 clearChanged();
-                for(i=1; i<sendBufferSize && (i+offset)<sysexDataLen && sysexData[i+offset] != (byte)0xf0; ++i) {
+                for (i = 1; i < sendBufferSize && (i + offset) < sysexDataLen
+                        && sysexData[i + offset] != (byte) 0xf0; ++i) {
                     ++sendLen;
+                }
-                if( sendLen == 0 ) {
+                if (sendLen == 0) {
                     sendDone = true;

Subversion Repositories svn.mios

(root)/trunk/java/org/midibox/midi/SysexSendReceive.java - Rev 846 → 850