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

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

@@ -21 +21 @@
 import org.apollo.mvc.Subject;
 import org.apollo.mvc.SubjectChangedEvent;
+import org.expeditee.gio.swing.SwingMiscManager;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.SwingWidget;
 
 /**
@@ -33 +34 @@
  *
  */
-public class MetronomePlayer extends InteractiveWidget implements Observer {
+public class MetronomePlayer extends SwingWidget implements Observer {
         
         private JLabel tempoLabel;
         private JSlider bpmSlider;
         private JButton startStopButton;
-        private JComboBox beatsPerMeasureCombo;
+        private JComboBox<String> beatsPerMeasureCombo;
         private JCheckBox enabledCheckbox;
         private boolean interfaceIsUpdating = false;
@@ -84 +85 @@
                 });
 
-                beatsPerMeasureCombo = new JComboBox(new String[]{"1", "2", "3", "4", "5", "6", "7", "8"});
+                beatsPerMeasureCombo = new JComboBox<String>(new String[]{"1", "2", "3", "4", "5", "6", "7", "8"});
                 beatsPerMeasureCombo.setPreferredSize(new Dimension(60, 25));
                 beatsPerMeasureCombo.setEditable(false);
@@ -133 +134 @@
                         
                         if (Metronome.getInstance().isPlaying()) {
-                                startStopButton.setIcon(IconRepository.getIcon("metrostop.png"));
+                                SwingMiscManager.setJButtonIcon(startStopButton, IconRepository.getIcon("metrostop.png"));
                                 setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS);
         
                         } else {
-                                startStopButton.setIcon(IconRepository.getIcon("metroplay.png"));
+                                SwingMiscManager.setJButtonIcon(startStopButton, IconRepository.getIcon("metroplay.png"));
                                 setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
                         }