リファクタリング

diff --git a/src/camidion/chordhelper/ChordHelperApplet.java b/src/camidion/chordhelper/ChordHelperApplet.java
index 5985e04..2bfaf68 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.20170412.1";
+               public static final String VERSION = "Ver.20170413.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/";

diff --git a/src/camidion/chordhelper/midieditor/MidiEventDialog.java b/src/camidion/chordhelper/midieditor/MidiEventDialog.java
index e52de08..b0d4f06 100644 (file)
--- a/src/camidion/chordhelper/midieditor/MidiEventDialog.java
+++ b/src/camidion/chordhelper/midieditor/MidiEventDialog.java
@@ -1,48 +1,17 @@
 package camidion.chordhelper.midieditor;
 
 import java.awt.FlowLayout;
-import java.awt.GridLayout;
 
 import javax.swing.Action;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JSpinner;
 
 public class MidiEventDialog extends JDialog {
        /**
         * tick位置入力フォーム
         */
-       public static class TickPositionInputForm extends JPanel {
-               private JSpinner tickSpinner = new JSpinner();
-               private JSpinner measureSpinner = new JSpinner();
-               private JSpinner beatSpinner = new JSpinner();
-               private JSpinner extraTickSpinner = new JSpinner();
-               public TickPositionInputForm() {
-                       setLayout(new GridLayout(2,4));
-                       add( new JLabel() );
-                       add( new JLabel() );
-                       add( new JLabel("Measure:") );
-                       add( new JLabel("Beat:") );
-                       add( new JLabel("ExTick:") );
-                       add( new JLabel("Tick position : ",JLabel.RIGHT) );
-                       add( tickSpinner );
-                       add( measureSpinner );
-                       add( beatSpinner );
-                       add( extraTickSpinner );
-               }
-               public void setModel(TickPositionModel model) {
-                       tickSpinner.setModel(model.tickModel);
-                       measureSpinner.setModel(model.measureModel);
-                       beatSpinner.setModel(model.beatModel);
-                       extraTickSpinner.setModel(model.extraTickModel);
-               }
-       }
-       /**
-        * tick位置入力フォーム
-        */
-       public MidiEventDialog.TickPositionInputForm tickPositionInputForm;
+       public TickPositionInputForm tickPositionInputForm;
        /**
         * MIDIメッセージ入力フォーム
         */

diff --git a/src/camidion/chordhelper/midieditor/MidiSequenceEditorDialog.java b/src/camidion/chordhelper/midieditor/MidiSequenceEditorDialog.java
index d47d554..52db203 100644 (file)
--- a/src/camidion/chordhelper/midieditor/MidiSequenceEditorDialog.java
+++ b/src/camidion/chordhelper/midieditor/MidiSequenceEditorDialog.java
@@ -88,8 +88,9 @@ public class MidiSequenceEditorDialog extends JDialog {
                        if( isVisible() ) toFront(); else setVisible(true);
                }
        };
-
-       /** ドロップされた複数のMIDIファイルを読み込むハンドラー */
+       /**
+        * ドロップされた複数のMIDIファイルを読み込むハンドラー
+        */
        public final TransferHandler transferHandler = new TransferHandler() {
                @Override
                public boolean canImport(TransferSupport support) {
@@ -1156,7 +1157,7 @@ public class MidiSequenceEditorDialog extends JDialog {
                trackListTable = new TrackListTable(playlistTableModel.emptyTrackListTableModel);
                eventListTable = new EventListTable(playlistTableModel.emptyEventListTableModel);
                newSequenceDialog = new NewSequenceDialog(playlistTableModel, outputMidiDevice);
-               setTitle("MIDI Editor/Playlist - MIDI Chord Helper");
+               setTitle("MIDI Editor/Playlist - "+ChordHelperApplet.VersionInfo.NAME);
                setBounds( 150, 200, 900, 500 );
                setLayout(new FlowLayout());
                setTransferHandler(transferHandler);
@@ -1202,7 +1203,7 @@ public class MidiSequenceEditorDialog extends JDialog {
                                add( Box.createRigidArea(new Dimension(5, 0)) );
                                add(new JPanel() {{
                                        setBorder(new EtchedBorder());
-                                       MidiSequencerModel sequencerModel = getPlaylistModel().getSequencerModel();
+                                       MidiSequencerModel sequencerModel = playlistTableModel.getSequencerModel();
                                        add(new JLabel("Sync Master"));
                                        add(new JComboBox<Sequencer.SyncMode>(sequencerModel.masterSyncModeModel));
                                        add(new JLabel("Slave"));

diff --git a/src/camidion/chordhelper/midieditor/TickPositionInputForm.java b/src/camidion/chordhelper/midieditor/TickPositionInputForm.java
new file mode 100644 (file)
index 0000000..35f9e21
--- /dev/null
+++ b/src/camidion/chordhelper/midieditor/TickPositionInputForm.java
@@ -0,0 +1,36 @@
+package camidion.chordhelper.midieditor;
+
+import java.awt.GridLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+
+/**
+ * tick位置入力フォーム
+ */
+public class TickPositionInputForm extends JPanel {
+       private JSpinner tickSpinner = new JSpinner();
+       private JSpinner measureSpinner = new JSpinner();
+       private JSpinner beatSpinner = new JSpinner();
+       private JSpinner extraTickSpinner = new JSpinner();
+       public TickPositionInputForm() {
+               setLayout(new GridLayout(2,4));
+               add( new JLabel() );
+               add( new JLabel() );
+               add( new JLabel("Measure:") );
+               add( new JLabel("Beat:") );
+               add( new JLabel("ExTick:") );
+               add( new JLabel("Tick position : ",JLabel.RIGHT) );
+               add( tickSpinner );
+               add( measureSpinner );
+               add( beatSpinner );
+               add( extraTickSpinner );
+       }
+       public void setModel(TickPositionModel model) {
+               tickSpinner.setModel(model.tickModel);
+               measureSpinner.setModel(model.measureModel);
+               beatSpinner.setModel(model.beatModel);
+               extraTickSpinner.setModel(model.extraTickModel);
+       }
+}

diff --git a/src/camidion/chordhelper/midieditor/TrackEventListTableModel.java b/src/camidion/chordhelper/midieditor/TrackEventListTableModel.java
index 045472c..8f700f5 100644 (file)
--- a/src/camidion/chordhelper/midieditor/TrackEventListTableModel.java
+++ b/src/camidion/chordhelper/midieditor/TrackEventListTableModel.java
@@ -24,7 +24,7 @@ public class TrackEventListTableModel extends AbstractTableModel {
         */
        public enum Column {
                /** MIDIイベント番号 */
-               EVENT_NUMBER("No.", Integer.class, 15) {
+               EVENT_NUMBER("#", Integer.class, 15) {
                        @Override
                        public boolean isCellEditable() { return false; }
                },