Changeset 1102 for trunk/src/org/apollo/ApolloSystem.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/ApolloSystem.java (modified) (11 diffs)

trunk/src/org/apollo/ApolloSystem.java

@@ -1 +1 @@
 package org.apollo;
 
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.net.URL;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -29 +23 @@
 import org.apollo.widgets.FramePlayer;
 import org.expeditee.actions.Actions;
+import org.expeditee.core.BlockingRunnable;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.EcosystemManager.Ecosystem;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gio.InputManager.WindowEventListener;
+import org.expeditee.gio.InputManager.WindowEventType;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameKeyboardActions;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.settings.UserSettings;
-import org.expeditee.importer.FrameDNDTransferHandler;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -47 +44 @@
 public final class ApolloSystem {
         
+        private static final String APOLLO_ICON = "org/apollo/icons/mainicon.png";
+        
         // TODO: Create actual frames
         public static final String SYSTEM_FRAMESET_NAME = "apollosystem";
         public static final String HELP_TOP_FRAMENAME = SYSTEM_FRAMESET_NAME + 2;
         
-//       TODO: How to get good results: collection (moteef) and querry
+        // TODO: How to get good results: collection (moteef) and querry
         // TODO: How to omit indexing on tracks 
         public static final String HELP_MELODYSEARCH_FRAMENAME = SYSTEM_FRAMESET_NAME + 3; 
@@ -58 +57 @@
         public static final String SETTINGS_NAME_TIMELINE_LMARGIN = "timelineleftmargin";
         
-
-
         public static boolean useQualityGraphics = true;
-        
-        private ApolloSystem() {
-        }
 
         private static boolean hasInitialized = false;
         
+        private ApolloSystem()
+        {
+        }
+        
         /**
          * Initializes Apollo mod for expeditee - prepares all subsystems.
          */
-        public static void initialize() {
-                
+        public static void initialize()
+        {
                 if (hasInitialized) return;
 
                 ApolloSystemLog.println("Initializing...");
-                
-                SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                                
-                                 try {
-
-                                        URL url = ClassLoader.getSystemResource("org/apollo/icons/mainicon.png");
-                                        
-                                        if (url != null) {
-                                                 Image img = Toolkit.getDefaultToolkit().getImage(url);
-                                                 Browser._theBrowser.setIconImage(img);
-                                        }
-                                                
-        
-                                         
-                                 } catch (Exception e) {
-                                         e.printStackTrace();
-                                 }
-                                 
-                                // Ensure that resources are released before the application is closed.
-                                Browser._theBrowser.addWindowListener(new WindowListener() {
-                
-                                        public void windowActivated(WindowEvent e) {
-                                        }
-                
-                                        public void windowClosed(WindowEvent e) {
-                                        }
-                
-                                        public void windowClosing(WindowEvent e) {
-                                                ApolloSystem.shutdown();
-                                        }
-                
-                                        public void windowDeactivated(WindowEvent e) {
-                                        }
-                
-                                        public void windowDeiconified(WindowEvent e) {
-                                        }
-                
-                                        public void windowIconified(WindowEvent e) {
-                                        }
-                
-                                        public void windowOpened(WindowEvent e) {
-                                        }
-                                
-                                });
-                                
-                                Browser._theBrowser.getContentPane().removeKeyListener(FrameKeyboardActions.getInstance());
-                                Browser._theBrowser.removeKeyListener(FrameKeyboardActions.getInstance());
-                                
-                                Browser._theBrowser.getContentPane().addKeyListener(new AudioFrameKeyboardActions());
-                                Browser._theBrowser.addKeyListener(new AudioFrameKeyboardActions());
-                                
-                                // Filter out some special mouse move cases
-                                AudioFrameMouseActions apolloMouseFilter = new AudioFrameMouseActions();
-                                Browser._theBrowser.getMouseEventRouter().removeExpediteeMouseMotionListener(
-                                                FrameMouseActions.getInstance());
-                                Browser._theBrowser.getMouseEventRouter().addExpediteeMouseMotionListener(apolloMouseFilter);
-                                
-                                Browser._theBrowser.getMouseEventRouter().removeExpediteeMouseListener(
-                                                FrameMouseActions.getInstance());
-                                Browser._theBrowser.getMouseEventRouter().addExpediteeMouseListener(apolloMouseFilter);
+
+                // Ensure that resources are released before the application is closed.
+                EcosystemManager.getInputManager().addWindowEventListener(new WindowEventListener() {
+                        @Override
+                        public void onWindowEvent(WindowEventType type)
+                        {
+                                if (type != WindowEventType.WINDOW_CLOSED) return;
+                                ApolloSystem.shutdown();
                         }
                 });
+                
+                EcosystemManager.getInputManager().registerGestureListener(ApolloGestureActions.getInstance());
+                EcosystemManager.getInputManager().addInputEventToGestureTranslator(new ApolloKBMGestureTranslator());
                 
                 // Set title
@@ -161 +109 @@
                 
                 // Setup for importing audio
-                FrameDNDTransferHandler.getInstance().addCustomFileImporter(
-                                new SampledAudioFileImporter());
+                EcosystemManager.getDragAndDropManager().addCustomFileImporter(new SampledAudioFileImporter());
 
                 ApolloSystemLog.println("  Loading actions and agents...");
@@ -202 +149 @@
          * When invoked, the apollo setting frame is loaded and parsed... setting apollo-specific settings.
          */
-        public static void loadSettings() {
-
+        public static void loadSettings()
+        {
                 // Load apollo settings frame from the default profile
                 Frame profile = FrameIO.LoadProfile(UserSettings.DEFAULT_PROFILE_NAME);
@@ -241 +188 @@
         }
         
-        private static Mutable.Integer stripNameValueStringInteger(String namevalue) {
+        private static Mutable.Integer stripNameValueStringInteger(String namevalue)
+        {
                 assert (namevalue != null);
                 int valueIndex = namevalue.indexOf(':') + 1;
@@ -259 +207 @@
          * Releases all resources currently used by the SampledAudioManager.
          */
-        public static void shutdown() {
-                
+        public static void shutdown()
+        {
                 ApolloSystemLog.println("Saving banks...");
                 SoundDesk.getInstance().saveMasterMix();
@@ -280 +228 @@
          *              True if has initialized.
          */
-        public static boolean isInitialized() {
+        public static boolean isInitialized()
+        {
                 return hasInitialized;
         }
@@ -294 +243 @@
          * @param args
          */
-        public static void main(String[] args) {
-                
-                try {
-                UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-            } 
-            catch (Exception e) {
-               e.printStackTrace();
-               return;
-            }
+        public static void main(String[] args)
+        {
+                if (Browser.ECOSYSTEM_TYPE == Ecosystem.Swing) {
+                        try {
+                        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+                    } catch (Exception e) {
+                       e.printStackTrace();
+                       return;
+                    }
+                }
+
+                // Window icon must be set before initialisation
+                GraphicsManager.setWindowIcon(APOLLO_ICON);
                 
                 // Run expeditee
@@ -308 +261 @@
                 
                 // Initialize apollo
-                SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
+                EcosystemManager.getMiscManager().runOnGIOThread(new BlockingRunnable() {
+                        public void execute() {
                                 ApolloSystem.initialize();
                         }