[予約ダイアログ]自動予約編集への対応に伴うレイアウト変更(5)

[tainavi/TinyBannavi.git] / TinyBannavi / src / tainavi / PlugIn_RecRD_TvRock.java

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
index 0ebad0e..1eb5324 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
+++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
@@ -467,7 +467,7 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                        // キャッシュから読み出し（予約一覧）\r
                        setReserves(ReservesFromFile(rsvedFile));\r
                        replaceChNames(cc);\r
-                       if (getDebug()) ShowReserves();\r
+                       if (getDebug()) ShowReserves(getReserves());\r
 \r
                        return true;\r
                }\r
@@ -483,7 +483,7 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                // 録画済みフラグを立てる（録画結果一覧→予約一覧）\r
                setRecordedFlag();\r
 \r
-               ShowReserves();\r
+               if (getDebug()) ShowReserves(getReserves());\r
                \r
                return(true);\r
        }\r
@@ -522,7 +522,7 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                        \r
                        // キャッシュから読み出し（録画結果一覧）\r
                        setRecorded(newRecordedList);\r
-                       if (getDebug()) ShowRecorded();\r
+                       if (getDebug()) ShowRecorded(getRecorded());\r
                        \r
                        // 録画済みフラグを立てる（録画結果一覧→予約一覧）\r
                        setRecordedFlag();\r
@@ -539,31 +539,11 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder
                // 録画済みフラグを立てる（録画結果一覧→予約一覧）\r
                setRecordedFlag();\r
                \r
-               ShowRecorded();\r
+               if (getDebug()) ShowRecorded(getRecorded());\r
                \r
                return true;\r
        }\r
 \r
-       private void ShowReserves() {\r
-               System.out.println("---Reserved List Start---");\r
-               for ( int i = 0; i<getReserves().size(); i++ ) {\r
-                       // 詳細情報の取得\r
-                       ReserveList e = getReserves().get(i);\r
-                       System.out.println(String.format("[%s] %s\t%s\t%s %s:%s-%s:%s\t%sm\t%s\t%s\t%s(%s)\t%s\t%s",\r
-                                       (i+1), e.getId(), e.getRec_pattern(), e.getRec_nextdate(), e.getAhh(), e.getAmm(), e.getZhh(),  e.getZmm(),     e.getRec_min(), e.getContentId(), "", e.getTitle(), e.getTitlePop(), e.getChannel(), e.getCh_name()));\r
-               }\r
-               System.out.println("---Reserved List End---");\r
-       }\r
-       private void ShowRecorded() {\r
-               System.out.println("---Recorded List Start---");\r
-               for ( int i = 0; i<getRecorded().size(); i++ ) {\r
-                       // 詳細情報の取得\r
-                       RecordedInfo e = getRecorded().get(i);\r
-                       System.out.println(String.format("[%s] %s %s\t%s:%s-%s:%s\t%s(%s)\t%s",\r
-                                       (i+1), e.getId(), e.getDate(), e.getAhh(), e.getAmm(), e.getZhh(), e.getZmm(), e.getTitle(), e.getCh_name(), e.getResult()));\r
-               }\r
-               System.out.println("---Recorded List End---");\r
-       }\r
        \r
        /**\r
         * 予約一覧を取得する\r