Action verwerk systeem grotendeels herschreven met als doelen:

- duplicate code vermijden (Main en Application extenden de ActionListener)
- naamgeving duidelijker maken (oude ActionListener heet nu ActionProvider)
- omslachtige gedoe met via reflectie opvragen van methode fixen (switch statements)
- mogelijkheid tot langere dan instantane actions (ActionListener zijn threads)

Het is noodzakelijk om het volgende op orde te brengen:
- omslachtige target systeem
- statussen en logs om debuggen en controle eenvoudig te maken
- mogelijkheid tot repeterende acties

java/src/pm/application/Application.java

@@ -1,17 +0,0 @@
-package pm.application;
-
-import java.util.LinkedList;
-import java.util.Queue;
-
-import pm.Action;
-
-public abstract class Application { //WinampController.
-    Queue<Action> actionQueue;
-    
-    public Application() {
-        actionQueue = new LinkedList<Action>();
-    }
-
-    public void start() {}
-    public void exit() {}
-}

java/src/pm/application/Winamp/WinampApplication.java

@@ -1,102 +1,69 @@
 package pm.application.Winamp;
 
-import pm.application.Application;
+import pm.Action;
+import pm.Application;
+import pm.exception.ApplicationException;
+import pm.exception.application.ApplicationStartException;
 
 import com.qotsa.exception.InvalidHandle;
 import com.qotsa.exception.InvalidParameter;
 import com.qotsa.jni.controller.WinampController;
 
 public class WinampApplication extends Application {
-
-    protected boolean connected;
-    
     protected boolean muted;
     protected int volume;
 
-    public WinampApplication() {
-        connected = false;
-    }
-    
-    public void start() throws Exception {
-        if (!connected) {
+    public void start() throws ApplicationException {
+        try {
             WinampController.run();
-            connected = true;
+            volume = WinampController.getVolume();
+            muted = volume == 0;
+        } catch (Exception e) {
+            throw new ApplicationStartException();
         }
     }
 
-    public void exit() throws InvalidHandle {
-        if (connected) {
+    public void exit() {
+        try {
             WinampController.exit();
-            connected = false;
-        }
+        } catch (InvalidHandle e) {}
     }
 
-    /* Actions */
-    public void play() throws InvalidHandle {
-        if (connected) {
-            WinampController.play();
-        }
-    }
-
-    public void pause() throws InvalidHandle {
-        if (connected) {
-            WinampController.pause();
-        }
-    }
-
-    public void resume() throws InvalidHandle {
-        if (connected) {
-            WinampController.resume();
-        }
-    }
-
-    public void next() throws InvalidHandle {
-        if (connected) {
-            WinampController.nextTrack();
-        }
-    }
-    
-    public void previous() throws InvalidHandle {
-        if (connected) {
-            WinampController.previousTrack();
-        }
-    }
-    
-    public void forward() throws InvalidHandle {
-        if (connected) {
-            WinampController.fwd5Secs();
-        }
-    }
-    
-    public void rewind() throws InvalidHandle {
-        if (connected) {
-            WinampController.rew5Secs();
-        }
-    }
-    
-    
-    public void mute() throws InvalidHandle, InvalidParameter {
-        if (connected) {
-            if(muted) {
-                WinampController.setVolume(volume);
-                muted = false;
-            } else {
-                volume = WinampController.getVolume();
-                WinampController.setVolume(0);
-                muted = true;
+    protected void action(Action action) {
+        System.out.println("WinampApplication: " + action);
+        try {
+            switch (action) {
+                case PLAY:
+                    WinampController.play();
+                case NEXT:
+                    WinampController.nextTrack();
+                    break;
+                case PREVIOUS:
+                    WinampController.previousTrack();
+                    break;
+                case FORWARD:
+                    WinampController.fwd5Secs();
+                    break;
+                case REWIND:
+                    WinampController.rew5Secs();
+                    break;
+                case MUTE:
+                    if(muted) {
+                        WinampController.setVolume(volume);
+                    } else {
+                        volume = WinampController.getVolume();
+                        WinampController.setVolume(0);
+                    }
+                    muted = !muted;
+                    break;
+                case VOLUME_UP:
+                    WinampController.increaseVolume();
+                    break;
+                case VOLUME_DOWN:
+                    WinampController.decreaseVolume();
+                    break;
             }
-        }
-    }
-    
-    public void volumeUp() throws InvalidHandle {
-        if (connected) {
-            WinampController.increaseVolume();
-        }
-    }
-    
-    public void volumeDown() throws InvalidHandle {
-        if (connected) {
-            WinampController.decreaseVolume();
-        }
+        } catch (InvalidHandle e) {
+        } catch (InvalidParameter e) {}
     }
 }

java/src/pm/application/example/ExampleApplication.java

@@ -0,0 +1,15 @@
+package pm.application.example;
+
+import pm.Action;
+import pm.Application;
+
+public class ExampleApplication extends Application {
+    protected void action(Action action) {
+        System.out.println("ExampleApplication: " + action);
+        switch (action) {
+            case TEST:
+                System.out.println("test");
+                break;
+        }
+    }
+}

java/src/pm/application/iTunes/iTunesApplication.java

@@ -1,6 +1,7 @@
 package pm.application.iTunes;
 
-import pm.application.Application;
+import pm.Action;
+import pm.Application;
 
 import com.dt.iTunesController.ITCOMDisabledReason;
 import com.dt.iTunesController.ITTrack;
@@ -8,168 +9,68 @@ import com.dt.iTunesController.iTunes;
 import com.dt.iTunesController.iTunesEventsInterface;
 
 public class iTunesApplication extends Application implements iTunesEventsInterface {
-    
-    protected final int VOLUME_CHANGE_RATE = 5;
-    protected final int SEEK_TIME = 1000;
-    
+    protected static final int POSTION_CHANGE_RATE = 5;
+    protected static final int VOLUME_CHANGE_RATE = 5;
+    protected static final int SEEK_TIME = 1000;
+
     protected iTunes iTunes;
-    protected boolean connected;
 
     public iTunesApplication() {
+        super();
         iTunes = new iTunes();
-        connected = false;
     }
-    
-    public void start() {
-        if (!connected) {
-            iTunes.connect();
-            iTunes.addEventHandler(this);
-            connected = true;
-        }
+
+    public void start() throws Exception {
+        iTunes.connect();
+        iTunes.addEventHandler(this);
+        super.start();
     }
 
     public void exit() {
-        if (connected) {
-            iTunes.quit();
-        }
+        iTunes.quit();
+    }
+ 
+    protected void action(Action action) {
+        System.out.println("iTunesApplication: " + action);
+        switch (action) {
+            case PLAY:
+                iTunes.playPause();
+            case NEXT:
+                iTunes.nextTrack();
+                break;
+            case PREVIOUS:
+                iTunes.previousTrack();
+                break;
+            case FORWARD:
+                iTunes.setPlayerPosition(iTunes.getPlayerPosition() + POSTION_CHANGE_RATE);
+                break;
+            case REWIND:
+                iTunes.setPlayerPosition(iTunes.getPlayerPosition() - POSTION_CHANGE_RATE);
+                break;
+            case MUTE:
+                iTunes.toggleMute();
+                break;
+            case VOLUME_UP:
+                iTunes.setSoundVolume(getVolume() + VOLUME_CHANGE_RATE);
+                break;
+            case VOLUME_DOWN:
+                iTunes.setSoundVolume(getVolume() - VOLUME_CHANGE_RATE);
+                break;
+        }        
     }
 
-    /* Actions */
-    public void play() {
-        if (connected) {
-            iTunes.playPause();
-        }
+    protected int getVolume() {
+        return iTunes.getSoundVolume();
     }
 
-    public void pause() {
-        if (connected) {
-            iTunes.playPause();
-        }
-    }
-
-    public void resume() {
-        if (connected) {
-            iTunes.resume();
-        }
-    }
-
-    public void next() {
-        if (connected) {
-            iTunes.nextTrack();
-        }
-    }
-    
-    public void previous() {
-        if (connected) {
-            iTunes.previousTrack();
-        }
-    }
-    
-    public void forward() {
-        if (connected) {
-            iTunes.fastForward();
-            //sleep(SEEK_TIME);
-            resume();
-        }
-    }
-    
-    public void rewind() {
-        if (connected) {
-            iTunes.rewind();
-            //sleep(SEEK_TIME);
-            resume();
-        }
-    }
-    
-    protected void sleep(int time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void mute() {
-        if (connected) {
-            iTunes.setMute(iTunes.getMute());
-        }
-    }
-    
-    protected int volume() {
-        if (connected) {
-            return iTunes.getSoundVolume();
-        } else {
-            return 0;
-        }
-    }
-    
-    public void volumeUp() {
-        if (connected) {
-            iTunes.setSoundVolume(volume() + VOLUME_CHANGE_RATE);
-        }
-    }
-    
-    public void volumeDown() {
-        if (connected) {
-            iTunes.setSoundVolume(volume() - VOLUME_CHANGE_RATE);
-        }
-    }
-
-    
-    
     /* iTunesEventInterface => naar eigen class? */
-    @Override
-    public void onDatabaseChangedEvent(int[][] deletedObjectIDs,
-            int[][] changedObjectIDs) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onPlayerPlayEvent(ITTrack iTrack) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onPlayerStopEvent(ITTrack iTrack) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onPlayerPlayingTrackChangedEvent(ITTrack iTrack) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onCOMCallsDisabledEvent(ITCOMDisabledReason reason) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onCOMCallsEnabledEvent() {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onQuittingEvent() {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onAboutToPromptUserToQuitEvent() {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void onSoundVolumeChangedEvent(int newVolume) {
-        // TODO Auto-generated method stub
-        
-    }
+    public void onDatabaseChangedEvent(int[][] deletedObjectIDs, int[][] changedObjectIDs) {}
+    public void onPlayerPlayEvent(ITTrack iTrack) {}
+    public void onPlayerStopEvent(ITTrack iTrack) {}
+    public void onPlayerPlayingTrackChangedEvent(ITTrack iTrack) {}
+    public void onCOMCallsDisabledEvent(ITCOMDisabledReason reason) {}
+    public void onCOMCallsEnabledEvent() {}
+    public void onQuittingEvent() {}
+    public void onAboutToPromptUserToQuitEvent() {}
+    public void onSoundVolumeChangedEvent(int newVolume) {}
 }

java/src/pm/application/voorbeeld/VoorbeeldApplication.java

@@ -1,16 +0,0 @@
-package pm.application.voorbeeld;
-
-import pm.application.Application;
-
-public class VoorbeeldApplication extends Application {
-    public void start() {        
-    }
-    
-    public void stop() {
-        System.out.println("stop");
-    }
-
-    public void test() {
-        System.out.println("test");
-    }
-}