BWT650の予約詳細への対応とプラグインのパッケージの移動

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT650.java b/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT650.java
deleted file mode 100644 (file)
index ba7669b..0000000
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT650.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package tainavi;\r
-\r
-import java.util.ArrayList;\r
-import java.util.HashMap;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
-\r
-\r
-/*\r
- * \r
- */\r
-\r
-public class PlugIn_RecDIGA_DMR_BWT650 extends PlugIn_RecDIGA_DMR_BZT720 implements HDDRecorder,Cloneable {\r
-\r
-       @Override\r
-       public PlugIn_RecDIGA_DMR_BWT650 clone() {\r
-               return (PlugIn_RecDIGA_DMR_BWT650) super.clone();\r
-       }\r
-\r
-       /* 必須コード  - ここから */\r
-       \r
-       // 種族の特性\r
-       @Override\r
-       public String getRecorderId() { return "DIGA DMR-BWT650"; }\r
-       @Override\r
-       public RecType getType() { return RecType.RECORDER; }\r
-       \r
-       @Override\r
-       protected int get_com_try_count() { return 5; }\r
-       \r
-       public PlugIn_RecDIGA_DMR_BWT650() {\r
-               super();\r
-               this.setTunerNum(3);\r
-       }\r
-       \r
-       /*\r
-        * 公開メソッド\r
-        */\r
-       \r
-       /*\r
-        * 非公開メソッド\r
-        */\r
-       \r
-       /**\r
-        * 予約全エントリを通しての処理\r
-        */\r
-       @Override\r
-       protected int _getDigaReserveList(ArrayList<ReserveList> newReserveList, String response) {\r
-               // 予約詳細を作る\r
-               Matcher mx = Pattern.compile("<table class=\"reclist\">.+?<tbody>(.+?)</tbody>",Pattern.DOTALL).matcher(response);\r
-               if ( mx.find() ) {\r
-                       Matcher ma = Pattern.compile("<tr>(.+?)</tr>",Pattern.DOTALL).matcher(mx.group(1));\r
-                       while ( ma.find() ) {\r
-                               _getDigaReserveProg(newReserveList, ma.group(1));\r
-                       }\r
-               }\r
-               return(RETCODE_SUCCESS);\r
-       }\r
-}\r

diff --git a/TinyBannavi/src/tainavi/ProgDateList.java b/TinyBannavi/src/tainavi/ProgDateList.java
index 93f9d52..30529ad 100644 (file)
--- a/TinyBannavi/src/tainavi/ProgDateList.java
+++ b/TinyBannavi/src/tainavi/ProgDateList.java
@@ -3,9 +3,9 @@ package tainavi;
 import java.util.ArrayList;\r
 \r
 public class ProgDateList {\r
-       String Date;\r
-       int row;\r
-       ArrayList<ProgDetailList> pdetail;\r
+       public String Date;\r
+       public int row;\r
+       public ArrayList<ProgDetailList> pdetail;\r
        \r
        public ProgDateList() {\r
                Date = "";\r

diff --git a/TinyBannavi/src/tainavi/ProgDetailList.java b/TinyBannavi/src/tainavi/ProgDetailList.java
index fdb98f6..7dde6e9 100644 (file)
--- a/TinyBannavi/src/tainavi/ProgDetailList.java
+++ b/TinyBannavi/src/tainavi/ProgDetailList.java
@@ -24,29 +24,29 @@ public class ProgDetailList implements Cloneable {
         *  ファイルに保存されるもの\r
         */\r
        \r
-       String title = "";                              // 分離前タイトル\r
-       String detail = "";                             // 修正前タイトル\r
+       public String title = "";                               // 分離前タイトル\r
+       public String detail = "";                              // 修正前タイトル\r
        protected String addedDetail = "";\r
        \r
-       String startDateTime = "";\r
-       String endDateTime = "";\r
-       int length = 0;                                 // 放送時間（05:00を基準とした表示上の長さ）\r
+       public String startDateTime = "";\r
+       public String endDateTime = "";\r
+       public int length = 0;                                  // 放送時間（05:00を基準とした表示上の長さ）\r
        \r
-       String link = "";\r
+       public String link = "";\r
        \r
        // ジャンル\r
-       ProgGenre genre = ProgGenre.NOGENRE;\r
-       ProgSubgenre subgenre = ProgSubgenre.NOGENRE_ETC;\r
+       public ProgGenre genre = ProgGenre.NOGENRE;\r
+       public ProgSubgenre subgenre = ProgSubgenre.NOGENRE_ETC;\r
        \r
        // フラグ・オプション関連\r
-       boolean extension = false;                                              // 延長注意\r
-       ProgFlags flag = ProgFlags.NOFLAG;                              // 新番組・最終回\r
-       ProgScrumble noscrumble = ProgScrumble.NONE;    // 有料放送だけ別枠になってしまった！\r
+       public boolean extension = false;                                               // 延長注意\r
+       public ProgFlags flag = ProgFlags.NOFLAG;                               // 新番組・最終回\r
+       public ProgScrumble noscrumble = ProgScrumble.NONE;     // 有料放送だけ別枠になってしまった！\r
        protected ArrayList<ProgOption> option = new ArrayList<ProgOption>();\r
        \r
        // 複数ジャンル対応\r
-       ArrayList<ProgGenre> genrelist = null;\r
-       ArrayList<ProgSubgenre> subgenrelist = null;\r
+       public ArrayList<ProgGenre> genrelist = null;\r
+       public ArrayList<ProgSubgenre> subgenrelist = null;\r
 \r
        /*\r
         *  ファイルには保存されないもの\r
@@ -58,52 +58,52 @@ public class ProgDetailList implements Cloneable {
         * <P>（startDateTimeの日付と同じ、ただし曜日文字がつく）\r
         */\r
        \r
-       String accurateDate = "";\r
-       String start = "";                              // hh:mm\r
-       String end = "";                                // hh:mm\r
-       int recmin = 0;                                 // 番組長（実際の長さ）\r
+       public String accurateDate = "";\r
+       public String start = "";                               // hh:mm\r
+       public String end = "";                         // hh:mm\r
+       public int recmin = 0;                                  // 番組長（実際の長さ）\r
        \r
-       String progid = "";                             // 番組ID\r
+       public String progid = "";                              // 番組ID\r
        \r
-       boolean nosyobo = false;                // しょぼのぼっち判定\r
-       boolean marked = false;                 // 検索に引っかかったマーク \r
-       boolean newarrival = false;             // 新着だなぁ\r
-       boolean modified = false;               // 詳細が更新された\r
-       boolean nonrepeated = false;    // リピート放送の初回かな？\r
-       boolean showinstandby = false;  // 予約待機への表示を行うか？\r
+       public boolean nosyobo = false;         // しょぼのぼっち判定\r
+       public boolean marked = false;                  // 検索に引っかかったマーク \r
+       public boolean newarrival = false;              // 新着だなぁ\r
+       public boolean modified = false;                // 詳細が更新された\r
+       public boolean nonrepeated = false;     // リピート放送の初回かな？\r
+       public boolean showinstandby = false;   // 予約待機への表示を行うか？\r
 \r
-       ProgType type = null;                   // Web番組表か、しょぼかるか、過去ログか\r
-       ProgSubtype subtype = null;             // サブタイプ\r
-       String center = "";                             // 放送局名\r
-       String extension_mark = "";             // ★延長注意★\r
-       String prefix_mark = "";                // (移)とか\r
-       String newlast_mark = "";               // [新]とか\r
-       String postfix_mark = "";               // [再]とか\r
-       boolean dontoverlapdown = false;// 終了時間を短縮してはだめ\r
+       public ProgType type = null;                    // Web番組表か、しょぼかるか、過去ログか\r
+       public ProgSubtype subtype = null;              // サブタイプ\r
+       public String center = "";                              // 放送局名\r
+       public String extension_mark = "";              // ★延長注意★\r
+       public String prefix_mark = "";         // (移)とか\r
+       public String newlast_mark = "";                // [新]とか\r
+       public String postfix_mark = "";                // [再]とか\r
+       public boolean dontoverlapdown = false;// 終了時間を短縮してはだめ\r
 \r
-       String splitted_title = "";             // 分離済みタイトル→これはtitleへのポインタ\r
-       String splitted_titlePop = "";  // 分離済みタイトルPOP→これはtitlePopへのポインタ\r
-       String splitted_detail = "";    // 分離済み番組詳細→detailはこれへのポインタにするよ\r
+       public String splitted_title = "";              // 分離済みタイトル→これはtitleへのポインタ\r
+       public String splitted_titlePop = "";   // 分離済みタイトルPOP→これはtitlePopへのポインタ\r
+       public String splitted_detail = "";     // 分離済み番組詳細→detailはこれへのポインタにするよ\r
        \r
-       SearchKey dynKey = null;                        // 動的検索用\r
-       String dynMatched = null;                       // 動的検索用\r
+       public SearchKey dynKey = null;                 // 動的検索用\r
+       public String dynMatched = null;                        // 動的検索用\r
 \r
        // 検索高速化用のデータ\r
        \r
        /**\r
         * キーワード検索・番組追跡で使うよ\r
         */\r
-       String titlePop = "";\r
+       public String titlePop = "";\r
        \r
        /**\r
         * キーワード検索で使うよ\r
         */\r
-       String detailPop = "";\r
+       public String detailPop = "";\r
        \r
        /**\r
         * 番組追跡で使うよ\r
         */\r
-       static boolean tracenOnlyTitle = false;\r
+       public static boolean tracenOnlyTitle = false;\r
        \r
        /*******************************************************************************\r
         * NGワード処理\r

diff --git a/TinyBannavi/src/tainavi/ProgList.java b/TinyBannavi/src/tainavi/ProgList.java
index d9f4b21..f08e473 100644 (file)
--- a/TinyBannavi/src/tainavi/ProgList.java
+++ b/TinyBannavi/src/tainavi/ProgList.java
@@ -5,15 +5,15 @@ import java.util.ArrayList;
 import tainavi.ProgDateList;\r
 \r
 public class ProgList {\r
-       String Area;\r
-       String SubArea;\r
-       String Type;\r
-       String Center;\r
-       String CenterId;\r
-       String ChId;\r
-       Color BgColor;\r
-       boolean enabled;\r
-       ArrayList<ProgDateList> pdate;\r
+       public String Area;\r
+       public String SubArea;\r
+       public String Type;\r
+       public String Center;\r
+       public String CenterId;\r
+       public String ChId;\r
+       public Color BgColor;\r
+       public boolean enabled;\r
+       public ArrayList<ProgDateList> pdate;\r
        \r
        public ProgList() {\r
                Area = "";\r

diff --git a/TinyBannavi/src/tainavi/Viewer.java b/TinyBannavi/src/tainavi/Viewer.java
index eb3f3ea..51dd3aa 100644 (file)
--- a/TinyBannavi/src/tainavi/Viewer.java
+++ b/TinyBannavi/src/tainavi/Viewer.java
@@ -4045,7 +4045,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                \r
                //\r
                ArrayList<String> recIda = new ArrayList<String>();\r
-               for ( File f : new File(CommonUtils.joinPath(new String[]{"bin","tainavi"})).listFiles() ) {\r
+               for ( File f : new File(CommonUtils.joinPath(new String[]{"bin","tainavi","pluginrec"})).listFiles() ) {\r
                        Matcher ma = Pattern.compile("^(PlugIn_Rec[^$]+)[^$]*\\.class$").matcher(f.getName());\r
                        if ( ma.find() ) {\r
                                if ( ! isMailPluginEnabled && f.getName().toLowerCase().contains("mail") ) {\r
@@ -4066,7 +4066,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                // servicesに追記\r
                StringBuilder sb = new StringBuilder();\r
                for ( String recId : recIdd ) {\r
-                       sb.append("tainavi.");\r
+                       sb.append("tainavi.pluginrec.");\r
                        sb.append(recId);\r
                        sb.append("\n");\r
                }\r
@@ -4216,7 +4216,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                 */\r
 \r
                ArrayList<String> prgIda = new ArrayList<String>();\r
-               for ( File f : new File(CommonUtils.joinPath("bin","tainavi")).listFiles() ) {\r
+               for ( File f : new File(CommonUtils.joinPath("bin","tainavi","plugintv")).listFiles() ) {\r
                        Matcher ma = Pattern.compile("^(PlugIn_(TV|CS|RAD)P[^$]+)\\.class$").matcher(f.getName());\r
                        if (ma.find()) {\r
                                prgIda.add(ma.group(1));\r
@@ -4228,7 +4228,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                // servicesに追記\r
                StringBuilder sb = new StringBuilder();\r
                for ( String prgId : prgIdd ) {\r
-                       sb.append("tainavi.");\r
+                       sb.append("tainavi.plugintv.");\r
                        sb.append(prgId);\r
                        sb.append("\n");\r
                }\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecDIGA.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA.java
index 255a0b9..991f017 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -13,6 +13,16 @@ import java.util.Locale;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.b64;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BW200.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BW200.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BW200.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BW200.java
index 2ba4e48..2ae1bd1 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BW200.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BW200.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -13,6 +13,16 @@ import java.util.Locale;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.b64;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT2100.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BWT2100.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT2100.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BWT2100.java
index 5081eb5..f37477a 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BWT2100.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BWT2100.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -12,6 +12,21 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.ContentIdREGZA;\r
+import tainavi.FieldUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.RecordedInfo;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.b64;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 // "cRECMODE" はBZT720用に追加したもの\r
 \r
 \r
@@ -1289,11 +1304,21 @@ public class PlugIn_RecDIGA_DMR_BWT2100 extends HDDRecorderUtils implements HDDR
        /**\r
         * 予約全エントリを通しての処理\r
         */\r
-       protected int _getDigaReserveList(ArrayList<ReserveList> newReserveList, String response) {\r
+       private int _getDigaReserveList(ArrayList<ReserveList> newReserveList, String response) {\r
                // 予約詳細を作る\r
-               Matcher ma = Pattern.compile("<tr class=\".*?\">(.+?)</tr>",Pattern.DOTALL).matcher(response);\r
-               while ( ma.find() ) {\r
-                       _getDigaReserveProg(newReserveList, ma.group(1));\r
+               Matcher mx = Pattern.compile("<table class=\"reclist\">.+?<tbody>(.+?)</tbody>",Pattern.DOTALL).matcher(response);\r
+               if ( mx.find() ) {\r
+                       // BWT650\r
+                       Matcher ma = Pattern.compile("<tr>(.+?)</tr>",Pattern.DOTALL).matcher(mx.group(1));\r
+                       while ( ma.find() ) {\r
+                               _getDigaReserveProg(newReserveList, ma.group(1));\r
+                       }\r
+               }\r
+               else {\r
+                       Matcher ma = Pattern.compile("<tr class=\".*?\">(.+?)</tr>",Pattern.DOTALL).matcher(response);\r
+                       while ( ma.find() ) {\r
+                               _getDigaReserveProg(newReserveList, ma.group(1));\r
+                       }\r
                }\r
                return(RETCODE_SUCCESS);\r
        }\r
@@ -1301,7 +1326,7 @@ public class PlugIn_RecDIGA_DMR_BWT2100 extends HDDRecorderUtils implements HDDR
        /**\r
         * 予約１エントリずつの処理\r
         */\r
-       protected int _getDigaReserveProg(ArrayList<ReserveList> newReserveList, String progdata) {\r
+       private int _getDigaReserveProg(ArrayList<ReserveList> newReserveList, String progdata) {\r
                \r
                ReserveList reqr = new ReserveList();\r
                \r
@@ -1684,22 +1709,16 @@ public class PlugIn_RecDIGA_DMR_BWT2100 extends HDDRecorderUtils implements HDDR
                                }\r
                        }\r
                }\r
-               /*\r
-               if ( channel.length() == 0 ) {\r
-                       System.err.println("CHコードがみつかりませんでした.");\r
-                       return(null);\r
-               }\r
-               else if ( ch_name.length() == 0 ) {\r
-                       System.err.println("CHコードをWeb番組表の放送局名に変換できませんでした: CHコード="+channel);\r
-                       return(null);\r
-               }\r
-               */\r
                \r
                // パターン\r
                ma = Pattern.compile("<td width=\"92\" class=\"s_F16_Cffffff\">毎週</td>(.+?)</tr>",Pattern.DOTALL).matcher(response);\r
                if ( ! ma.find()) {\r
-                       System.err.println(ERRID+"予約パターン情報がみつかりません");\r
-                       return(null);\r
+                       // BWT650\r
+                       ma = Pattern.compile("<td width=\"20%\">毎週</td>(.+?)</tr>",Pattern.DOTALL).matcher(response);\r
+                       if ( ! ma.find()) {\r
+                               System.err.println(ERRID+"予約パターン情報がみつかりません");\r
+                               return(null);\r
+                       }\r
                }\r
                String rec_pattern = _recpatternDG2RDstr(ma.group(1), yy, mm, dd, ahh);\r
                \r
@@ -2100,8 +2119,19 @@ public class PlugIn_RecDIGA_DMR_BWT2100 extends HDDRecorderUtils implements HDDR
                int rptn = 0;\r
                int rptcnt = 0;\r
                for ( int c=0; c < DIGA_WDPTNSTR.length; c++ ) {\r
+                       boolean checked = false;\r
                        Matcher ma = Pattern.compile("name=\""+DIGA_WDPTNSTR[c]+"\" value=\"[^\"]+?\" checked").matcher(source);\r
-                       if ( ma.find() ) {\r
+                       if ( checked = ma.find() ) {\r
+                               //\r
+                       }\r
+                       else {\r
+                               // BWT650\r
+                               ma = Pattern.compile("value=\"[^\"]+?\" name=\""+DIGA_WDPTNSTR[c]+"\" checked").matcher(source);\r
+                               if ( checked = ma.find() ) {\r
+                                       //\r
+                               }\r
+                       }\r
+                       if ( checked ) {\r
                                rptn |= (0x01<<c);\r
                                rptcnt++;\r
                        }\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT710.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT710.java
similarity index 82%
rename from TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT710.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT710.java
index 9db283c..030b7db 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT710.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT710.java
@@ -1,4 +1,7 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
+\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorder.RecType;\r
 \r
 \r
 /*\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT720.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT720.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT720.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT720.java
index 9250d31..589c91a 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecDIGA_DMR_BZT720.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDIGA_DMR_BZT720.java
@@ -1,7 +1,10 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.HashMap;\r
 \r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecGoogleCalendar.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecGoogleCalendar.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecGoogleCalendar.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecGoogleCalendar.java
index 21652cc..6d8abf8 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecGoogleCalendar.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecGoogleCalendar.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.net.URL;\r
 import java.util.ArrayList;\r
@@ -7,6 +7,14 @@ import java.util.GregorianCalendar;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 import com.google.gdata.client.calendar.CalendarQuery;\r
 import com.google.gdata.client.calendar.CalendarService;\r
 import com.google.gdata.data.DateTime;\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_A600.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_A600.java
index d79d18a..f10f06f 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_A600.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_A600.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_BR610.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BR610.java
similarity index 90%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_BR610.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BR610.java
index 57d9855..1db2445 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_BR610.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BR610.java
@@ -1,9 +1,13 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+\r
 public class PlugIn_RecRD_BR610 extends PlugIn_RecRD_BZ700 implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_BR610 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ700.java
similarity index 96%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ700.java
index 6af1298..dd9afa9 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ700.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ700.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -10,6 +10,18 @@ import java.util.LinkedHashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /**\r
  * REGZA RD-BZ700用のレコーダプラグインです。\r
  * @author original:番ナビスレ12・102氏\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810.java
similarity index 91%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810.java
index f3205bf..3367654 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810.java
@@ -1,9 +1,13 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+\r
 public class PlugIn_RecRD_BZ810 extends PlugIn_RecRD_BZ700 implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_BZ810 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810_TSync.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810_TSync.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810_TSync.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810_TSync.java
index b0abf0f..d9c0df4 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_BZ810_TSync.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_BZ810_TSync.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
@@ -11,6 +11,14 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 public class PlugIn_RecRD_BZ810_TSync extends HDDRecorderUtils implements HDDRecorder,Cloneable {\r
        \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_E300.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_E300.java
index 2b8298f..5cb73dc 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_E300.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_E300.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,19 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_EDCB.java
similarity index 96%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_EDCB.java
index 8b72967..0a033fb 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_EDCB.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -12,6 +12,22 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;\r
 \r
 import taiSync.ReserveInfo;\r
+import tainavi.AutoReserveInfo;\r
+import tainavi.AutoReserveInfoList;\r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.ContentIdREGZA;\r
+import tainavi.Env;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.RecordedInfo;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
 import tainavi.TVProgram.ProgGenre;\r
 import tainavi.TVProgram.ProgSubgenre;\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_H1.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1.java
similarity index 91%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_H1.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1.java
index 371620b..9a7acaa 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_H1.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1.java
@@ -1,9 +1,14 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TraceProgram;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_H1EX.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1EX.java
similarity index 91%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_H1EX.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1EX.java
index ddacd83..8bc9f6d 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_H1EX.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H1EX.java
@@ -1,9 +1,14 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TraceProgram;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_H2.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H2.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_H2.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H2.java
index b3bbbdf..feff261 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_H2.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_H2.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.net.Authenticator;\r
@@ -7,6 +7,13 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_M190.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_M190.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_M190.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_M190.java
index a5f9f7a..251175d 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_M190.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_M190.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.net.Authenticator;\r
@@ -9,6 +9,16 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+\r
 \r
 /**\r
  * REGZAテレビ系\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL.java
similarity index 93%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL.java
index 480500e..9497bb3 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
@@ -21,6 +21,14 @@ import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;\r
 import javax.mail.internet.MimeMessage;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 public class PlugIn_RecRD_MAIL extends HDDRecorderUtils implements HDDRecorder,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_M190.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_M190.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_M190.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_M190.java
index 15447da..58877a1 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_M190.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_M190.java
@@ -1,8 +1,12 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+\r
 public class PlugIn_RecRD_MAIL_M190 extends PlugIn_RecRD_MAIL implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_MAIL_M190 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_RE2.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_RE2.java
similarity index 86%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_RE2.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_RE2.java
index d32037e..1f60cd6 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_RE2.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_RE2.java
@@ -1,8 +1,12 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+\r
 public class PlugIn_RecRD_MAIL_RE2 extends PlugIn_RecRD_MAIL_Z9500 implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_MAIL_RE2 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z1.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z1.java
similarity index 86%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z1.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z1.java
index 3f40fa5..0826510 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z1.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z1.java
@@ -1,8 +1,12 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+\r
 public class PlugIn_RecRD_MAIL_Z1 extends PlugIn_RecRD_MAIL_Z9500 implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_MAIL_Z1 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z3.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z3.java
similarity index 86%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z3.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z3.java
index 1de005e..d00b764 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z3.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z3.java
@@ -1,8 +1,12 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+\r
 public class PlugIn_RecRD_MAIL_Z3 extends PlugIn_RecRD_MAIL_Z9500 implements HDDRecorder,Cloneable {\r
 \r
        @Override\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z9500.java
similarity index 93%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z9500.java
index 35e1158..9affd0b 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_MAIL_Z9500.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_MAIL_Z9500.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
@@ -21,6 +21,14 @@ import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;\r
 import javax.mail.internet.MimeMessage;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 public class PlugIn_RecRD_MAIL_Z9500 extends HDDRecorderUtils implements HDDRecorder,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_NULL.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_NULL.java
similarity index 93%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_NULL.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_NULL.java
index e8acc47..6f01142 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_NULL.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_NULL.java
@@ -1,7 +1,15 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_S1004K.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S1004K.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_S1004K.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S1004K.java
index 134eead..a6dc181 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_S1004K.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S1004K.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
@@ -11,6 +11,14 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 public class PlugIn_RecRD_S1004K extends HDDRecorderUtils implements HDDRecorder,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S304K.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S304K.java
index 0332d52..2ae3310 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_S304K.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S304K.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S600.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S600.java
index 56ae305..0434056 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_S600.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_S600.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,19 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_TVTest.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TVTest.java
similarity index 93%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_TVTest.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TVTest.java
index 090ac8d..3ef9eb2 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_TVTest.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TVTest.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.IOException;\r
@@ -6,6 +6,15 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 /**\r
  * TVTestで視聴するプラグイン\r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TvRock.java
similarity index 96%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TvRock.java
index c5a8c01..bdadf0d 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_TvRock.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -11,6 +11,21 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.BroadcastType;\r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.ContentIdREGZA;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.RecordedInfo;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+\r
 \r
 /**\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_X5.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_X5.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5.java
index 608f093..b7a9cef 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_X5.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /**\r
  * RD-X5だよー\r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_X5EX.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5EX.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_X5EX.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5EX.java
index 34b0773..e7bc612 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_X5EX.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X5EX.java
@@ -1,9 +1,14 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TraceProgram;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X8.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X8.java
index 7f514eb..ff69d5f 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_X8.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_X8.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS41.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS41.java
index 977fd27..b99380a 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS41.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS41.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS57.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS57.java
index b2322f7..ace75fb 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_XS57.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_XS57.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -9,6 +9,18 @@ import java.util.Hashtable;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 /*\r
  * \r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z160.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_Z160.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160.java
index ca9379c..fc6a838 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z160.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160.java
@@ -1,7 +1,10 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.ArrayList;\r
 \r
+import tainavi.HDDRecorder;\r
+import tainavi.TextValueSet;\r
+\r
 public class PlugIn_RecRD_Z160 extends PlugIn_RecRD_Z260 implements HDDRecorder,Cloneable {\r
 \r
        public PlugIn_RecRD_Z160 clone() {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z160_TSync.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160_TSync.java
similarity index 84%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_Z160_TSync.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160_TSync.java
index 1ea72c2..99cf47f 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z160_TSync.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z160_TSync.java
@@ -1,4 +1,6 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
+\r
+import tainavi.HDDRecorder;\r
 \r
 \r
 public class PlugIn_RecRD_Z160_TSync extends PlugIn_RecRD_BZ810_TSync implements HDDRecorder,Cloneable {\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z260.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z260.java
index 7d86f50..7e23492 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_Z260.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_Z260.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -10,6 +10,19 @@ import java.util.LinkedHashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.GetRDStatus;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TextValueSet;\r
+import tainavi.TraceProgram;\r
+import tainavi.HDDRecorder.RecType;\r
+import tainavi.HDDRecorderUtils.MyAuthenticator;\r
+import tainavi.TVProgram.ProgGenre;\r
+\r
 \r
 /*\r
  *\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG.java
index f2ee5fd..cacafd0 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.io.BufferedWriter;\r
 import java.io.File;\r
@@ -10,6 +10,14 @@ import java.io.UnsupportedEncodingException;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.ChannelCode;\r
+import tainavi.CommonUtils;\r
+import tainavi.HDDRecorder;\r
+import tainavi.HDDRecorderUtils;\r
+import tainavi.ReserveList;\r
+import tainavi.TextValueSet;\r
+import tainavi.HDDRecorder.RecType;\r
+\r
 \r
 /*\r
  * \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG2.java
similarity index 90%
rename from TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java
rename to TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG2.java
index 5f8938c..c8f6954 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_RecRD_iEPG2.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_iEPG2.java
@@ -1,8 +1,18 @@
-package tainavi;\r
+package tainavi.pluginrec;\r
 \r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 \r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.ContentIdREGZA;\r
+import tainavi.HDDRecorder;\r
+import tainavi.ReserveList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgGenre;\r
+import tainavi.TVProgram.ProgSubgenre;\r
+\r
 /**\r
  * EPGデジタルのプラグイン\r
  */\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPDimora.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPDimora.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_CSPDimora.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPDimora.java
index 97b35da..2cdcbbd 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPDimora.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPDimora.java
@@ -1,8 +1,14 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
+\r
 \r
 public class PlugIn_CSPDimora extends PlugIn_TVPDimora implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPSkyperfectTV2012.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPSkyperfectTV2012.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_CSPSkyperfectTV2012.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPSkyperfectTV2012.java
index cbef943..fbd3c63 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPSkyperfectTV2012.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPSkyperfectTV2012.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.io.UnsupportedEncodingException;\r
@@ -11,6 +11,21 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TVProgram.ProgGenre;\r
+import tainavi.TVProgram.ProgOption;\r
+import tainavi.TVProgram.ProgSubgenre;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_CSPSkyperfectTV2012 extends TVProgramUtils implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom.java
similarity index 88%
rename from TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom.java
index bee7883..8c072f8 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom.java
@@ -1,9 +1,14 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.Center;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_CSPTVKingdom extends PlugIn_CSPTVKingdom110 implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom110.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom110.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
index 7c43e6c..6b6d4ab 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPTVKingdom110.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -9,6 +9,16 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
+\r
 \r
 public class PlugIn_CSPTVKingdom110 extends PlugIn_TVPTVKingdom implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionA.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionA.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionA.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionA.java
index 614fc4a..c17e607 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionA.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionA.java
@@ -1,8 +1,17 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
+\r
 \r
 public class PlugIn_CSPtheTelevisionA extends PlugIn_TVPtheTelevision implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionD.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionD.java
similarity index 92%
rename from TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionD.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionD.java
index 7a58665..5194a28 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_CSPtheTelevisionD.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPtheTelevisionD.java
@@ -1,8 +1,17 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
+\r
 \r
 public class PlugIn_CSPtheTelevisionD extends PlugIn_TVPtheTelevision implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_TVPDimora.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_TVPDimora.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
index 79556a0..ded8668 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_TVPDimora.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -10,6 +10,18 @@ import java.util.LinkedHashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_TVPDimora extends TVProgramUtils implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_TVPEDCB.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPEDCB.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_TVPEDCB.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_TVPEDCB.java
index 5332c2a..05da634 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_TVPEDCB.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPEDCB.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -10,7 +10,20 @@ import java.util.HashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdEDCB;\r
+import tainavi.MapCtrl;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TatCount;\r
 import tainavi.MapCtrl.KeyType;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
 \r
 import epgdump.EIT_CONTROL;\r
 import epgdump.Epgdump;\r

diff --git a/TinyBannavi/src/tainavi/PlugIn_TVPTVGuide.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVGuide.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_TVPTVGuide.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVGuide.java
index dd1f878..f51282e 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_TVPTVGuide.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVGuide.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -10,6 +10,21 @@ import java.util.LinkedHashMap;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TVProgram.ProgFlags;\r
+import tainavi.TVProgram.ProgGenre;\r
+import tainavi.TVProgram.ProgOption;\r
+import tainavi.TVProgram.ProgScrumble;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_TVPTVGuide extends TVProgramUtils implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_TVPTVKingdom.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java
similarity index 95%
rename from TinyBannavi/src/tainavi/PlugIn_TVPTVKingdom.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java
index 42f7e76..316b9c8 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_TVPTVKingdom.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -11,6 +11,20 @@ import java.util.Locale;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TVProgram.ProgGenre;\r
+import tainavi.TVProgram.ProgSubgenre;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_TVPTVKingdom extends TVProgramUtils implements TVProgram,Cloneable {\r
 \r

diff --git a/TinyBannavi/src/tainavi/PlugIn_TVPtheTelevision.java b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPtheTelevision.java
similarity index 94%
rename from TinyBannavi/src/tainavi/PlugIn_TVPtheTelevision.java
rename to TinyBannavi/src/tainavi/plugintv/PlugIn_TVPtheTelevision.java
index 2b55912..b2f7b91 100644 (file)
--- a/TinyBannavi/src/tainavi/PlugIn_TVPtheTelevision.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPtheTelevision.java
@@ -1,4 +1,4 @@
-package tainavi;\r
+package tainavi.plugintv;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -9,6 +9,22 @@ import java.util.Locale;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
+import tainavi.AreaCode;\r
+import tainavi.Center;\r
+import tainavi.CommonUtils;\r
+import tainavi.ContentIdDIMORA;\r
+import tainavi.ProgDateList;\r
+import tainavi.ProgDetailList;\r
+import tainavi.ProgList;\r
+import tainavi.TVProgram;\r
+import tainavi.TVProgramUtils;\r
+import tainavi.TVProgram.ProgFlags;\r
+import tainavi.TVProgram.ProgGenre;\r
+import tainavi.TVProgram.ProgOption;\r
+import tainavi.TVProgram.ProgScrumble;\r
+import tainavi.TVProgram.ProgSubtype;\r
+import tainavi.TVProgram.ProgType;\r
+\r
 \r
 public class PlugIn_TVPtheTelevision extends TVProgramUtils implements TVProgram,Cloneable {\r
 \r