リファクタリング

[midichordhelper/MIDIChordHelper.git] / src / camidion / chordhelper / ChordHelperApplet.java
diff --git a/src/camidion/chordhelper/ChordHelperApplet.java b/src/camidion/chordhelper/ChordHelperApplet.java

index c4ce6cc..5027525 100644 (file)
--- a/src/camidion/chordhelper/ChordHelperApplet.java
+++ b/src/camidion/chordhelper/ChordHelperApplet.java
@@ -272,7 +272,7 @@ public class ChordHelperApplet extends JApplet {
          */
         public static class VersionInfo {
                 public static final String NAME = "MIDI Chord Helper";
-               public static final String VERSION = "Ver.20170410.1";
+               public static final String VERSION = "Ver.20170411.1";
                 public static final String COPYRIGHT = "Copyright (C) 2004-2017";
                 public static final String AUTHER = "＠きよし - Akiyoshi Kamide";
                 public static final String URL = "http://www.yk.rim.or.jp/~kamide/music/chordhelper/";
@@ -409,21 +409,20 @@ public class ChordHelperApplet extends JApplet {
                 //シーケンサーの時間スライダーの値が変わったときのリスナーを登録
                 JLabel songTitleLabel = new JLabel();
                 sequencerModel.addChangeListener(e->{
-                       SequenceTrackListTableModel sequenceTrackListTableModel = sequencerModel.getSequenceTrackListTableModel();
+                       SequenceTrackListTableModel sequenceModel = sequencerModel.getSequenceTrackListTableModel();
                         int loadedSequenceIndex = playlistModel.indexOfSequenceOnSequencer();
                         songTitleLabel.setText("<html>"+(
                                 loadedSequenceIndex < 0 ? "[No MIDI file loaded]" :
                                 "MIDI file " + loadedSequenceIndex + ": " + (
-                                       sequenceTrackListTableModel == null ||
-                                       sequenceTrackListTableModel.toString().isEmpty() ?
+                                       sequenceModel == null || sequenceModel.toString().isEmpty() ?
                                         "[Untitled]" :
-                                       "<font color=maroon>"+sequenceTrackListTableModel+"</font>"
+                                       "<font color=maroon>"+sequenceModel+"</font>"
                                 )
                         )+"</html>");
                         Sequencer sequencer = sequencerModel.getSequencer();
                         chordMatrix.setPlaying(sequencer.isRunning());
-                       if( sequenceTrackListTableModel != null ) {
-                               SequenceTickIndex tickIndex = sequenceTrackListTableModel.getSequenceTickIndex();
+                       if( sequenceModel != null ) {
+                               SequenceTickIndex tickIndex = sequenceModel.getSequenceTickIndex();
                                 long tickPos = sequencer.getTickPosition();
                                 tickIndex.tickToMeasure(tickPos);
                                 chordMatrix.setBeat(tickIndex);