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

trunk/src/org/apollo/widgets/FramePlayer.java

@@ -1 +1 @@
 package org.apollo.widgets;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -21 +20 @@
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -45 +43 @@
 import org.apollo.util.ApolloSystemLog;
 import org.apollo.util.AudioMath;
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.DisplayIOObserver;
-import org.expeditee.gui.FrameGraphics;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Image;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.swing.SwingMiscManager;
+import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.DisplayObserver;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.SwingWidget;
 
 /**
@@ -61 +61 @@
  *
  */
-public class FramePlayer extends InteractiveWidget 
-        implements Observer, MultitrackLoadListener, ActionListener, DisplayIOObserver {
+public class FramePlayer extends SwingWidget 
+        implements Observer, MultitrackLoadListener, ActionListener, DisplayObserver {
 
         private static final int BUTTON_SIZE = 40;
@@ -73 +73 @@
         private JButton rewindButton;
         private JButton playLauncherButton;
-        private JComboBox frameSelection;
+        private JComboBox<String> frameSelection;
         private JToggleButton muteButton;
         private JSlider volumeSlider;
@@ -86 +86 @@
         public static String FRAME_PLAYERMASTER_CHANNEL_ID = "#$frameplayer#master$";
         
-        private static final Color LOADING_BORDER_COLOR = new Color(22, 205, 5);
+        private static final Colour LOADING_BORDER_COLOR = Colour.FromRGB255(22, 205, 5);
         //private static final Color FAILED_MESSAGE_COLOR = Color.RED;
         //private static final Font MESSAGE_FONT = TrackWidgetCommons.FREESPACE_TRACKNAME_FONT;
@@ -180 +180 @@
                 playPauseButton = new JButton();
                 playPauseButton.addActionListener(this);
-                playPauseButton.setIcon(IconRepository.getIcon("play.png"));
+                SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("play.png"));
                 playPauseButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 playPauseButton.setToolTipText("Play selection / Pause");
@@ -187 +187 @@
                 stopButton.setEnabled(false);
                 stopButton.addActionListener(this);
-                stopButton.setIcon(IconRepository.getIcon("stop.png"));
+                SwingMiscManager.setJButtonIcon(stopButton, IconRepository.getIcon("stop.png"));
                 stopButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 stopButton.setToolTipText("Stop playback");
@@ -193 +193 @@
                 rewindButton = new JButton();
                 rewindButton.addActionListener(this);
-                rewindButton.setIcon(IconRepository.getIcon("rewind.png"));
+                SwingMiscManager.setJButtonIcon(rewindButton, IconRepository.getIcon("rewind.png"));
                 rewindButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 rewindButton.setToolTipText("Rewind to start");
@@ -199 +199 @@
                 // Icon changes
                 muteButton = new JToggleButton();
-                muteButton.setSelectedIcon(IconRepository.getIcon("volmute.png"));
+                SwingMiscManager.setJButtonIcon(muteButton, IconRepository.getIcon("volmute.png"));
                 muteButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 muteButton.setToolTipText("Toggle mute");
@@ -212 +212 @@
                 playLauncherButton = new JButton();
                 playLauncherButton.addActionListener(this);
-                playLauncherButton.setIcon(IconRepository.getIcon("frameplay.png"));
+                SwingMiscManager.setJButtonIcon(playLauncherButton, IconRepository.getIcon("frameplay.png"));
                 playLauncherButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 playLauncherButton.setToolTipText("Play from a specific position");
@@ -231 +231 @@
                 volumeSlider.setPreferredSize(new Dimension((3 * BUTTON_SIZE) - (2 * VOLUME_SPACING), BUTTON_SIZE));
 
-                frameSelection = new JComboBox();
+                frameSelection = new JComboBox<String>();
                 frameSelection.setEditable(true);
                 frameSelection.setPreferredSize(new Dimension(4 * BUTTON_SIZE, BUTTON_SIZE));
@@ -304 +304 @@
                         stopButton.setEnabled(false);
                         playPauseButton.setEnabled(true);
-                        playPauseButton.setIcon(IconRepository.getIcon("play.png"));
+                        SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("play.png"));
                         playLauncherButton.setEnabled(true);
 
@@ -323 +323 @@
                         playLauncherButton.setEnabled(true);
                         playPauseButton.setEnabled(true);
-                        playPauseButton.setIcon(IconRepository.getIcon("pause.png"));
+                        SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("pause.png"));
 
                         setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS);
@@ -336 +336 @@
                 
                 invalidateSelf();
-                FrameGraphics.refresh(true);
+                DisplayController.requestRefresh(true);
         }
         
@@ -361 +361 @@
                         MultiTrackPlaybackController.getInstance().addObserver(this); // the core!
                         masterMix.addObserver(this);
-                        DisplayIO.addDisplayIOObserver(this);
+                        DisplayController.addDisplayObserver(this);
                 
                         // Evaluate the state of this add set the state accordingly
@@ -405 +405 @@
                         
                         // Remove observers
-                        DisplayIO.removeDisplayIOObserver(this);
+                        DisplayController.removeDisplayObserver(this);
                         SoundDesk.getInstance().removeObserver(this);
                         MultiTrackPlaybackController.getInstance().removeObserver(this);
@@ -544 +544 @@
                 if ((frameSelection.getSelectedItem() != null && frameSelection.getSelectedItem().equals(CURRENT_FRAME_SPECIFIER))
                                 || frameSelection.getSelectedItem() == null)
-                        return DisplayIO.getCurrentFrame().getName();
+                        return DisplayController.getCurrentFrame().getName();
                 
                 String frameSpecifier = (String)frameSelection.getSelectedItem();
                 
                 if (frameSpecifier.isEmpty()) {
-                        return DisplayIO.getCurrentFrame().getName();
+                        return DisplayController.getCurrentFrame().getName();
                 }
                 
@@ -671 +671 @@
                         
                         String target = getSelectedFrameName();
-                        if (target == DisplayIO.getCurrentFrame().getName()) target = null;
+                        if (target == DisplayController.getCurrentFrame().getName()) target = null;
                         
                         // Create the launcher
                         FramePlaybackLauncher launcher = new FramePlaybackLauncher(target);
-                        launcher.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                        launcher.setPosition(DisplayController.getMousePosition());
 
                         // Pick it up
-                        FrameMouseActions.pickup(launcher);
+                        StandardGestureActions.pickup(launcher);
                 }
                 
@@ -687 +687 @@
                 
                 // Get border color currently used
-                Color oldC = getSource().getBorderColor();
-                Color newC = null;
+                Colour oldC = getSource().getBorderColor();
+                Colour newC = null;
                 
                 if (this.state == PLAYBACK_LOADING) {
@@ -714 +714 @@
         private void updateButtonGUI() {
                 
-                Icon newIcon = null;
+                Image newIcon = null;
                 if (volumeSlider.getValue() <= 25) 
                                 newIcon = IconRepository.getIcon("vol25.png");
@@ -724 +724 @@
                                 newIcon = IconRepository.getIcon("vol100.png");
                 
-                muteButton.setIcon(newIcon);
+                SwingMiscManager.setJButtonIcon(muteButton, newIcon);
         }
         
@@ -783 +783 @@
                 
                 // Place last visited frames
-                List<String> history = DisplayIO.getUnmodifiableVisitedList();
+                List<String> history = DisplayController.getUnmodifiableVisitedList();
                 
                 for (int i = history.size() - 1; i >= 0; i--) {
@@ -802 +802 @@
                 }
                 
-            ComboBoxModel model = new DefaultComboBoxModel(orderedModelData.toArray());
+            ComboBoxModel<String> model = new DefaultComboBoxModel<String>((String[]) orderedModelData.toArray());
             
             // Remove helper tags from model data