バグ修正

・番組ID自動取得設定時、予約ダイアログを開くと鯛ナビがfault

diff --git a/TinyBannavi/05_history.txt b/TinyBannavi/05_history.txt
index d6a079e..6563938 100644 (file)
--- a/TinyBannavi/05_history.txt
+++ b/TinyBannavi/05_history.txt
@@ -10,6 +10,10 @@
 2chの番ナビスレ：http://toro.2ch.net/test/read.cgi/av/1352223253/\r
 ★☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆★\r
 \r
+3.22.6β+1.5.12(2013-11-28)\r
+■バグ修正\r
+　・(予約ダイアログ)　番組ID自動取得設定時、予約ダイアログを開くと鯛ナビがfault\r
+\r
 3.22.5β+1.5.12(2013-11-24)\r
 ■バグ修正\r
 　・(Web番組表[スカパー])　3.16.5β以前の形式のままのcenter.xmlを食わせるとnull pointer exceptionになる問題を修正\r

diff --git a/TinyBannavi/src/tainavi/AbsPaperView.java b/TinyBannavi/src/tainavi/AbsPaperView.java
index 5602f45..0c76f79 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsPaperView.java
+++ b/TinyBannavi/src/tainavi/AbsPaperView.java
@@ -19,8 +19,6 @@ import java.io.File;
 import java.util.ArrayList;\r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
 \r
 import javax.swing.JComponent;\r
 import javax.swing.JLabel;\r
@@ -43,7 +41,6 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;\r
 import javax.swing.tree.DefaultTreeModel;\r
 \r
-import tainavi.TVProgram.ProgSubtype;\r
 import tainavi.TVProgram.ProgType;\r
 import tainavi.TVProgramIterator.IterationType;\r
 import tainavi.VWMainWindow.MWinTab;\r

diff --git a/TinyBannavi/src/tainavi/AbsReserveDialog.java b/TinyBannavi/src/tainavi/AbsReserveDialog.java
index 1c0e933..af3aec7 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsReserveDialog.java
+++ b/TinyBannavi/src/tainavi/AbsReserveDialog.java
@@ -1081,7 +1081,7 @@ abstract class AbsReserveDialog extends JEscCancelDialog implements HDDRecorderL
                        }\r
                }.execute();\r
                \r
-               CommonSwingUtils.setLocationCenter(AbsReserveDialog.this, (Component) StWin);\r
+               CommonSwingUtils.setLocationCenter(AbsReserveDialog.this.isVisible() ? AbsReserveDialog.this : parent, (Component) StWin);\r
                StWin.setVisible(true);\r
                \r
                return tvd.progid;\r

diff --git a/TinyBannavi/src/tainavi/ChippedBorder.java b/TinyBannavi/src/tainavi/ChippedBorder.java
index f99ad23..679685a 100644 (file)
--- a/TinyBannavi/src/tainavi/ChippedBorder.java
+++ b/TinyBannavi/src/tainavi/ChippedBorder.java
@@ -17,9 +17,9 @@ public class ChippedBorder extends LineBorder {
        @Override\r
        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {\r
                g.fillRect(0, 0, width, thickness);                             // 上\r
-               //g.fillRect(0, y-thickness-1, width, thickness);       // 下\r
-               g.fillRect(0, 0, thickness, height);                    // 左\r
-               //g.fillRect(x-thickness-1, 0, thickness, height);      // 右\r
+               //g.fillRect(0, height-thickness, width, thickness);    // 下\r
+               //g.fillRect(0, 0, thickness, height);                  // 左\r
+               g.fillRect(width-thickness, 0, thickness, height);      // 右\r
        }\r
 \r
 }\r

diff --git a/TinyBannavi/src/tainavi/VersionInfo.java b/TinyBannavi/src/tainavi/VersionInfo.java
index 67e255d..5069e51 100644 (file)
--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
 \r
 \r
 public class VersionInfo {\r
-       private static final String Version = "タイニー番組ナビゲータ　3.22.5β";\r
+       private static final String Version = "タイニー番組ナビゲータ　3.22.6β";\r
        \r
        private static final String OSname = System.getProperty("os.name");\r
        private static final String OSvers = System.getProperty("os.version");\r