時間切れコミット

diff --git a/TinyBannavi/src/tainavi/AbsReserveDialog.java b/TinyBannavi/src/tainavi/AbsReserveDialog.java
index 07f979e..1c0e933 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsReserveDialog.java
+++ b/TinyBannavi/src/tainavi/AbsReserveDialog.java
@@ -973,8 +973,9 @@ abstract class AbsReserveDialog extends JEscCancelDialog implements HDDRecorderL
                jPane_title.getSelectedValues(newRsv);                          // タイトル\r
                jPane_recsetting.getSelectedValues(newRsv);                     // 録画設定\r
                \r
+               // XXX old.valueはload()で取得した値の場合定数とは異なる文字列になって、 == で比較できなくなるな多分\r
                if ( (newRsv.getRec_audio() == HDDRecorder.ITEM_REC_TYPE_EPG || newRsv.getRec_audio() == HDDRecorder.ITEM_REC_TYPE_PROG) &&\r
-                               (newRsv.getRec_audio() != oldRsv.getRec_audio()) ) {\r
+                               ! newRsv.getRec_audio().equals(oldRsv.getRec_audio()) ) {\r
                        ringBeep();\r
                        JOptionPane.showConfirmDialog(this, String.format("%s予約を%s予約には変更できません。",oldRsv.getRec_audio(),newRsv.getRec_audio()), "警告", JOptionPane.CLOSED_OPTION);\r
                        return;\r

diff --git a/TinyBannavi/src/tainavi/DebugPrintStream.java b/TinyBannavi/src/tainavi/DebugPrintStream.java
index 1d570a5..62b81fd 100644 (file)
--- a/TinyBannavi/src/tainavi/DebugPrintStream.java
+++ b/TinyBannavi/src/tainavi/DebugPrintStream.java
@@ -27,7 +27,6 @@ public class DebugPrintStream extends PrintStream {
                                logname = logfile;\r
                        }\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                */\r
@@ -46,7 +45,6 @@ public class DebugPrintStream extends PrintStream {
                                fw.close();\r
                        }\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        cw.println(e.toString());\r
                }\r
                \r
@@ -62,7 +60,6 @@ public class DebugPrintStream extends PrintStream {
                                fw.close();\r
                        }\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        cw.println(e.toString());\r
                }\r
                \r
@@ -78,7 +75,6 @@ public class DebugPrintStream extends PrintStream {
                                fw.close();\r
                        }\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        cw.println(e.toString());\r
                }\r
 \r

diff --git a/TinyBannavi/src/tainavi/LogViewer.java b/TinyBannavi/src/tainavi/LogViewer.java
index 1c5684d..026dd13 100644 (file)
--- a/TinyBannavi/src/tainavi/LogViewer.java
+++ b/TinyBannavi/src/tainavi/LogViewer.java
@@ -41,10 +41,8 @@ public class LogViewer extends JDialog {
                        jtext.setText(sb.toString());\r
                        jtext.setCaretPosition(jtext.getText().length());\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                } catch (IOException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
        }\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java
index a5ac6a5..d79d18a 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java
@@ -1168,7 +1168,6 @@ public class PlugIn_RecRD_A600 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r
@@ -1179,7 +1178,6 @@ public class PlugIn_RecRD_A600 extends HDDRecorderUtils implements HDDRecorder,C
                                newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")), thisEncoding));\r
                                //System.out.println(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")));\r
                        } catch (UnsupportedEncodingException e) {\r
-                               // TODO Auto-generated catch block\r
                                e.printStackTrace();\r
                        }\r
                }\r
@@ -1188,7 +1186,6 @@ public class PlugIn_RecRD_A600 extends HDDRecorderUtils implements HDDRecorder,C
                try {\r
                        newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java
index fa119a2..6af1298 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java
@@ -1211,7 +1211,6 @@ public class PlugIn_RecRD_BZ700 extends HDDRecorderUtils implements HDDRecorder,
                                try {\r
                                        newdat.put("title_name", URLEncoder.encode(CommonUtils.substringrb(r.getTitle(),86),thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                \r
@@ -1219,7 +1218,6 @@ public class PlugIn_RecRD_BZ700 extends HDDRecorderUtils implements HDDRecorder,
                                try {\r
                                        newdat.put("detail", URLEncoder.encode(CommonUtils.substringrb(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")),75*5), thisEncoding));\r
                                } catch (UnsupportedEncodingException e) {\r
-                                       // TODO Auto-generated catch block\r
                                        e.printStackTrace();\r
                                }\r
                        }\r
@@ -1228,7 +1226,6 @@ public class PlugIn_RecRD_BZ700 extends HDDRecorderUtils implements HDDRecorder,
                        try {\r
                                newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                        } catch (UnsupportedEncodingException e) {\r
-                               // TODO Auto-generated catch block\r
                                e.printStackTrace();\r
                        }\r
                        \r
@@ -1317,7 +1314,6 @@ public class PlugIn_RecRD_BZ700 extends HDDRecorderUtils implements HDDRecorder,
                                try {\r
                                        newdat.put("date", URLEncoder.encode(r.getRec_pattern(),thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                        }\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java
index ce1470f..2b8298f 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java
@@ -902,7 +902,6 @@ public class PlugIn_RecRD_E300 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
        \r
@@ -910,7 +909,6 @@ public class PlugIn_RecRD_E300 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")), thisEncoding));\r
                        } catch (UnsupportedEncodingException e) {\r
-                               // TODO Auto-generated catch block\r
                                e.printStackTrace();\r
                        }\r
                }\r
@@ -919,7 +917,6 @@ public class PlugIn_RecRD_E300 extends HDDRecorderUtils implements HDDRecorder,C
                try {\r
                        newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java
index 5c05b5f..480500e 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java
@@ -129,10 +129,8 @@ public class PlugIn_RecRD_MAIL extends HDDRecorderUtils implements HDDRecorder,C
                                }\r
                        }\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                } catch (IOException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                finally {\r
@@ -186,7 +184,6 @@ public class PlugIn_RecRD_MAIL extends HDDRecorderUtils implements HDDRecorder,C
                try {\r
                        message = new String(msg.getBytes("MS932"),"Shift_JIS");\r
                } catch (UnsupportedEncodingException e1) {\r
-                       // TODO Auto-generated catch block\r
                        e1.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java
index 3a78027..35e1158 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java
@@ -113,10 +113,8 @@ public class PlugIn_RecRD_MAIL_Z9500 extends HDDRecorderUtils implements HDDReco
                                }\r
                        }\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                } catch (IOException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                finally {\r
@@ -170,7 +168,6 @@ public class PlugIn_RecRD_MAIL_Z9500 extends HDDRecorderUtils implements HDDReco
                try {\r
                        message = new String(msg.getBytes("MS932"),"Shift_JIS");\r
                } catch (UnsupportedEncodingException e1) {\r
-                       // TODO Auto-generated catch block\r
                        e1.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java
index b915cf9..0332d52 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java
@@ -921,7 +921,6 @@ public class PlugIn_RecRD_S304K extends HDDRecorderUtils implements HDDRecorder,
                        try {\r
                                newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r
@@ -932,7 +931,6 @@ public class PlugIn_RecRD_S304K extends HDDRecorderUtils implements HDDRecorder,
                                newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")), thisEncoding));\r
                                //System.out.println(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")));\r
                        } catch (UnsupportedEncodingException e) {\r
-                               // TODO Auto-generated catch block\r
                                e.printStackTrace();\r
                        }\r
                }\r
@@ -941,7 +939,6 @@ public class PlugIn_RecRD_S304K extends HDDRecorderUtils implements HDDRecorder,
                try {\r
                        newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java
index eed9349..56ae305 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java
@@ -959,14 +959,12 @@ public class PlugIn_RecRD_S600 extends HDDRecorderUtils implements HDDRecorder,C
                                try {\r
                                        newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                \r
                                try {\r
                                        newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")), thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                        }\r
@@ -977,7 +975,6 @@ public class PlugIn_RecRD_S600 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
index a6a0219..c5a8c01 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
@@ -1745,7 +1745,6 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                        sb.append("i="+delid+"&");\r
                        sb.append("submit="+URLEncoder.encode("　予約を削除　",thisEncoding));   // EOL\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                String pstr = sb.toString();\r
@@ -1776,7 +1775,6 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                        sb.append("i="+delid+"&");\r
                        sb.append("submit="+URLEncoder.encode("はい",thisEncoding)+"&");\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                String pstr = sb.toString();\r
@@ -1930,7 +1928,6 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                        }\r
                        sb.append("submit="+URLEncoder.encode(cmd,thisEncoding));       // EOL\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java
index eacb4a6..7f514eb 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java
@@ -1063,7 +1063,6 @@ public class PlugIn_RecRD_X8 extends HDDRecorderUtils implements HDDRecorder,Clo
                        try {\r
                                newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
        \r
@@ -1071,7 +1070,6 @@ public class PlugIn_RecRD_X8 extends HDDRecorderUtils implements HDDRecorder,Clo
                        try {\r
                                newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")), thisEncoding));\r
                        } catch (UnsupportedEncodingException e) {\r
-                               // TODO Auto-generated catch block\r
                                e.printStackTrace();\r
                        }\r
                }\r
@@ -1080,7 +1078,6 @@ public class PlugIn_RecRD_X8 extends HDDRecorderUtils implements HDDRecorder,Clo
                try {\r
                        newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java
index c6ea3a6..977fd27 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java
@@ -666,7 +666,6 @@ public class PlugIn_RecRD_XS41 extends HDDRecorderUtils implements HDDRecorder,C
                try {\r
                        newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                } catch (UnsupportedEncodingException e1) {\r
-                       // TODO Auto-generated catch block\r
                        e1.printStackTrace();\r
                }\r
 \r
@@ -674,7 +673,6 @@ public class PlugIn_RecRD_XS41 extends HDDRecorderUtils implements HDDRecorder,C
                try {\r
                        newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")),thisEncoding));\r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java
index 806d8fa..b2322f7 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java
@@ -818,7 +818,6 @@ public class PlugIn_RecRD_XS57 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("title_name", URLEncoder.encode(r.getTitle(),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
        \r
@@ -826,7 +825,6 @@ public class PlugIn_RecRD_XS57 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("detail", URLEncoder.encode(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r
@@ -834,7 +832,6 @@ public class PlugIn_RecRD_XS57 extends HDDRecorderUtils implements HDDRecorder,C
                        try {\r
                                newdat.put("folder", URLEncoder.encode(text2value(folder,r.getRec_folder()),thisEncoding));\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java
index e322156..7d86f50 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java
@@ -1241,7 +1241,6 @@ public class PlugIn_RecRD_Z260 extends HDDRecorderUtils implements HDDRecorder,C
                                try {\r
                                        newdat.put("title_name", URLEncoder.encode(CommonUtils.substringrb(r.getTitle(),86),thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                \r
@@ -1249,7 +1248,6 @@ public class PlugIn_RecRD_Z260 extends HDDRecorderUtils implements HDDRecorder,C
                                try {\r
                                        newdat.put("detail", URLEncoder.encode(CommonUtils.substringrb(r.getDetail().replaceAll("\n", Matcher.quoteReplacement("\r\n")),75*5), thisEncoding));\r
                                } catch (UnsupportedEncodingException e) {\r
-                                       // TODO Auto-generated catch block\r
                                        e.printStackTrace();\r
                                }\r
                        }\r
@@ -1304,7 +1302,6 @@ public class PlugIn_RecRD_Z260 extends HDDRecorderUtils implements HDDRecorder,C
                                newdat.put("channel_list", ech);\r
                                newdat.put("channel_no", ech);\r
                        } catch (UnsupportedEncodingException e1) {\r
-                               // TODO Auto-generated catch block\r
                                e1.printStackTrace();\r
                        }\r
                        \r
@@ -1315,7 +1312,6 @@ public class PlugIn_RecRD_Z260 extends HDDRecorderUtils implements HDDRecorder,C
                                try {\r
                                        newdat.put("date", URLEncoder.encode(r.getRec_pattern(),thisEncoding));\r
                                } catch (UnsupportedEncodingException e1) {\r
-                                       // TODO Auto-generated catch block\r
                                        e1.printStackTrace();\r
                                }\r
                        }\r
@@ -1358,7 +1354,6 @@ public class PlugIn_RecRD_Z260 extends HDDRecorderUtils implements HDDRecorder,C
                                try {\r
                                        newdat.put("folder", URLEncoder.encode(text2value(folder, r.getRec_folder()),thisEncoding));\r
                                } catch (UnsupportedEncodingException e) {\r
-                                       // TODO Auto-generated catch block\r
                                        e.printStackTrace();\r
                                }\r
                                \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java
index 055c301..f2ee5fd 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java
@@ -127,13 +127,10 @@ public class PlugIn_RecRD_iEPG extends HDDRecorderUtils implements HDDRecorder,C
                        bw.write("program-title: "+r.getTitle()+"\r\n");\r
                        \r
                } catch (UnsupportedEncodingException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                } catch (FileNotFoundException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                } catch (IOException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
                finally {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java
index ab7a1bc..5f8938c 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java
@@ -123,7 +123,6 @@ public class PlugIn_RecRD_iEPG2 extends PlugIn_RecRD_iEPG implements HDDRecorder
                        }\r
                }\r
                catch ( Exception e ) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
                }\r
 \r

diff --git a/TinyBannavi/src/tainavi/TVProgram.java b/TinyBannavi/src/tainavi/TVProgram.java
index d05f5b2..88f28c8 100644 (file)
--- a/TinyBannavi/src/tainavi/TVProgram.java
+++ b/TinyBannavi/src/tainavi/TVProgram.java
@@ -34,7 +34,7 @@ public interface TVProgram {
                THEATER         ("劇場/公演",               "9"),\r
                HOBBY           ("趣味/教育",               "A"),\r
                WELFARE         ("福祉",                              "B"),\r
-               //KIDS          ("キッズ",                   "XXX"), // もとからなかったらしい\r
+               //KIDS          ("キッズ",                   "ZZZ"), // もとからなかったらしい\r
                //EXTENTION     ("拡張",                      "E"),   // 非対応とする\r
                NOGENRE         ("その他",                   "F");\r
                \r

diff --git a/TinyBannavi/src/tainavi/VersionInfo.java b/TinyBannavi/src/tainavi/VersionInfo.java
index 4b706f8..6258c80 100644 (file)
--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,13 +5,14 @@ import java.util.regex.Pattern;
 \r
 \r
 public class VersionInfo {\r
-       private static final String Version = "タイニー番組ナビゲータ　3.22.2β";\r
+       private static final String Version = "タイニー番組ナビゲータ　3.22.3β";\r
        \r
        private static final String OSname = System.getProperty("os.name");\r
        private static final String OSvers = System.getProperty("os.version");\r
        //private static final String OSarch = System.getProperty("sun.arch.data.model", "?");\r
        private static final String VMvers = System.getProperty("java.version");\r
-       private static final String VMarch = System.getProperty("os.arch");                     // なんと！OSarchでなくJREarchが返る！\r
+       // XXX なんと！System.getProperty("os.arch")ではOS.archでなくJRE.archが返る！\r
+       private static final String VMarch = System.getProperty("os.arch");\r
        private static final String VMvend = System.getProperty("java.vendor");\r
        \r
        \r

diff --git a/TinyBannavi/src/todo.txt b/TinyBannavi/src/todo.txt
index d47f1a9..493641e 100644 (file)
--- a/TinyBannavi/src/todo.txt
+++ b/TinyBannavi/src/todo.txt
@@ -11,10 +11,17 @@
 【予約ダイアログ】EPG予約選択時のマージン警告がうまく動かない場合があるみたい\r
 【予約ダイアログ】EPG予約を更新するとき、レコーダ側で設定された開始終了時刻が鯛ナビの予約情報に反映されない？\r
 【予約ダイアログ】チューナー１個の時、裏番組がなくても「空きエンコーダなし」と表示されてしまうようになった？\r
-【予約ダイアログ】"EPG予約をEPG予約には変更できません"\r
+【予約ダイアログ】"EPG予約をEPG予約には変更できません" →==のせいか？\r
+【予約ダイアログ】EPG予約追跡なしをON/OFFすると追跡ありにかわってしまう？\r
+\r
+【レコーダ対応(EDCB/TvRock)】録画後終了動作＝「なし」にしていると、復帰後再起動＝「する」が指定できない\r
 \r
 【CHコード設定】TvRockのCHコード設定がなんか欠けているような（CH設定での追加・削除が即反映されないのと、レコーダ選択でOOR例外が発生する？）\r
 \r
+【リスト形式】ピックアップに失敗する（未来すぎる？）\r
+\r
+【番組追跡】[番組タイトル]ボタンを押したとき、削除した「アニメ・」が復活してしまう\r
+\r
 ---優先度高\r
 \r
 【自動予約登録】EDCBとTVRockの自動予約登録編集機能の追加（９月中旬厳守）\r
@@ -30,6 +37,8 @@
 【リスト形式】予約マークが単日予約なのか繰り返し予約なのか分かるようにする　※「◎[機種依存文字]」みたいな\r
 \r
 【リスト形式】「バッチ予約では類似予約を参照しないオプション」の追加\r
+\r
+【新聞形式】番組詳細枠の表示を、番組枠のマウスオーバーではなく、番組枠のクリックをトリガーにするオプションの追加\r
  \r
 【その他】ContentId.class系列を全面改訂（staticをやめる！！）　※これはアカンかった\r
 \r
@@ -63,6 +72,9 @@
 　案１）テキスト描画をjniでnaitiveコードにする\r
 　案２）番組枠を１番組ずつjlabelで描画してるが、テキストはでかい１枚のbitmapにして、jlabelはmouselistenerを拾うための枠だけにする　→意味なさそう\r
 \r
+【CHコード設定】フリー編集モードの追加\r
+\r
+\r
 ---優先度低\r
 \r
 【予約一覧】フィルタリングを、予約操作後も維持できるようにする\r