Changeset 1102 for trunk/src/org/apollo/util/TrackModelLoadManager.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/util/TrackModelLoadManager.java (modified) (5 diffs)

trunk/src/org/apollo/util/TrackModelLoadManager.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.swing.SwingUtilities;
 
 import org.apollo.audio.SampledTrackModel;
@@ -14 +12 @@
 import org.apollo.io.LoadedAudioData;
 import org.apollo.mvc.Observer;
+import org.expeditee.core.BlockingRunnable;
+import org.expeditee.gio.EcosystemManager;
 import org.expeditee.items.widgets.HeavyDutyInteractiveWidget;
 import org.expeditee.items.widgets.WidgetCacheManager;
@@ -124 +124 @@
                         
                         try {
-                                SwingUtilities.invokeAndWait(locator);
-                        } catch (InterruptedException e) {
-                                e.printStackTrace();
-                        } catch (InvocationTargetException e) {
+                                EcosystemManager.getMiscManager().runOnGIOThread(locator);
+                        } catch (Exception e) {
                                 e.printStackTrace();
                         }
@@ -166 +164 @@
          * Look in expeditee memory - this should be quick - will hold up the user
          */
-        private class CachedTrackModelLocator implements Runnable
+        private class CachedTrackModelLocator extends BlockingRunnable
         {
                 private String localfileName;
@@ -176 +174 @@
                 }
                 
-                public void run() {
+                public void execute() {
                 
                         // Exploit knowledge that all SampledTrack are Cached HDW