番組追跡、キーワード検索の重複登録問題の改善

diff --git a/TinyBannavi/05_history.txt b/TinyBannavi/05_history.txt
index f59b27c..eadd983 100644 (file)
--- a/TinyBannavi/05_history.txt
+++ b/TinyBannavi/05_history.txt
@@ -27,6 +27,11 @@
 　・(ツールバー[予約一覧取得]) プルダウンメニューのアイテムで、設定が「常に取得しない」になっているものは赤字で強調するようにした\r
 　・(ツールバー[予約一覧取得]) プルダウンメニューのアイテムに「予約一覧＋予約詳細のみ取得」を追加\r
 　・(web番組表対応[スカパー！]) サブジャンルと字幕フラグの取得に対応\r
+　・(番組追跡、キーワード検索、延長警告管理) 重複登録をブロックするロジックを適正化\r
+　・(番組追跡、キーワード検索) リスト編集でのソート機能（ボタン）を追加\r
+　・(番組追跡) 新規登録時、タイトルからサブタイトルを削除する機能（ボタン）を追加\r
+　・(キーワード検索) テーブル上の条件行の編集方法の改善\r
+　・(りもこん、ステータスビュー) "DBR-Z*"のレコーダIDを持つレコーダも選択対象となるようにした(>>497.)\r
 ■バグ修正\r
 　・(その他) SwingWorkerで生成したサブスレッド内で想定外のruntime exceptionが発生するとサブスレッドがログも出さずに死んでしまってエラー原因を調査できなかったが、ログが出るように仕掛けをしたのでその仕掛けがうまく動くようなら今後改善が進んでいくはず\r
 　・(予約ダイアログ) 類似予約テーブルで「類似予約を選択しない」を選んでも、番組ID取得ボタンがリセットされない場合がある問題を修正\r

diff --git a/TinyBannavi/env/keyword.xml b/TinyBannavi/env/keyword.xml
index c5c8107..57dacbb 100644 (file)
--- a/TinyBannavi/env/keyword.xml
+++ b/TinyBannavi/env/keyword.xml
@@ -635,10 +635,10 @@
      <string>1</string> 
     </void> 
     <void property="contain"> 
-     <string>0 0       0       0       0       </string> 
+     <string>0 0       0       0       0       0       </string> 
     </void> 
     <void property="keyword"> 
-     <string>下野紘 後藤邑子    田村睦心    日笠陽子    井上麻里奈 </string> 
+     <string>下野紘 梶裕貴       後藤邑子    田村睦心    日笠陽子    井上麻里奈 </string> 
     </void> 
     <void property="label"> 
      <string>声優</string> 
@@ -647,7 +647,7 @@
      <string>★★★★</string> 
     </void> 
     <void property="target"> 
-     <string>0 0       0       0       0       </string> 
+     <string>0 0       0       0       0       0       </string> 
     </void> 
    </object> 
   </void> 
@@ -676,5 +676,27 @@
     </void> 
    </object> 
   </void> 
+  <void method="add"> 
+   <object class="tainavi.SearchKey"> 
+    <void property="condition"> 
+     <string>0</string> 
+    </void> 
+    <void property="contain"> 
+     <string>0 0       </string> 
+    </void> 
+    <void property="keyword"> 
+     <string>はじめの一歩【連日】#55−56    ファミリー劇場   </string> 
+    </void> 
+    <void property="label"> 
+     <string>はじめの一歩【連日】</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="target"> 
+     <string>1 3       </string> 
+    </void> 
+   </object> 
+  </void> 
  </object> 
 </java> 

diff --git a/TinyBannavi/env/tracekey.xml b/TinyBannavi/env/tracekey.xml
index bd7e02c..416d7c3 100644 (file)
--- a/TinyBannavi/env/tracekey.xml
+++ b/TinyBannavi/env/tracekey.xml
@@ -4,13 +4,13 @@
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳã\83\95ã\82¸</string> 
+     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82¸ã\83£ã\83\91ã\82³ã\83³ (ＢＳã\83\95ã\82¸)</string> 
+     <string>&lt;ç\89©èª\9e&gt;ã\82·ã\83ªã\83¼ã\82ºã\80\80ã\82»ã\82«ã\83³ã\83\89ã\82·ã\83¼ã\82ºã\83³ (ＴＯＫＹＯã\80\80ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -18,63 +18,61 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>シヤ</string> 
+       <string>&lt;物</string> 
       </void> 
       <void method="add"> 
-       <string>ヤハ</string> 
+       <string>物語</string> 
       </void> 
       <void method="add"> 
-       <string>ハコ</string> 
+       <string>語&gt;</string> 
       </void> 
       <void method="add"> 
-       <string>コン</string> 
+       <string>&gt;シ</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>シヤハコン</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＮＨＫ Ｅテレ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>黒魔女 (ＮＨＫ Ｅテレ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>黒魔</string> 
+       <string>シリ</string> 
       </void> 
       <void method="add"> 
-       <string>魔女</string> 
+       <string>リス</string> 
+      </void> 
+      <void method="add"> 
+       <string>スセ</string> 
+      </void> 
+      <void method="add"> 
+       <string>セカ</string> 
+      </void> 
+      <void method="add"> 
+       <string>カン</string> 
+      </void> 
+      <void method="add"> 
+       <string>ント</string> 
+      </void> 
+      <void method="add"> 
+       <string>トシ</string> 
+      </void> 
+      <void method="add"> 
+       <string>シス</string> 
+      </void> 
+      <void method="add"> 
+       <string>スン</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>é»\92é­\94女</string> 
+     <string>&lt;ç\89©èª\9e&gt;ã\82·ã\83ªã\82¹ã\82»ã\82«ã\83³ã\83\88ã\82·ã\82¹ã\83³</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>日本テレビ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>HUNTER×HUNTER (日本テレビ)</string> 
+     <string>&lt;物語&gt;シリーズセカンドシーズン (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -82,90 +80,61 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>HU</string> 
-      </void> 
-      <void method="add"> 
-       <string>UN</string> 
-      </void> 
-      <void method="add"> 
-       <string>NT</string> 
+       <string>&lt;物</string> 
       </void> 
       <void method="add"> 
-       <string>TE</string> 
+       <string>物語</string> 
       </void> 
       <void method="add"> 
-       <string>ER</string> 
+       <string>語&gt;</string> 
       </void> 
       <void method="add"> 
-       <string>R×</string> 
+       <string>&gt;シ</string> 
       </void> 
       <void method="add"> 
-       <string>×H</string> 
+       <string>シリ</string> 
       </void> 
       <void method="add"> 
-       <string>HU</string> 
+       <string>リス</string> 
       </void> 
       <void method="add"> 
-       <string>UN</string> 
+       <string>スセ</string> 
       </void> 
       <void method="add"> 
-       <string>NT</string> 
+       <string>セカ</string> 
       </void> 
       <void method="add"> 
-       <string>TE</string> 
+       <string>カン</string> 
       </void> 
       <void method="add"> 
-       <string>ER</string> 
+       <string>ント</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>HUNTER×HUNTER</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>日本テレビ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>60</int> 
-    </void> 
-    <void property="label"> 
-     <string>宇宙兄弟 (日本テレビ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>宇宙</string> 
+       <string>トシ</string> 
       </void> 
       <void method="add"> 
-       <string>宙兄</string> 
+       <string>シス</string> 
       </void> 
       <void method="add"> 
-       <string>兄弟</string> 
+       <string>スン</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>宇宙兄弟</string> 
+     <string>&lt;物語&gt;シリスセカントシスン</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>日本テレビ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ちはやふる2 (日本テレビ)</string> 
+     <string>Fate/kaleid liner プリズマ☆イリヤ (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -173,140 +142,91 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>チハ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ハヤ</string> 
+       <string>FA</string> 
       </void> 
       <void method="add"> 
-       <string>ヤフ</string> 
+       <string>AT</string> 
       </void> 
       <void method="add"> 
-       <string>フル</string> 
+       <string>TE</string> 
       </void> 
       <void method="add"> 
-       <string>ル2</string> 
+       <string>E/</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>チハヤフル2</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>テレビ朝日</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>ドキドキ!プリキュア (テレビ朝日)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>トキ</string> 
+       <string>/K</string> 
       </void> 
       <void method="add"> 
-       <string>キト</string> 
+       <string>KA</string> 
       </void> 
       <void method="add"> 
-       <string>トキ</string> 
+       <string>AL</string> 
       </void> 
       <void method="add"> 
-       <string>キ!</string> 
+       <string>LE</string> 
       </void> 
       <void method="add"> 
-       <string>!フ</string> 
+       <string>EI</string> 
       </void> 
       <void method="add"> 
-       <string>フリ</string> 
+       <string>ID</string> 
       </void> 
       <void method="add"> 
-       <string>リキ</string> 
+       <string>DL</string> 
       </void> 
       <void method="add"> 
-       <string>キユ</string> 
+       <string>LI</string> 
       </void> 
       <void method="add"> 
-       <string>ユア</string> 
+       <string>IN</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>トキトキ!フリキユア</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＴＢＳテレビ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>宇宙戦艦ヤマト2199 (ＴＢＳテレビ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>宇宙</string> 
+       <string>NE</string> 
       </void> 
       <void method="add"> 
-       <string>宙戦</string> 
+       <string>ER</string> 
       </void> 
       <void method="add"> 
-       <string>戦艦</string> 
+       <string>Rフ</string> 
       </void> 
       <void method="add"> 
-       <string>艦ヤ</string> 
+       <string>フリ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¤ã\83\9e</string> 
+       <string>ã\83ªã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9eã\83\88</string> 
+       <string>ã\82¹ã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\882</string> 
+       <string>ã\83\9eâ\98\86</string> 
       </void> 
       <void method="add"> 
-       <string>21</string> 
+       <string>☆イ</string> 
       </void> 
       <void method="add"> 
-       <string>19</string> 
+       <string>イリ</string> 
       </void> 
       <void method="add"> 
-       <string>99</string> 
+       <string>リヤ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>宇宙戦艦ヤマト2199</string> 
+     <string>FATE/KALEIDLINERフリスマ☆イリヤ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＢＳã\83\86ã\83¬ã\83\93</string> 
+     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>やはり俺の青春ラブコメはまちがっている。 (ＴＢＳテレビ)</string> 
+     <string>Fate　kaleid　liner　プリズマ☆イリヤ (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -314,79 +234,88 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ヤハ</string> 
+       <string>FA</string> 
+      </void> 
+      <void method="add"> 
+       <string>AT</string> 
+      </void> 
+      <void method="add"> 
+       <string>TE</string> 
       </void> 
       <void method="add"> 
-       <string>ハリ</string> 
+       <string>EK</string> 
       </void> 
       <void method="add"> 
-       <string>リ俺</string> 
+       <string>KA</string> 
       </void> 
       <void method="add"> 
-       <string>俺ノ</string> 
+       <string>AL</string> 
       </void> 
       <void method="add"> 
-       <string>ノ青</string> 
+       <string>LE</string> 
       </void> 
       <void method="add"> 
-       <string>青春</string> 
+       <string>EI</string> 
       </void> 
       <void method="add"> 
-       <string>春ラ</string> 
+       <string>ID</string> 
       </void> 
       <void method="add"> 
-       <string>ラフ</string> 
+       <string>DL</string> 
       </void> 
       <void method="add"> 
-       <string>フコ</string> 
+       <string>LI</string> 
       </void> 
       <void method="add"> 
-       <string>コメ</string> 
+       <string>IN</string> 
       </void> 
       <void method="add"> 
-       <string>メハ</string> 
+       <string>NE</string> 
       </void> 
       <void method="add"> 
-       <string>ハマ</string> 
+       <string>ER</string> 
       </void> 
       <void method="add"> 
-       <string>マチ</string> 
+       <string>Rフ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\81ã\82«</string> 
+       <string>ã\83\95ã\83ª</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83\84</string> 
+       <string>ã\83ªã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\84ã\83\86</string> 
+       <string>ã\82¹ã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\83\9eâ\98\86</string> 
       </void> 
       <void method="add"> 
-       <string>イル</string> 
+       <string>☆イ</string> 
       </void> 
       <void method="add"> 
-       <string>ル.</string> 
+       <string>イリ</string> 
+      </void> 
+      <void method="add"> 
+       <string>リヤ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ヤハリ俺ノ青春ラフコメハマチカツテイル.</string> 
+     <string>FATEKALEIDLINERフリスマ☆イリヤ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＢＳテレビ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>フォトカノ (ＴＢＳテレビ)</string> 
+     <string>Free! (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -394,34 +323,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>フオ</string> 
+       <string>FR</string> 
       </void> 
       <void method="add"> 
-       <string>オト</string> 
+       <string>RE</string> 
       </void> 
       <void method="add"> 
-       <string>トカ</string> 
+       <string>EE</string> 
       </void> 
       <void method="add"> 
-       <string>カノ</string> 
+       <string>E!</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>フオトカノ</string> 
+     <string>FREE!</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＢＳã\83\86ã\83¬ã\83\93</string> 
+     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>革命機ヴァルヴレイヴ (ＴＢＳテレビ)</string> 
+     <string>Free! (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -429,49 +358,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>革命</string> 
-      </void> 
-      <void method="add"> 
-       <string>命機</string> 
-      </void> 
-      <void method="add"> 
-       <string>機ウ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ウア</string> 
-      </void> 
-      <void method="add"> 
-       <string>アル</string> 
-      </void> 
-      <void method="add"> 
-       <string>ルウ</string> 
+       <string>FR</string> 
       </void> 
       <void method="add"> 
-       <string>ウレ</string> 
+       <string>RE</string> 
       </void> 
       <void method="add"> 
-       <string>レイ</string> 
+       <string>EE</string> 
       </void> 
       <void method="add"> 
-       <string>イウ</string> 
+       <string>E!</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>革命機ウアルウレイウ</string> 
+     <string>FREE!</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＢＳテレビ</string> 
+     <string>日本テレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>DEVIL　SURVIVOR2　the　ANIMATION (ＴＢＳテレビ)</string> 
+     <string>HUNTER×HUNTER (日本テレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -479,100 +393,146 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>DE</string> 
-      </void> 
-      <void method="add"> 
-       <string>EV</string> 
-      </void> 
-      <void method="add"> 
-       <string>VI</string> 
-      </void> 
-      <void method="add"> 
-       <string>IL</string> 
-      </void> 
-      <void method="add"> 
-       <string>LS</string> 
-      </void> 
-      <void method="add"> 
-       <string>SU</string> 
-      </void> 
-      <void method="add"> 
-       <string>UR</string> 
-      </void> 
-      <void method="add"> 
-       <string>RV</string> 
+       <string>HU</string> 
       </void> 
       <void method="add"> 
-       <string>VI</string> 
+       <string>UN</string> 
       </void> 
       <void method="add"> 
-       <string>IV</string> 
+       <string>NT</string> 
       </void> 
       <void method="add"> 
-       <string>VO</string> 
+       <string>TE</string> 
       </void> 
       <void method="add"> 
-       <string>OR</string> 
+       <string>ER</string> 
       </void> 
       <void method="add"> 
-       <string>R2</string> 
+       <string>R×</string> 
       </void> 
       <void method="add"> 
-       <string>2T</string> 
+       <string>×H</string> 
       </void> 
       <void method="add"> 
-       <string>TH</string> 
+       <string>HU</string> 
       </void> 
       <void method="add"> 
-       <string>HE</string> 
+       <string>UN</string> 
       </void> 
       <void method="add"> 
-       <string>EA</string> 
+       <string>NT</string> 
       </void> 
       <void method="add"> 
-       <string>AN</string> 
+       <string>TE</string> 
       </void> 
       <void method="add"> 
-       <string>NI</string> 
+       <string>ER</string> 
       </void> 
-      <void method="add"> 
-       <string>IM</string> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>HUNTER×HUNTER</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>BSイレブン</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>きんいろモザイク (BSイレブン)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <string>キン</string> 
       </void> 
       <void method="add"> 
-       <string>MA</string> 
+       <string>ンイ</string> 
       </void> 
       <void method="add"> 
-       <string>AT</string> 
+       <string>イロ</string> 
       </void> 
       <void method="add"> 
-       <string>TI</string> 
+       <string>ロモ</string> 
       </void> 
       <void method="add"> 
-       <string>IO</string> 
+       <string>モサ</string> 
       </void> 
       <void method="add"> 
-       <string>ON</string> 
+       <string>サイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イク</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>DEVILSURVIVOR2THEANIMATION</string> 
+     <string>キンイロモサイク</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
-    <void property="disableRepeat"> 
-     <boolean>true</boolean> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>きんいろモザイク (ＴＯＫＹＯ　ＭＸ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <string>キン</string> 
+      </void> 
+      <void method="add"> 
+       <string>ンイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イロ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ロモ</string> 
+      </void> 
+      <void method="add"> 
+       <string>モサ</string> 
+      </void> 
+      <void method="add"> 
+       <string>サイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イク</string> 
+      </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>キンイロモサイク</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82«ã\83¼ã\83\89ã\83\95ã\82¡ã\82¤ã\83\88!!ã\83´ã\82¡ã\83³ã\82¬ã\83¼ã\83\89ã\80\80ã\83ªã\83³ã\82¯ã\82¸ã\83§ã\83¼ã\82«ã\83¼ç·¨ã\80\8cç\8b\99ã\82\8fã\82\8cã\81\9fã\82¢ã\82¤ã\83\89ã\83«ã\80\8d (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
+     <string>ã\81\92ã\82\93ã\81\97ã\81\91ã\82\93äº\8c代ç\9b® (ＴＯＫＹＯã\80\80ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -580,109 +540,155 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\82«ã\83\88</string> 
+       <string>ã\82±ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83\95</string> 
+       <string>ã\83³ã\82·</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\82¢</string> 
+       <string>ã\82·ã\82±</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\82¤</string> 
+       <string>ã\82±ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83\88</string> 
+       <string>ã\83³2</string> 
       </void> 
       <void method="add"> 
-       <string>ト!</string> 
+       <string>2代</string> 
       </void> 
       <void method="add"> 
-       <string>!!</string> 
+       <string>代目</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>ケンシケン2代目</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>たまゆら～もあぐれっしぶ～ (ＴＯＫＹＯ　ＭＸ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>!ウ</string> 
+       <string>タマ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¦ã\82¢</string> 
+       <string>ã\83\9eã\83¦</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\83³</string> 
+       <string>ã\83¦ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82«</string> 
+       <string>ã\83©~</string> 
       </void> 
       <void method="add"> 
-       <string>カト</string> 
+       <string>~モ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83ª</string> 
+       <string>ã\83¢ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\83³</string> 
+       <string>ã\82¢ã\82¯</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82¯</string> 
+       <string>ã\82¯ã\83¬</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¯ã\82·</string> 
+       <string>ã\83¬ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\83¨</string> 
+       <string>ã\83\84ã\82·</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¨ã\82«</string> 
+       <string>ã\82·ã\83\95</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ç·¨</string> 
+       <string>ã\83\95~</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>タマユラ~モアクレツシフ~</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>BSイレブン</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>とある科学の超電磁砲S (BSイレブン)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>編[</string> 
+       <string>トア</string> 
       </void> 
       <void method="add"> 
-       <string>[狙</string> 
+       <string>アル</string> 
       </void> 
       <void method="add"> 
-       <string>狙ワ</string> 
+       <string>ル科</string> 
       </void> 
       <void method="add"> 
-       <string>ワレ</string> 
+       <string>科学</string> 
       </void> 
       <void method="add"> 
-       <string>レタ</string> 
+       <string>学ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\82¢</string> 
+       <string>ã\83\8eè¶\85</string> 
       </void> 
       <void method="add"> 
-       <string>アイ</string> 
+       <string>超電</string> 
       </void> 
       <void method="add"> 
-       <string>イト</string> 
+       <string>電磁</string> 
       </void> 
       <void method="add"> 
-       <string>トル</string> 
+       <string>磁砲</string> 
       </void> 
       <void method="add"> 
-       <string>ル]</string> 
+       <string>砲S</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\82«ã\83\88ã\83\95ã\82¢ã\82¤ã\83\88!!ã\82¦ã\82¢ã\83³ã\82«ã\83\88ã\83ªã\83³ã\82¯ã\82·ã\83¨ã\82«ç·¨[ç\8b\99ã\83¯ã\83¬ã\82¿ã\82¢ã\82¤ã\83\88ã\83«]</string> 
+     <string>ã\83\88ã\82¢ã\83«ç§\91å­¦ã\83\8eè¶\85é\9b»ç£\81ç ²S</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>60</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83\97ã\83ªã\83\86ã\82£ã\83¼ã\83ªã\82ºã\83 ã\83»ã\83¬ã\82¤ã\83³ã\83\9cã\83¼ã\83©ã\82¤ã\83\96 (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
+     <string>ã\81¨ã\81\82ã\82\8bç§\91å­¦ã\81®è¶\85é\9b»ç£\81ç ²S (ＴＯＫＹＯã\80\80ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -690,51 +696,92 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83\95ã\83ª</string> 
+       <string>ã\83\88ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\83\86</string> 
+       <string>ã\82¢ã\83«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\83«ç§\91</string> 
       </void> 
       <void method="add"> 
-       <string>イリ</string> 
+       <string>科学</string> 
       </void> 
       <void method="add"> 
-       <string>リス</string> 
+       <string>学ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¹ã\83 </string> 
+       <string>ã\83\8eè¶\85</string> 
       </void> 
       <void method="add"> 
-       <string>ム/</string> 
+       <string>超電</string> 
       </void> 
       <void method="add"> 
-       <string>/レ</string> 
+       <string>電磁</string> 
       </void> 
       <void method="add"> 
-       <string>レイ</string> 
+       <string>磁砲</string> 
       </void> 
       <void method="add"> 
-       <string>イン</string> 
+       <string>砲S</string> 
+      </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>トアル科学ノ超電磁砲S</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＢＳ日テレ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>ふたりはミルキィホームズ (ＢＳ日テレ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <string>フタ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\83\9b</string> 
+       <string>ã\82¿ã\83ª</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9bã\83©</string> 
+       <string>ã\83ªã\83\8f</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\83\8fã\83\9f</string> 
       </void> 
       <void method="add"> 
-       <string>イフ</string> 
+       <string>ミル</string> 
+      </void> 
+      <void method="add"> 
+       <string>ルキ</string> 
+      </void> 
+      <void method="add"> 
+       <string>キイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イホ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ホム</string> 
+      </void> 
+      <void method="add"> 
+       <string>ムス</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\95ã\83ªã\83\86ã\82¤ã\83ªã\82¹ã\83 /ã\83¬ã\82¤ã\83³ã\83\9bã\83©ã\82¤ã\83\95</string> 
+     <string>ã\83\95ã\82¿ã\83ªã\83\8fã\83\9fã\83«ã\82­ã\82¤ã\83\9bã\83 ã\82¹</string> 
     </void> 
    </object> 
   </void> 
@@ -743,14 +790,11 @@
     <void property="center"> 
      <string>テレビ東京</string> 
     </void> 
-    <void property="disableRepeat"> 
-     <boolean>true</boolean> 
-    </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>超速変形ジャイロゼッター (テレビ東京)</string> 
+     <string>アイカツ! (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -758,39 +802,56 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>超速</string> 
-      </void> 
-      <void method="add"> 
-       <string>速変</string> 
-      </void> 
-      <void method="add"> 
-       <string>変形</string> 
+       <string>アイ</string> 
       </void> 
       <void method="add"> 
-       <string>形シ</string> 
+       <string>イカ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\83¤</string> 
+       <string>ã\82«ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¤ã\82¤</string> 
+       <string>ã\83\84!</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>アイカツ!</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＢＳジャパン</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>80</int> 
+    </void> 
+    <void property="label"> 
+     <string>アイカツ! (ＢＳジャパン)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\82¤ã\83­</string> 
+       <string>ã\82¢ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83­ã\82»</string> 
+       <string>ã\82¤ã\82«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82»ツ</string> 
+       <string>ã\82«ツ</string> 
       </void> 
       <void method="add"> 
-       <string>ツタ</string> 
+       <string>ツ!</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>超速変形シヤイロセツタ</string> 
+     <string>アイカツ!</string> 
     </void> 
    </object> 
   </void> 
@@ -799,11 +860,14 @@
     <void property="center"> 
      <string>テレビ東京</string> 
     </void> 
+    <void property="disableRepeat"> 
+     <boolean>true</boolean> 
+    </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83\9eã\82¤ã\83ªã\83\88ã\83«ã\83\9dã\83\8bã\83¼ã\80\80ï½\9eã\83\88ã\83¢ã\83\80ã\83\81ã\81¯é­\94æ³\95ï½\9e (テレビ東京)</string> 
+     <string>ã\82«ã\83¼ã\83\89ã\83\95ã\82¡ã\82¤ã\83\88!!ã\83´ã\82¡ã\83³ã\82¬ã\83¼ã\83\89ã\80\80ã\83ªã\83³ã\82¯ã\82¸ã\83§ã\83¼ã\82«ã\83¼ç·¨ã\80\8cç\8b\99ã\82\8fã\82\8cã\81\9fã\82¢ã\82¤ã\83\89ã\83«ã\80\8d (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -811,67 +875,109 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83\9eã\82¤</string> 
+       <string>ã\82«ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83ª</string> 
+       <string>ã\83\88ã\83\95</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\83\88</string> 
+       <string>ã\83\95ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83«</string> 
+       <string>ã\82¢ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ã\83\9b</string> 
+       <string>ã\82¤ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9bã\83\8b</string> 
+       <string>ã\83\88!</string> 
       </void> 
       <void method="add"> 
-       <string>ニ~</string> 
+       <string>!!</string> 
       </void> 
       <void method="add"> 
-       <string>~ト</string> 
+       <string>!ウ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83¢</string> 
+       <string>ã\82¦ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¢ã\82¿</string> 
+       <string>ã\82¢ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\83\81</string> 
+       <string>ã\83³ã\82«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\81ã\83\8f</string> 
+       <string>ã\82«ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8fé­\94</string> 
+       <string>ã\83\88ã\83ª</string> 
       </void> 
       <void method="add"> 
-       <string>魔法</string> 
+       <string>リン</string> 
       </void> 
       <void method="add"> 
-       <string>法~</string> 
+       <string>ンク</string> 
+      </void> 
+      <void method="add"> 
+       <string>クシ</string> 
+      </void> 
+      <void method="add"> 
+       <string>シヨ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ヨカ</string> 
+      </void> 
+      <void method="add"> 
+       <string>カ編</string> 
+      </void> 
+      <void method="add"> 
+       <string>編[</string> 
+      </void> 
+      <void method="add"> 
+       <string>[狙</string> 
+      </void> 
+      <void method="add"> 
+       <string>狙ワ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ワレ</string> 
+      </void> 
+      <void method="add"> 
+       <string>レタ</string> 
+      </void> 
+      <void method="add"> 
+       <string>タア</string> 
+      </void> 
+      <void method="add"> 
+       <string>アイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イト</string> 
+      </void> 
+      <void method="add"> 
+       <string>トル</string> 
+      </void> 
+      <void method="add"> 
+       <string>ル]</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\9eã\82¤ã\83ªã\83\88ã\83«ã\83\9bã\83\8b~ã\83\88ã\83¢ã\82¿ã\83\81ã\83\8fé­\94æ³\95~</string> 
+     <string>ã\82«ã\83\88ã\83\95ã\82¢ã\82¤ã\83\88!!ã\82¦ã\82¢ã\83³ã\82«ã\83\88ã\83ªã\83³ã\82¯ã\82·ã\83¨ã\82«ç·¨[ç\8b\99ã\83¯ã\83¬ã\82¿ã\82¢ã\82¤ã\83\88ã\83«]</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>日本テレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>獣旋バトル　モンスーノ (テレビ東京)</string> 
+     <string>ガッチャマン　クラウズ (日本テレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -879,46 +985,49 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>獣旋</string> 
+       <string>カツ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ツチ</string> 
       </void> 
       <void method="add"> 
-       <string>旋ハ</string> 
+       <string>チヤ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8fã\83\88</string> 
+       <string>ã\83¤ã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83«</string> 
+       <string>ã\83\9eã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ã\83¢</string> 
+       <string>ã\83³ã\82¯</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¢ã\83³</string> 
+       <string>ã\82¯ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82¹</string> 
+       <string>ã\83©ã\82¦</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¹ã\83\8e</string> 
+       <string>ã\82¦ã\82¹</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>獣旋ハトルモンスノ</string> 
+     <string>カツチヤマンクラウス</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>NHK BSプレミアム</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83 ã\82·ã\83\96ã\82®ã\83§ã\83¼ (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
+     <string>ã\82­ã\83³ã\82°ã\83\80ã\83 2 (NHK BSã\83\97ã\83¬ã\83\9fã\82¢ã\83 )</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -926,34 +1035,37 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83 ã\82·</string> 
+       <string>ã\82­ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\83\95</string> 
+       <string>ã\83³ã\82¯</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\82­</string> 
+       <string>ã\82¯ã\82¿</string> 
       </void> 
       <void method="add"> 
-       <string>キヨ</string> 
+       <string>タム</string> 
+      </void> 
+      <void method="add"> 
+       <string>ム2</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83 ã\82·ã\83\95ã\82­ã\83¨</string> 
+     <string>ã\82­ã\83³ã\82¯ã\82¿ã\83 2</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>絶対防衛レヴィアタン (テレビ東京)</string> 
+     <string>サーバント×サービス (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -961,49 +1073,43 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>絶対</string> 
-      </void> 
-      <void method="add"> 
-       <string>対防</string> 
-      </void> 
-      <void method="add"> 
-       <string>防衛</string> 
+       <string>サハ</string> 
       </void> 
       <void method="add"> 
-       <string>衛レ</string> 
+       <string>ハン</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¬ã\82¦</string> 
+       <string>ã\83³ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¦ã\82¤</string> 
+       <string>ã\83\88Ã\97</string> 
       </void> 
       <void method="add"> 
-       <string>イア</string> 
+       <string>×サ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\82¿</string> 
+       <string>ã\82µã\83\92</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\83³</string> 
+       <string>ã\83\92ã\82¹</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>絶対防衛レウイアタン</string> 
+     <string>サハント×サヒス</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>這いよれ!ニャル子さんW (テレビ東京)</string> 
+     <string>サーバント×サービス (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1011,55 +1117,43 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>這イ</string> 
-      </void> 
-      <void method="add"> 
-       <string>イヨ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ヨレ</string> 
-      </void> 
-      <void method="add"> 
-       <string>レ!</string> 
-      </void> 
-      <void method="add"> 
-       <string>!ニ</string> 
+       <string>サハ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8bã\83¤</string> 
+       <string>ã\83\8fã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¤ã\83«</string> 
+       <string>ã\83³ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«å­\90</string> 
+       <string>ã\83\88Ã\97</string> 
       </void> 
       <void method="add"> 
-       <string>子サ</string> 
+       <string>×サ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83³</string> 
+       <string>ã\82µã\83\92</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³W</string> 
+       <string>ã\83\92ã\82¹</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>這イヨレ!ニヤル子サンW</string> 
+     <string>サハント×サヒス</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>ＢＳフジ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83\8fã\83¤ã\83\86ã\81®ã\81\94ã\81¨ã\81\8f!Cuties (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
+     <string>ã\82¸ã\83£ã\83\91ã\82³ã\83³ (ＢＳã\83\95ã\82¸)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1067,61 +1161,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ハヤ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ヤテ</string> 
-      </void> 
-      <void method="add"> 
-       <string>テノ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ノコ</string> 
-      </void> 
-      <void method="add"> 
-       <string>コト</string> 
-      </void> 
-      <void method="add"> 
-       <string>トク</string> 
-      </void> 
-      <void method="add"> 
-       <string>ク!</string> 
-      </void> 
-      <void method="add"> 
-       <string>!C</string> 
-      </void> 
-      <void method="add"> 
-       <string>CU</string> 
-      </void> 
-      <void method="add"> 
-       <string>UT</string> 
+       <string>シヤ</string> 
       </void> 
       <void method="add"> 
-       <string>TI</string> 
+       <string>ヤハ</string> 
       </void> 
       <void method="add"> 
-       <string>IE</string> 
+       <string>ハコ</string> 
       </void> 
       <void method="add"> 
-       <string>ES</string> 
+       <string>コン</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\8fã\83¤ã\83\86ã\83\8eã\82³ã\83\88ã\82¯!CUTIES</string> 
+     <string>ã\82·ã\83¤ã\83\8fã\82³ã\83³</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>テレビ東京</string> 
+     <string>ＴＢＳテレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82¢ã\83©ã\82¿ã\82«ã\83³ã\82¬ã\82¿ã\83ªã\80\80ï½\9eé\9d©ç¥\9eèª\9eï½\9e (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
+     <string>ã\82¹ã\83\86ã\83©å¥³å­¦é\99¢é«\98ç­\89ç§\91C3é\83¨ (ＴＢＳã\83\86ã\83¬ã\83\93)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1129,58 +1196,55 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>アラ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ラタ</string> 
+       <string>ステ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\82«</string> 
+       <string>ã\83\86ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83³</string> 
+       <string>ã\83©å¥³</string> 
       </void> 
       <void method="add"> 
-       <string>ンカ</string> 
+       <string>女学</string> 
       </void> 
       <void method="add"> 
-       <string>カタ</string> 
+       <string>学院</string> 
       </void> 
       <void method="add"> 
-       <string>タリ</string> 
+       <string>院高</string> 
       </void> 
       <void method="add"> 
-       <string>リ~</string> 
+       <string>高等</string> 
       </void> 
       <void method="add"> 
-       <string>~革</string> 
+       <string>等科</string> 
       </void> 
       <void method="add"> 
-       <string>革神</string> 
+       <string>科C</string> 
       </void> 
       <void method="add"> 
-       <string>神語</string> 
+       <string>C3</string> 
       </void> 
       <void method="add"> 
-       <string>語~</string> 
+       <string>3部</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\82¢ã\83©ã\82¿ã\82«ã\83³ã\82«ã\82¿ã\83ª~é\9d©ç¥\9eèª\9e~</string> 
+     <string>ã\82¹ã\83\86ã\83©å¥³å­¦é\99¢é«\98ç­\89ç§\91C3é\83¨</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>フジテレビ</string> 
+     <string>ＢＳ-ＴＢＳ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>90</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83\88ã\83ªã\82³ (ã\83\95ã\82¸ã\83\86ã\83¬ã\83\93)</string> 
+     <string>ã\82¹ã\83\86ã\83©å¥³å­¦é\99¢é«\98ç­\89ç§\91ï¼£ï¼\93é\83¨ (ＢＳ-ＴＢＳ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1188,75 +1252,55 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83\88ã\83ª</string> 
+       <string>ã\82¹ã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\82³</string> 
+       <string>ã\83\86ã\83©</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>トリコ</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>はたらく魔王さま! (ＴＯＫＹＯ　ＭＸ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83\8fã\82¿</string> 
+       <string>ã\83©å¥³</string> 
       </void> 
       <void method="add"> 
-       <string>タラ</string> 
+       <string>女学</string> 
       </void> 
       <void method="add"> 
-       <string>ラク</string> 
+       <string>学院</string> 
       </void> 
       <void method="add"> 
-       <string>ク魔</string> 
+       <string>院高</string> 
       </void> 
       <void method="add"> 
-       <string>é­\94ç\8e\8b</string> 
+       <string>é«\98ç­\89</string> 
       </void> 
       <void method="add"> 
-       <string>ç\8e\8bã\82µ</string> 
+       <string>ç­\89ç§\91</string> 
       </void> 
       <void method="add"> 
-       <string>サマ</string> 
+       <string>科C</string> 
       </void> 
       <void method="add"> 
-       <string>マ!</string> 
+       <string>C3</string> 
+      </void> 
+      <void method="add"> 
+       <string>3部</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\8fã\82¿ã\83©ã\82¯é­\94ç\8e\8bã\82µã\83\9e!</string> 
+     <string>ã\82¹ã\83\86ã\83©å¥³å­¦é\99¢é«\98ç­\89ç§\91C3é\83¨</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
+     <string>ＢＳ-ＴＢＳ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>銀河機攻隊　マジェスティックプリンス (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>ダンガンロンパ 希望の学園と絶望の高校生 The Animaition (ＢＳ-ＴＢＳ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1264,155 +1308,115 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>é\8a\80æ²³</string> 
+       <string>ã\82¿ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>河機</string> 
+       <string>ンカ</string> 
       </void> 
       <void method="add"> 
-       <string>機攻</string> 
+       <string>カン</string> 
       </void> 
       <void method="add"> 
-       <string>攻隊</string> 
+       <string>ンロ</string> 
       </void> 
       <void method="add"> 
-       <string>隊マ</string> 
+       <string>ロン</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9eã\82·</string> 
+       <string>ã\83³ã\83\8f</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\82¨</string> 
+       <string>ã\83\8få¸\8c</string> 
       </void> 
       <void method="add"> 
-       <string>エス</string> 
+       <string>希望</string> 
       </void> 
       <void method="add"> 
-       <string>ステ</string> 
+       <string>望ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\83\8eå­¦</string> 
       </void> 
       <void method="add"> 
-       <string>イツ</string> 
+       <string>学園</string> 
       </void> 
       <void method="add"> 
-       <string>ツク</string> 
+       <string>園ト</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¯ã\83\95</string> 
+       <string>ã\83\88絶</string> 
       </void> 
       <void method="add"> 
-       <string>フリ</string> 
+       <string>絶望</string> 
       </void> 
       <void method="add"> 
-       <string>リン</string> 
+       <string>望ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82¹</string> 
+       <string>ã\83\8eé«\98</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>銀河機攻隊マシエステイツクフリンス</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>翠星のガルガンティア (ＴＯＫＹＯ　ＭＸ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>翠星</string> 
+       <string>高校</string> 
       </void> 
       <void method="add"> 
-       <string>æ\98\9fã\83\8e</string> 
+       <string>æ ¡ç\94\9f</string> 
       </void> 
       <void method="add"> 
-       <string>ノカ</string> 
+       <string>生T</string> 
       </void> 
       <void method="add"> 
-       <string>カル</string> 
+       <string>TH</string> 
       </void> 
       <void method="add"> 
-       <string>ルカ</string> 
+       <string>HE</string> 
       </void> 
       <void method="add"> 
-       <string>カン</string> 
+       <string>EA</string> 
       </void> 
       <void method="add"> 
-       <string>ンテ</string> 
+       <string>AN</string> 
       </void> 
       <void method="add"> 
-       <string>テイ</string> 
+       <string>NI</string> 
       </void> 
       <void method="add"> 
-       <string>イア</string> 
+       <string>IM</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>翠星ノカルカンテイア</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>カーニヴァル (ＴＯＫＹＯ　ＭＸ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>カニ</string> 
+       <string>MA</string> 
       </void> 
       <void method="add"> 
-       <string>ニウ</string> 
+       <string>AI</string> 
       </void> 
       <void method="add"> 
-       <string>ウア</string> 
+       <string>IT</string> 
       </void> 
       <void method="add"> 
-       <string>アル</string> 
+       <string>TI</string> 
+      </void> 
+      <void method="add"> 
+       <string>IO</string> 
+      </void> 
+      <void method="add"> 
+       <string>ON</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\82«ã\83\8bã\82¦ã\82¢ã\83«</string> 
+     <string>ã\82¿ã\83³ã\82«ã\83³ã\83­ã\83³ã\83\8få¸\8cæ\9c\9bã\83\8eå­¦å\9c\92ã\83\88絶æ\9c\9bã\83\8eé«\98æ ¡ç\94\9fTHEANIMAITION</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
+     <string>ＴＢＳã\83\86ã\83¬ã\83\93</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>機動戦士ガンダムSEED　DESTINY　HDリマスター (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>ダンガンロンパ　希望の学園と絶望の高校生　The　Animation (ＴＢＳテレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1420,129 +1424,112 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>機動</string> 
+       <string>タン</string> 
       </void> 
       <void method="add"> 
-       <string>動戦</string> 
+       <string>ンカ</string> 
       </void> 
       <void method="add"> 
-       <string>戦士</string> 
+       <string>カン</string> 
       </void> 
       <void method="add"> 
-       <string>士カ</string> 
+       <string>ンロ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ン</string> 
+       <string>ã\83­ン</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82¿</string> 
+       <string>ã\83³ã\83\8f</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\83 </string> 
+       <string>ã\83\8få¸\8c</string> 
       </void> 
       <void method="add"> 
-       <string>ムS</string> 
+       <string>希望</string> 
       </void> 
       <void method="add"> 
-       <string>SE</string> 
+       <string>望ノ</string> 
       </void> 
       <void method="add"> 
-       <string>EE</string> 
+       <string>ノ学</string> 
       </void> 
       <void method="add"> 
-       <string>ED</string> 
+       <string>学園</string> 
       </void> 
       <void method="add"> 
-       <string>DD</string> 
+       <string>園ト</string> 
       </void> 
       <void method="add"> 
-       <string>DE</string> 
+       <string>ト絶</string> 
       </void> 
       <void method="add"> 
-       <string>ES</string> 
+       <string>絶望</string> 
       </void> 
       <void method="add"> 
-       <string>ST</string> 
+       <string>望ノ</string> 
       </void> 
       <void method="add"> 
-       <string>TI</string> 
+       <string>ノ高</string> 
       </void> 
       <void method="add"> 
-       <string>IN</string> 
+       <string>高校</string> 
       </void> 
       <void method="add"> 
-       <string>NY</string> 
+       <string>校生</string> 
       </void> 
       <void method="add"> 
-       <string>YH</string> 
+       <string>生T</string> 
       </void> 
       <void method="add"> 
-       <string>HD</string> 
+       <string>TH</string> 
       </void> 
       <void method="add"> 
-       <string>Dリ</string> 
+       <string>HE</string> 
       </void> 
       <void method="add"> 
-       <string>リマ</string> 
+       <string>EA</string> 
       </void> 
       <void method="add"> 
-       <string>マス</string> 
+       <string>AN</string> 
       </void> 
       <void method="add"> 
-       <string>スタ</string> 
+       <string>NI</string> 
+      </void> 
+      <void method="add"> 
+       <string>IM</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>機動戦士カンタムSEEDDESTINYHDリマスタ</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>進撃の巨人 (ＴＯＫＹＯ　ＭＸ)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>進撃</string> 
+       <string>MA</string> 
       </void> 
       <void method="add"> 
-       <string>撃ノ</string> 
+       <string>AT</string> 
       </void> 
       <void method="add"> 
-       <string>ノ巨</string> 
+       <string>TI</string> 
       </void> 
       <void method="add"> 
-       <string>巨人</string> 
+       <string>IO</string> 
+      </void> 
+      <void method="add"> 
+       <string>ON</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>進撃ノ巨人</string> 
+     <string>タンカンロンハ希望ノ学園ト絶望ノ高校生THEANIMATION</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>フジテレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>90</int> 
     </void> 
     <void property="label"> 
-     <string>断裁分離のクライムエッジ (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>トリコ (フジテレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1550,55 +1537,28 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>断裁</string> 
-      </void> 
-      <void method="add"> 
-       <string>裁分</string> 
-      </void> 
-      <void method="add"> 
-       <string>分離</string> 
-      </void> 
-      <void method="add"> 
-       <string>離ノ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ノク</string> 
-      </void> 
-      <void method="add"> 
-       <string>クラ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ライ</string> 
-      </void> 
-      <void method="add"> 
-       <string>イム</string> 
-      </void> 
-      <void method="add"> 
-       <string>ムエ</string> 
-      </void> 
-      <void method="add"> 
-       <string>エツ</string> 
+       <string>トリ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\84ã\82·</string> 
+       <string>ã\83ªã\82³</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>断裁分離ノクライムエツシ</string> 
+     <string>トリコ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>テレビ朝日</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83¬ã\83\83ã\83\89ã\83\87ã\83¼ã\82¿ã\82¬ã\83¼ã\83« (ＴＯＫＹＯã\80\80ＭＸ)</string> 
+     <string>ã\83\89ã\82­ã\83\89ã\82­!ã\83\97ã\83ªã\82­ã\83¥ã\82¢ (ã\83\86ã\83¬ã\83\93æ\9c\9dæ\97¥)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1606,40 +1566,49 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83¬ã\83\84</string> 
+       <string>ã\83\88ã\82­</string> 
       </void> 
       <void method="add"> 
-       <string>ツト</string> 
+       <string>キト</string> 
+      </void> 
+      <void method="add"> 
+       <string>トキ</string> 
+      </void> 
+      <void method="add"> 
+       <string>キ!</string> 
+      </void> 
+      <void method="add"> 
+       <string>!フ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83\86</string> 
+       <string>ã\83\95ã\83ª</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¿</string> 
+       <string>ã\83ªã\82­</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\82«</string> 
+       <string>ã\82­ã\83¦</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83«</string> 
+       <string>ã\83¦ã\82¢</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83¬ã\83\84ã\83\88ã\83\86ã\82¿ã\82«ã\83«</string> 
+     <string>ã\83\88ã\82­ã\83\88ã\82­!ã\83\95ã\83ªã\82­ã\83¦ã\82¢</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\81\86ã\81\9fã\81®â\98\86ã\83\97ã\83ªã\83³ã\82¹ã\81\95ã\81¾ã\81£â\99ªã\83\9eã\82¸LOVE2000% (ＴＯＫＹＯã\80\80ＭＸ)</string> 
+     <string>ã\83\8fã\82¤ã\82¹ã\82¯ã\83¼ã\83«DÃ\97D NEW æ\9c\88å\85\89æ ¡åº­ã\81®ã\82¨ã\82¯ã\82¹ã\82«ã\83ªã\83\90ã\83¼ (BSã\82¤ã\83¬ã\83\96ã\83³)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1647,88 +1616,85 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ウタ</string> 
-      </void> 
-      <void method="add"> 
-       <string>タノ</string> 
+       <string>ハイ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8eâ\98\86</string> 
+       <string>ã\82¤ã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>☆フ</string> 
+       <string>スク</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\83ª</string> 
+       <string>ã\82¯ã\83«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\83³</string> 
+       <string>ã\83«D</string> 
       </void> 
       <void method="add"> 
-       <string>ンス</string> 
+       <string>D×</string> 
       </void> 
       <void method="add"> 
-       <string>スサ</string> 
+       <string>×D</string> 
       </void> 
       <void method="add"> 
-       <string>サマ</string> 
+       <string>DN</string> 
       </void> 
       <void method="add"> 
-       <string>マツ</string> 
+       <string>NE</string> 
       </void> 
       <void method="add"> 
-       <string>ツ♪</string> 
+       <string>EW</string> 
       </void> 
       <void method="add"> 
-       <string>♪マ</string> 
+       <string>W月</string> 
       </void> 
       <void method="add"> 
-       <string>マシ</string> 
+       <string>月光</string> 
       </void> 
       <void method="add"> 
-       <string>シL</string> 
+       <string>光校</string> 
       </void> 
       <void method="add"> 
-       <string>LO</string> 
+       <string>校庭</string> 
       </void> 
       <void method="add"> 
-       <string>OV</string> 
+       <string>庭ノ</string> 
       </void> 
       <void method="add"> 
-       <string>VE</string> 
+       <string>ノエ</string> 
       </void> 
       <void method="add"> 
-       <string>E2</string> 
+       <string>エク</string> 
       </void> 
       <void method="add"> 
-       <string>20</string> 
+       <string>クス</string> 
       </void> 
       <void method="add"> 
-       <string>00</string> 
+       <string>スカ</string> 
       </void> 
       <void method="add"> 
-       <string>00</string> 
+       <string>カリ</string> 
       </void> 
       <void method="add"> 
-       <string>0%</string> 
+       <string>リハ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\82¦ã\82¿ã\83\8eâ\98\86ã\83\95ã\83ªã\83³ã\82¹ã\82µã\83\9eã\83\84â\99ªã\83\9eã\82·LOVE2000%</string> 
+     <string>ã\83\8fã\82¤ã\82¹ã\82¯ã\83«DÃ\97DNEWæ\9c\88å\85\89æ ¡åº­ã\83\8eã\82¨ã\82¯ã\82¹ã\82«ã\83ªã\83\8f</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯã\80\80ＭＸ</string> 
+     <string>ＢＳæ\9c\9dæ\97¥</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>ã\81¨ã\81\82ã\82\8bç§\91å­¦ã\81®è¶\85é\9b»ç£\81ç ²S (ＴＯＫＹＯã\80\80ＭＸ)</string> 
+     <string>ã\83\90ã\83\93ã\83«2ä¸\96 (ＢＳæ\9c\9dæ\97¥)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1736,52 +1702,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>トア</string> 
-      </void> 
-      <void method="add"> 
-       <string>アル</string> 
-      </void> 
-      <void method="add"> 
-       <string>ル科</string> 
-      </void> 
-      <void method="add"> 
-       <string>科学</string> 
-      </void> 
-      <void method="add"> 
-       <string>学ノ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ノ超</string> 
-      </void> 
-      <void method="add"> 
-       <string>超電</string> 
+       <string>ハヒ</string> 
       </void> 
       <void method="add"> 
-       <string>電磁</string> 
+       <string>ヒル</string> 
       </void> 
       <void method="add"> 
-       <string>磁砲</string> 
+       <string>ル2</string> 
       </void> 
       <void method="add"> 
-       <string>砲S</string> 
+       <string>2世</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\88ã\82¢ã\83«ç§\91å­¦ã\83\8eè¶\85é\9b»ç£\81ç ²S</string> 
+     <string>ã\83\8fã\83\92ã\83«2ä¸\96</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\83\87ã\83¼ã\83\88ã\83»ã\82¢ã\83»ã\83©ã\82¤ã\83\96 (ＴＯＫＹＯã\80\80ＭＸ)</string> 
+     <string>ã\83\95ã\82¡ã\83³ã\82¿ã\82¸ã\82¹ã\82¿ã\83\89ã\83¼ã\83« (BSã\82¤ã\83¬ã\83\96ã\83³)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1789,30 +1737,33 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>テト</string> 
+       <string>フア</string> 
+      </void> 
+      <void method="add"> 
+       <string>アン</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88/</string> 
+       <string>ã\83³ã\82¿</string> 
       </void> 
       <void method="add"> 
-       <string>/ア</string> 
+       <string>タシ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢/</string> 
+       <string>ã\82·ã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>/ラ</string> 
+       <string>スタ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\82¿ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83\95</string> 
+       <string>ã\83\88ã\83«</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\86ã\83\88/ã\82¢/ã\83©ã\82¤ã\83\95</string> 
+     <string>ã\83\95ã\82¢ã\83³ã\82¿ã\82·ã\82¹ã\82¿ã\83\88ã\83«</string> 
     </void> 
    </object> 
   </void> 
@@ -1825,7 +1776,7 @@
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82\88ã\82\93ã\81§ã\81¾ã\81\99ã\82\88ã\80\81ã\82¢ã\82¶ã\82¼ã\83«ã\81\95ã\82\93ã\80\82Z (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>ã\83\95ã\82¡ã\83³ã\82¿ã\82¸ã\82¹ã\82¿ã\83\89ã\83¼ã\83« (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1833,51 +1784,74 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83¨ã\83³</string> 
+       <string>ã\83\95ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\83\86</string> 
+       <string>ã\82¢ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\83\9e</string> 
+       <string>ã\83³ã\82¿</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9eã\82¹</string> 
+       <string>ã\82¿ã\82·</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¹ã\83¨</string> 
+       <string>ã\82·ã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¨,</string> 
+       <string>ã\82¹ã\82¿</string> 
       </void> 
       <void method="add"> 
-       <string>,ア</string> 
+       <string>タト</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\82µ</string> 
+       <string>ã\83\88ã\83«</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>フアンタシスタトル</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>BSイレブン</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>70</int> 
+    </void> 
+    <void property="label"> 
+     <string>ブラッドラッド  (BSイレブン)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\82µã\82»</string> 
+       <string>ã\83\95ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82»ã\83«</string> 
+       <string>ã\83©ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ã\82µ</string> 
+       <string>ã\83\84ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83³</string> 
+       <string>ã\83\88ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³.</string> 
+       <string>ã\83©ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>.Z</string> 
+       <string>ツト</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83¨ã\83³ã\83\86ã\83\9eã\82¹ã\83¨,ã\82¢ã\82µã\82»ã\83«ã\82µã\83³.Z</string> 
+     <string>ã\83\95ã\83©ã\83\84ã\83\88ã\83©ã\83\84ã\83\88</string> 
     </void> 
    </object> 
   </void> 
@@ -1887,10 +1861,10 @@
      <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>波打際のむろみさん (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>ブラッドラッド  (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1898,46 +1872,40 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>波打</string> 
-      </void> 
-      <void method="add"> 
-       <string>打際</string> 
-      </void> 
-      <void method="add"> 
-       <string>際ノ</string> 
+       <string>フラ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8eã\83 </string> 
+       <string>ã\83©ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83 ã\83­</string> 
+       <string>ã\83\84ã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83­ã\83\9f</string> 
+       <string>ã\83\88ã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9fã\82µ</string> 
+       <string>ã\83©ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83³</string> 
+       <string>ã\83\84ã\83\88</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>波打際ノムロミサン</string> 
+     <string>フラツトラツト</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>35</int> 
+     <int>60</int> 
     </void> 
     <void property="label"> 
-     <string>俺の妹がこんなに可愛いわけがない。 (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>プリティーリズム・レインボーライブ (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -1945,70 +1913,64 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>俺ノ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ノ妹</string> 
-      </void> 
-      <void method="add"> 
-       <string>妹カ</string> 
+       <string>フリ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\82³</string> 
+       <string>ã\83ªã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82³ã\83³</string> 
+       <string>ã\83\86ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\83\8a</string> 
+       <string>ã\82¤ã\83ª</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8aã\83\8b</string> 
+       <string>ã\83ªã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8bå\8f¯</string> 
+       <string>ã\82¹ã\83 </string> 
       </void> 
       <void method="add"> 
-       <string>可愛</string> 
+       <string>ム/</string> 
       </void> 
       <void method="add"> 
-       <string>愛イ</string> 
+       <string>/レ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83¯</string> 
+       <string>ã\83¬ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¯ã\82±</string> 
+       <string>ã\82¤ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82±ã\82«</string> 
+       <string>ã\83³ã\83\9b</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83\8a</string> 
+       <string>ã\83\9bã\83©</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8aイ</string> 
+       <string>ã\83©イ</string> 
       </void> 
       <void method="add"> 
-       <string>イ.</string> 
+       <string>イフ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>俺ノ妹カコンナニ可愛イワケカナイ.</string> 
+     <string>フリテイリスム/レインホライフ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>百花繚乱　サムライブライド (ＴＯＫＹＯ　ＭＸ)</string> 
+     <string>マイリトルポニー　～トモダチは魔法～ (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2016,55 +1978,67 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>百花</string> 
+       <string>マイ</string> 
       </void> 
       <void method="add"> 
-       <string>花繚</string> 
+       <string>イリ</string> 
       </void> 
       <void method="add"> 
-       <string>繚乱</string> 
+       <string>リト</string> 
       </void> 
       <void method="add"> 
-       <string>乱サ</string> 
+       <string>トル</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83 </string> 
+       <string>ã\83«ã\83\9b</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83 ã\83©</string> 
+       <string>ã\83\9bã\83\8b</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\83\8b~</string> 
       </void> 
       <void method="add"> 
-       <string>イフ</string> 
+       <string>~ト</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\83©</string> 
+       <string>ã\83\88ã\83¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\83¢ã\82¿</string> 
       </void> 
       <void method="add"> 
-       <string>イト</string> 
+       <string>タチ</string> 
+      </void> 
+      <void method="add"> 
+       <string>チハ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ハ魔</string> 
+      </void> 
+      <void method="add"> 
+       <string>魔法</string> 
+      </void> 
+      <void method="add"> 
+       <string>法~</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>百花繚乱サムライフライト</string> 
+     <string>マイリトルホニ~トモタチハ魔法~</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＴＯＫＹＯ　ＭＸ</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82\86ã\82\86å¼\8f (ＴＯＫＹＯã\80\80ＭＸ)</string> 
+     <string>ã\83 ã\82·ã\83\96ã\82®ã\83§ã\83¼ (ã\83\86ã\83¬ã\83\93æ\9d±äº¬)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2072,28 +2046,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ユユ</string> 
+       <string>ムシ</string> 
+      </void> 
+      <void method="add"> 
+       <string>シフ</string> 
+      </void> 
+      <void method="add"> 
+       <string>フキ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¦å¼\8f</string> 
+       <string>ã\82­ã\83¨</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83¦ã\83¦å¼\8f</string> 
+     <string>ã\83 ã\82·ã\83\95ã\82­ã\83¨</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ日テレ</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\81¯ã\81\9fã\82\89ã\81\8fé­\94ç\8e\8bã\81\95ã\81¾! (ＢＳæ\97¥ã\83\86ã\83¬)</string> 
+     <string>ã\83­ã\82¦ã\81\8dã\82\85ã\83¼ã\81¶!SS (BSã\82¤ã\83¬ã\83\96ã\83³)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2101,46 +2081,43 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\83\8fã\82¿</string> 
+       <string>ã\83­ã\82¦</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\83©</string> 
+       <string>ã\82¦ã\82­</string> 
       </void> 
       <void method="add"> 
-       <string>ラク</string> 
-      </void> 
-      <void method="add"> 
-       <string>ク魔</string> 
+       <string>キユ</string> 
       </void> 
       <void method="add"> 
-       <string>魔王</string> 
+       <string>ユフ</string> 
       </void> 
       <void method="add"> 
-       <string>王サ</string> 
+       <string>フ!</string> 
       </void> 
       <void method="add"> 
-       <string>サマ</string> 
+       <string>!S</string> 
       </void> 
       <void method="add"> 
-       <string>マ!</string> 
+       <string>SS</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ã\83\8fã\82¿ã\83©ã\82¯é­\94ç\8e\8bã\82µã\83\9e!</string> 
+     <string>ã\83­ã\82¦ã\82­ã\83¦ã\83\95!SS</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ日テレ</string> 
+     <string>ＢＳ-ＴＢＳ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>銀河機攻隊　マジェスティックプリンス (ＢＳ日テレ)</string> 
+     <string>ローゼンメイデン (ＢＳ-ＴＢＳ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2148,70 +2125,81 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>銀河</string> 
-      </void> 
-      <void method="add"> 
-       <string>河機</string> 
-      </void> 
-      <void method="add"> 
-       <string>機攻</string> 
-      </void> 
-      <void method="add"> 
-       <string>攻隊</string> 
-      </void> 
-      <void method="add"> 
-       <string>隊マ</string> 
+       <string>ロセ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9eã\82·</string> 
+       <string>ã\82»ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\82¨</string> 
+       <string>ã\83³ã\83¡</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¨ã\82¹</string> 
+       <string>ã\83¡ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¹テ</string> 
+       <string>ã\82¤テ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\83\86ã\83³</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>ロセンメイテン</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＢＳテレビ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>ローゼンメイデン (ＴＢＳテレビ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ã\82¤ã\83\84</string> 
+       <string>ã\83­ã\82»</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\84ã\82¯</string> 
+       <string>ã\82»ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¯ã\83\95</string> 
+       <string>ã\83³ã\83¡</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\83ª</string> 
+       <string>ã\83¡ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83ªã\83³</string> 
+       <string>ã\82¤ã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\82¹</string> 
+       <string>ã\83\86ã\83³</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>銀河機攻隊マシエステイツクフリンス</string> 
+     <string>ロセンメイテン</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ朝日</string> 
+     <string>日本テレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>60</int> 
     </void> 
     <void property="label"> 
-     <string>バビル2世 (ＢＳ朝日)</string> 
+     <string>宇宙兄弟 (日本テレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2219,34 +2207,31 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ハヒ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ヒル</string> 
+       <string>宇宙</string> 
       </void> 
       <void method="add"> 
-       <string>ル2</string> 
+       <string>宙兄</string> 
       </void> 
       <void method="add"> 
-       <string>2世</string> 
+       <string>兄弟</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ハヒル2世</string> 
+     <string>宇宙兄弟</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ-ＴＢＳ</string> 
+     <string>ＴＢＳã\83\86ã\83¬ã\83\93</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>革命機ヴァルヴレイヴ (ＢＳ-ＴＢＳ)</string> 
+     <string>宇宙戦艦ヤマト2199 (ＴＢＳテレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2254,49 +2239,52 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>革命</string> 
+       <string>宇宙</string> 
       </void> 
       <void method="add"> 
-       <string>å\91½æ©\9f</string> 
+       <string>å®\99æ\88¦</string> 
       </void> 
       <void method="add"> 
-       <string>æ©\9fã\82¦</string> 
+       <string>æ\88¦è\89¦</string> 
       </void> 
       <void method="add"> 
-       <string>ウア</string> 
+       <string>艦ヤ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\83«</string> 
+       <string>ã\83¤ã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ã\82¦</string> 
+       <string>ã\83\9eã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¦ã\83¬</string> 
+       <string>ã\83\882</string> 
       </void> 
       <void method="add"> 
-       <string>レイ</string> 
+       <string>21</string> 
+      </void> 
+      <void method="add"> 
+       <string>19</string> 
       </void> 
       <void method="add"> 
-       <string>イウ</string> 
+       <string>99</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>革命機ウアルウレイウ</string> 
+     <string>宇宙戦艦ヤマト2199</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ-ＴＢＳ</string> 
+     <string>日本テレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>デビルサバイバー2 (ＢＳ-ＴＢＳ)</string> 
+     <string>帰宅部活動記録 (日本テレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2304,43 +2292,40 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>テヒ</string> 
+       <string>帰宅</string> 
       </void> 
       <void method="add"> 
-       <string>ヒル</string> 
-      </void> 
-      <void method="add"> 
-       <string>ルサ</string> 
+       <string>宅部</string> 
       </void> 
       <void method="add"> 
-       <string>サハ</string> 
+       <string>部活</string> 
       </void> 
       <void method="add"> 
-       <string>ハイ</string> 
+       <string>活動</string> 
       </void> 
       <void method="add"> 
-       <string>イハ</string> 
+       <string>動記</string> 
       </void> 
       <void method="add"> 
-       <string>ハ2</string> 
+       <string>記録</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>テヒルサハイハ2</string> 
+     <string>帰宅部活動記録</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ-ＴＢＳ</string> 
+     <string>BSã\82¤ã\83¬ã\83\96ã\83³</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ã\82\84ã\81¯ã\82\8a俺ã\81®é\9d\92æ\98¥ã\83©ã\83\96ã\82³ã\83¡ã\81¯ã\81¾ã\81¡ã\81\8cã\81£ã\81¦ã\81\84ã\82\8bã\80\82 (ＢＳ-ＴＢＳ)</string> 
+     <string>幻影ã\83²é§\86ã\82±ã\83«å¤ªé\99½ (BSã\82¤ã\83¬ã\83\96ã\83³)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2348,66 +2333,74 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ヤハ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ハリ</string> 
-      </void> 
-      <void method="add"> 
-       <string>リ俺</string> 
-      </void> 
-      <void method="add"> 
-       <string>俺ノ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ノ青</string> 
+       <string>幻影</string> 
       </void> 
       <void method="add"> 
-       <string>青春</string> 
+       <string>影ヲ</string> 
       </void> 
       <void method="add"> 
-       <string>春ラ</string> 
+       <string>ヲ駆</string> 
       </void> 
       <void method="add"> 
-       <string>ラフ</string> 
+       <string>駆ケ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\82³</string> 
+       <string>ã\82±ã\83«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82³ã\83¡</string> 
+       <string>ã\83«å¤ª</string> 
       </void> 
       <void method="add"> 
-       <string>メハ</string> 
-      </void> 
-      <void method="add"> 
-       <string>ハマ</string> 
+       <string>太陽</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>幻影ヲ駆ケル太陽</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>幻影ヲ駆ケル太陽 (ＴＯＫＹＯ　ＭＸ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>マチ</string> 
+       <string>幻影</string> 
       </void> 
       <void method="add"> 
-       <string>チカ</string> 
+       <string>影ヲ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83\84</string> 
+       <string>ã\83²é§\86</string> 
       </void> 
       <void method="add"> 
-       <string>ツテ</string> 
+       <string>駆ケ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\82±ã\83«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83«</string> 
+       <string>ã\83«å¤ª</string> 
       </void> 
       <void method="add"> 
-       <string>ル.</string> 
+       <string>太陽</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ヤハリ俺ノ青春ラフコメハマチカツテイル.</string> 
+     <string>幻影ヲ駆ケル太陽</string> 
     </void> 
    </object> 
   </void> 
@@ -2417,10 +2410,10 @@
      <string>ＢＳ-ＴＢＳ</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>フォトカノ (ＢＳ-ＴＢＳ)</string> 
+     <string>恋愛ラボ (ＢＳ-ＴＢＳ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2428,34 +2421,31 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>フオ</string> 
-      </void> 
-      <void method="add"> 
-       <string>オト</string> 
+       <string>恋愛</string> 
       </void> 
       <void method="add"> 
-       <string>トカ</string> 
+       <string>愛ラ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83\8e</string> 
+       <string>ã\83©ã\83\9b</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>フオトカノ</string> 
+     <string>恋愛ラホ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳã\82¸ã\83£ã\83\91ã\83³</string> 
+     <string>ＴＢＳã\83\86ã\83¬ã\83\93</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>アイカツ! (ＢＳジャパン)</string> 
+     <string>恋愛ラボ (ＴＢＳテレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2463,21 +2453,18 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>アイ</string> 
-      </void> 
-      <void method="add"> 
-       <string>イカ</string> 
+       <string>恋愛</string> 
       </void> 
       <void method="add"> 
-       <string>カツ</string> 
+       <string>愛ラ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\84!</string> 
+       <string>ã\83©ã\83\9b</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>アイカツ!</string> 
+     <string>恋愛ラホ</string> 
     </void> 
    </object> 
   </void> 
@@ -2490,7 +2477,7 @@
      <int>80</int> 
     </void> 
     <void property="label"> 
-     <string>アイカツ! (テレビ東京)</string> 
+     <string>戦勇。 (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2498,21 +2485,15 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>アイ</string> 
-      </void> 
-      <void method="add"> 
-       <string>イカ</string> 
-      </void> 
-      <void method="add"> 
-       <string>カツ</string> 
+       <string>戦勇</string> 
       </void> 
       <void method="add"> 
-       <string>ツ!</string> 
+       <string>勇.</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>アイカツ!</string> 
+     <string>戦勇.</string> 
     </void> 
    </object> 
   </void> 
@@ -2522,10 +2503,10 @@
      <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
-     <int>80</int> 
+     <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ゆゆ式 (BSイレブン)</string> 
+     <string>戦姫絶唱シンフォギアG (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2533,28 +2514,52 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ユユ</string> 
+       <string>戦姫</string> 
+      </void> 
+      <void method="add"> 
+       <string>姫絶</string> 
       </void> 
       <void method="add"> 
-       <string>ユ式</string> 
+       <string>絶唱</string> 
+      </void> 
+      <void method="add"> 
+       <string>唱シ</string> 
+      </void> 
+      <void method="add"> 
+       <string>シン</string> 
+      </void> 
+      <void method="add"> 
+       <string>ンフ</string> 
+      </void> 
+      <void method="add"> 
+       <string>フオ</string> 
+      </void> 
+      <void method="add"> 
+       <string>オキ</string> 
+      </void> 
+      <void method="add"> 
+       <string>キア</string> 
+      </void> 
+      <void method="add"> 
+       <string>アG</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ユユ式</string> 
+     <string>戦姫絶唱シンフオキアG</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>百花繚乱サムライブライド (BSイレブン)</string> 
+     <string>戦姫絶唱シンフォギアG (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2562,42 +2567,39 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>百花</string> 
-      </void> 
-      <void method="add"> 
-       <string>花繚</string> 
+       <string>戦姫</string> 
       </void> 
       <void method="add"> 
-       <string>繚乱</string> 
+       <string>姫絶</string> 
       </void> 
       <void method="add"> 
-       <string>乱サ</string> 
+       <string>絶唱</string> 
       </void> 
       <void method="add"> 
-       <string>サム</string> 
+       <string>唱シ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83 ã\83©</string> 
+       <string>ã\82·ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\83³ã\83\95</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83\95</string> 
+       <string>ã\83\95ã\82ª</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\83©</string> 
+       <string>ã\82ªã\82­</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\82­ã\82¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83\88</string> 
+       <string>ã\82¢G</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>百花繚乱サムライフライト</string> 
+     <string>戦姫絶唱シンフオキアG</string> 
     </void> 
    </object> 
   </void> 
@@ -2610,7 +2612,7 @@
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>ハイスクールD×D (BSイレブン)</string> 
+     <string>有頂天家族 (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2618,43 +2620,69 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ハイ</string> 
+       <string>有頂</string> 
       </void> 
       <void method="add"> 
-       <string>イス</string> 
+       <string>頂天</string> 
       </void> 
       <void method="add"> 
-       <string>スク</string> 
+       <string>天家</string> 
       </void> 
       <void method="add"> 
-       <string>クル</string> 
+       <string>家族</string> 
+      </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>有頂天家族</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>有頂天家族 (ＴＯＫＹＯ　ＭＸ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <string>有頂</string> 
       </void> 
       <void method="add"> 
-       <string>ルD</string> 
+       <string>頂天</string> 
       </void> 
       <void method="add"> 
-       <string>D×</string> 
+       <string>天家</string> 
       </void> 
       <void method="add"> 
-       <string>×D</string> 
+       <string>家族</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ハイスクルD×D</string> 
+     <string>有頂天家族</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>よんでますよ、アザゼルさん。Z (BSイレブン)</string> 
+     <string>機動戦士ガンダムSEED　DESTINY　HDリマスター (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2662,64 +2690,94 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ヨン</string> 
+       <string>機動</string> 
       </void> 
       <void method="add"> 
-       <string>ンテ</string> 
+       <string>動戦</string> 
       </void> 
       <void method="add"> 
-       <string>テマ</string> 
+       <string>戦士</string> 
       </void> 
       <void method="add"> 
-       <string>マス</string> 
+       <string>士カ</string> 
+      </void> 
+      <void method="add"> 
+       <string>カン</string> 
+      </void> 
+      <void method="add"> 
+       <string>ンタ</string> 
+      </void> 
+      <void method="add"> 
+       <string>タム</string> 
+      </void> 
+      <void method="add"> 
+       <string>ムS</string> 
+      </void> 
+      <void method="add"> 
+       <string>SE</string> 
+      </void> 
+      <void method="add"> 
+       <string>EE</string> 
+      </void> 
+      <void method="add"> 
+       <string>ED</string> 
+      </void> 
+      <void method="add"> 
+       <string>DD</string> 
+      </void> 
+      <void method="add"> 
+       <string>DE</string> 
+      </void> 
+      <void method="add"> 
+       <string>ES</string> 
       </void> 
       <void method="add"> 
-       <string>スヨ</string> 
+       <string>ST</string> 
       </void> 
       <void method="add"> 
-       <string>ヨ,</string> 
+       <string>TI</string> 
       </void> 
       <void method="add"> 
-       <string>,ア</string> 
+       <string>IN</string> 
       </void> 
       <void method="add"> 
-       <string>アサ</string> 
+       <string>NY</string> 
       </void> 
       <void method="add"> 
-       <string>サセ</string> 
+       <string>YH</string> 
       </void> 
       <void method="add"> 
-       <string>セル</string> 
+       <string>HD</string> 
       </void> 
       <void method="add"> 
-       <string>ルサ</string> 
+       <string>Dリ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83³</string> 
+       <string>ã\83ªã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³.</string> 
+       <string>ã\83\9eã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>.Z</string> 
+       <string>スタ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ヨンテマスヨ,アサセルサン.Z</string> 
+     <string>機動戦士カンタムSEEDDESTINYHDリマスタ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
-   <object class="tainavi.TraceKey"> 
+   <object id="TraceKey0" class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＢＳ日テレ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>波打際のむろみさん (BSイレブン)</string> 
+     <string>犬とハサミは使いよう (ＢＳ日テレ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2727,46 +2785,52 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>波打</string> 
+       <string>犬ト</string> 
+      </void> 
+      <void method="add"> 
+       <string>トハ</string> 
       </void> 
       <void method="add"> 
-       <string>打際</string> 
+       <string>ハサ</string> 
       </void> 
       <void method="add"> 
-       <string>際ノ</string> 
+       <string>サミ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8eã\83 </string> 
+       <string>ã\83\9fã\83\8f</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83 ã\83­</string> 
+       <string>ã\83\8f使</string> 
       </void> 
       <void method="add"> 
-       <string>ロミ</string> 
+       <string>使イ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9fã\82µ</string> 
+       <string>ã\82¤ã\83¨</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83³</string> 
+       <string>ã\83¨ã\82¦</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>波打際ノムロミサン</string> 
+     <string>犬トハサミハ使イヨウ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
+   <object idref="TraceKey0"/> 
+  </void> 
+  <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>中二病でも恋がしたい! (BSイレブン)</string> 
+     <string>獣旋バトル　モンスーノ (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2774,39 +2838,33 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>中2</string> 
-      </void> 
-      <void method="add"> 
-       <string>2病</string> 
-      </void> 
-      <void method="add"> 
-       <string>病テ</string> 
+       <string>獣旋</string> 
       </void> 
       <void method="add"> 
-       <string>テモ</string> 
+       <string>旋ハ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¢æ\81\8b</string> 
+       <string>ã\83\8fã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>æ\81\8bã\82«</string> 
+       <string>ã\83\88ã\83«</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\82·</string> 
+       <string>ã\83«ã\83¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82·ã\82¿</string> 
+       <string>ã\83¢ã\83³</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¿ã\82¤</string> 
+       <string>ã\83³ã\82¹</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤!</string> 
+       <string>ã\82¹ã\83\8e</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>中2病テモ恋カシタイ!</string> 
+     <string>獣旋ハトルモンスノ</string> 
     </void> 
    </object> 
   </void> 
@@ -2819,7 +2877,7 @@
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>とある科学の超電磁砲S (BSイレブン)</string> 
+     <string>神さまのいない日曜日 (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2827,52 +2885,49 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>トア</string> 
-      </void> 
-      <void method="add"> 
-       <string>アル</string> 
+       <string>神サ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ç§\91</string> 
+       <string>ã\82µã\83\9e</string> 
       </void> 
       <void method="add"> 
-       <string>科学</string> 
+       <string>マノ</string> 
       </void> 
       <void method="add"> 
-       <string>学ノ</string> 
+       <string>ノイ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8eè¶\85</string> 
+       <string>ã\82¤ã\83\8a</string> 
       </void> 
       <void method="add"> 
-       <string>超電</string> 
+       <string>ナイ</string> 
       </void> 
       <void method="add"> 
-       <string>電磁</string> 
+       <string>イ日</string> 
       </void> 
       <void method="add"> 
-       <string>磁砲</string> 
+       <string>日曜</string> 
       </void> 
       <void method="add"> 
-       <string>砲S</string> 
+       <string>曜日</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>トアル科学ノ超電磁砲S</string> 
+     <string>神サマノイナイ日曜日</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>RDG レッドデータガール (BSイレブン)</string> 
+     <string>神さまのいない日曜日 (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2880,49 +2935,49 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>RD</string> 
+       <string>神サ</string> 
       </void> 
       <void method="add"> 
-       <string>DG</string> 
+       <string>サマ</string> 
       </void> 
       <void method="add"> 
-       <string>Gレ</string> 
+       <string>マノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¬ã\83\84</string> 
+       <string>ã\83\8eã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\84ã\83\88</string> 
+       <string>ã\82¤ã\83\8a</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83\86</string> 
+       <string>ã\83\8aã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¿</string> 
+       <string>ã\82¤æ\97¥</string> 
       </void> 
       <void method="add"> 
-       <string>タカ</string> 
+       <string>日曜</string> 
       </void> 
       <void method="add"> 
-       <string>カル</string> 
+       <string>曜日</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>RDGレツトテタカル</string> 
+     <string>神サマノイナイ日曜日</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>カーニヴァル (BSイレブン)</string> 
+     <string>私がモテないのはどう考えてもお前らが悪い! (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -2930,105 +2985,82 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>カニ</string> 
+       <string>私カ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8bã\82¦</string> 
+       <string>ã\82«ã\83¢</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¦ã\82¢</string> 
+       <string>ã\83¢ã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¢ã\83«</string> 
+       <string>ã\83\86ã\83\8a</string> 
       </void> 
-     </object> 
-    </void> 
-    <void property="titlePop"> 
-     <string>カニウアル</string> 
-    </void> 
-   </object> 
-  </void> 
-  <void method="add"> 
-   <object class="tainavi.TraceKey"> 
-    <void property="center"> 
-     <string>BSイレブン</string> 
-    </void> 
-    <void property="fazzyThreshold"> 
-     <int>35</int> 
-    </void> 
-    <void property="label"> 
-     <string>俺の妹がこんなに可愛いわけがない。 (BSイレブン)</string> 
-    </void> 
-    <void property="okiniiri"> 
-     <string>★★★★★</string> 
-    </void> 
-    <void property="searchStrKeys"> 
-     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>俺ノ</string> 
+       <string>ナイ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8e妹</string> 
+       <string>ã\82¤ã\83\8e</string> 
       </void> 
       <void method="add"> 
-       <string>妹カ</string> 
+       <string>ノハ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\82³</string> 
+       <string>ã\83\8fã\83\88</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82³ã\83³</string> 
+       <string>ã\83\88ã\82¦</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\83\8a</string> 
+       <string>ã\82¦è\80\83</string> 
       </void> 
       <void method="add"> 
-       <string>ナニ</string> 
+       <string>考エ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8bå\8f¯</string> 
+       <string>ã\82¨ã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>可愛</string> 
+       <string>テモ</string> 
       </void> 
       <void method="add"> 
-       <string>愛イ</string> 
+       <string>モオ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83¯</string> 
+       <string>ã\82ªå\89\8d</string> 
       </void> 
       <void method="add"> 
-       <string>ワケ</string> 
+       <string>前ラ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82±カ</string> 
+       <string>ã\83©カ</string> 
       </void> 
       <void method="add"> 
-       <string>カナ</string> 
+       <string>カ悪</string> 
       </void> 
       <void method="add"> 
-       <string>ナイ</string> 
+       <string>悪イ</string> 
       </void> 
       <void method="add"> 
-       <string>イ.</string> 
+       <string>イ!</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>俺ノ妹カコンナニ可愛イワケカナイ.</string> 
+     <string>私カモテナイノハトウ考エテモオ前ラカ悪イ!</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>テレビ東京</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>うたの☆プリンスさまっ♪ マジLOVE2000% (BSイレブン)</string> 
+     <string>義風堂々!!兼続と慶次 (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3036,88 +3068,108 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ウタ</string> 
-      </void> 
-      <void method="add"> 
-       <string>タノ</string> 
+       <string>義風</string> 
       </void> 
       <void method="add"> 
-       <string>ノ☆</string> 
+       <string>風堂</string> 
       </void> 
       <void method="add"> 
-       <string>☆フ</string> 
+       <string>堂々</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\95ã\83ª</string> 
+       <string>ã\80\85!</string> 
       </void> 
       <void method="add"> 
-       <string>リン</string> 
+       <string>!!</string> 
       </void> 
       <void method="add"> 
-       <string>ンス</string> 
+       <string>!兼</string> 
       </void> 
       <void method="add"> 
-       <string>スサ</string> 
+       <string>兼続</string> 
       </void> 
       <void method="add"> 
-       <string>サマ</string> 
+       <string>続ト</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\9eã\83\84</string> 
+       <string>ã\83\88æ\85¶</string> 
       </void> 
       <void method="add"> 
-       <string>ツ♪</string> 
+       <string>慶次</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>義風堂々!!兼続ト慶次</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>BSイレブン</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>超次元ゲイム ネプテュ－ヌ (BSイレブン)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>♪マ</string> 
+       <string>超次</string> 
       </void> 
       <void method="add"> 
-       <string>マシ</string> 
+       <string>次元</string> 
       </void> 
       <void method="add"> 
-       <string>シL</string> 
+       <string>元ケ</string> 
       </void> 
       <void method="add"> 
-       <string>LO</string> 
+       <string>ケイ</string> 
       </void> 
       <void method="add"> 
-       <string>OV</string> 
+       <string>イム</string> 
       </void> 
       <void method="add"> 
-       <string>VE</string> 
+       <string>ムネ</string> 
       </void> 
       <void method="add"> 
-       <string>E2</string> 
+       <string>ネフ</string> 
       </void> 
       <void method="add"> 
-       <string>20</string> 
+       <string>フテ</string> 
       </void> 
       <void method="add"> 
-       <string>00</string> 
+       <string>テユ</string> 
       </void> 
       <void method="add"> 
-       <string>00</string> 
+       <string>ユ-</string> 
       </void> 
       <void method="add"> 
-       <string>0%</string> 
+       <string>-ヌ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>ウタノ☆フリンスサマツ♪マシLOVE2000%</string> 
+     <string>超次元ケイムネフテユ-ヌ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>変態王子と笑わない猫。 (BSイレブン)</string> 
+     <string>超次元ゲイム　ネプテューヌ (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3125,52 +3177,55 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>変態</string> 
+       <string>超次</string> 
       </void> 
       <void method="add"> 
-       <string>æ\85\8bç\8e\8b</string> 
+       <string>次å\85\83</string> 
       </void> 
       <void method="add"> 
-       <string>王子</string> 
+       <string>元ケ</string> 
       </void> 
       <void method="add"> 
-       <string>子ト</string> 
+       <string>ケイ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ç¬\91</string> 
+       <string>ã\82¤ã\83 </string> 
       </void> 
       <void method="add"> 
-       <string>笑ワ</string> 
+       <string>ムネ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83¯ã\83\8a</string> 
+       <string>ã\83\8dã\83\95</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\8aã\82¤</string> 
+       <string>ã\83\95ã\83\86</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ç\8c«</string> 
+       <string>ã\83\86ã\83¦</string> 
       </void> 
       <void method="add"> 
-       <string>猫.</string> 
+       <string>ユヌ</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>変態王子ト笑ワナイ猫.</string> 
+     <string>超次元ケイムネフテユヌ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>テレビ東京</string> 
+    </void> 
+    <void property="disableRepeat"> 
+     <boolean>true</boolean> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>翠星のガルガンティア (BSイレブン)</string> 
+     <string>超速変形ジャイロゼッター (テレビ東京)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3178,49 +3233,52 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>翠星</string> 
+       <string>超速</string> 
+      </void> 
+      <void method="add"> 
+       <string>速変</string> 
       </void> 
       <void method="add"> 
-       <string>星ノ</string> 
+       <string>変形</string> 
       </void> 
       <void method="add"> 
-       <string>ノカ</string> 
+       <string>形シ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83«</string> 
+       <string>ã\82·ã\83¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83«ã\82«</string> 
+       <string>ã\83¤ã\82¤</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82«ã\83³</string> 
+       <string>ã\82¤ã\83­</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83³ã\83\86</string> 
+       <string>ã\83­ã\82»</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\86ã\82¤</string> 
+       <string>ã\82»ã\83\84</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\82¢</string> 
+       <string>ã\83\84ã\82¿</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>翠星ノカルカンテイア</string> 
+     <string>超速変形シヤイロセツタ</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>TwellV</string> 
+     <string>BSイレブン</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>デート・ア・ライブ (TwellV)</string> 
+     <string>進撃の巨人 (BSイレブン)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3228,43 +3286,34 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>テト</string> 
-      </void> 
-      <void method="add"> 
-       <string>ト/</string> 
-      </void> 
-      <void method="add"> 
-       <string>/ア</string> 
-      </void> 
-      <void method="add"> 
-       <string>ア/</string> 
+       <string>進撃</string> 
       </void> 
       <void method="add"> 
-       <string>/ラ</string> 
+       <string>撃ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83©ã\82¤</string> 
+       <string>ã\83\8eå·¨</string> 
       </void> 
       <void method="add"> 
-       <string>イフ</string> 
+       <string>巨人</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>テト/ア/ライフ</string> 
+     <string>進撃ノ巨人</string> 
     </void> 
    </object> 
   </void> 
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>BSイレブン</string> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>進撃の巨人 (BSイレブン)</string> 
+     <string>進撃の巨人 (ＴＯＫＹＯ　ＭＸ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3293,13 +3342,13 @@
   <void method="add"> 
    <object class="tainavi.TraceKey"> 
     <void property="center"> 
-     <string>ＢＳ日テレ</string> 
+     <string>フジテレビ</string> 
     </void> 
     <void property="fazzyThreshold"> 
      <int>35</int> 
     </void> 
     <void property="label"> 
-     <string>犬とハサミは使いよう (ＢＳ日テレ)</string> 
+     <string>銀の匙 (フジテレビ)</string> 
     </void> 
     <void property="okiniiri"> 
      <string>★★★★★</string> 
@@ -3307,36 +3356,115 @@
     <void property="searchStrKeys"> 
      <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>犬ト</string> 
+       <string>銀ノ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\83\88ã\83\8f</string> 
+       <string>ã\83\8eå\8c\99</string> 
       </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>銀ノ匙</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＴＯＫＹＯ　ＭＸ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>銀河機攻隊　マジェスティックプリンス (ＴＯＫＹＯ　ＭＸ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
       <void method="add"> 
-       <string>ハサ</string> 
+       <string>銀河</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82µã\83\9f</string> 
+       <string>æ²³æ©\9f</string> 
       </void> 
       <void method="add"> 
-       <string>ミハ</string> 
+       <string>機攻</string> 
       </void> 
       <void method="add"> 
-       <string>ハ使</string> 
+       <string>攻隊</string> 
       </void> 
       <void method="add"> 
-       <string>使イ</string> 
+       <string>隊マ</string> 
       </void> 
       <void method="add"> 
-       <string>ã\82¤ã\83¨</string> 
+       <string>ã\83\9eã\82·</string> 
       </void> 
       <void method="add"> 
-       <string>ヨウ</string> 
+       <string>シエ</string> 
+      </void> 
+      <void method="add"> 
+       <string>エス</string> 
+      </void> 
+      <void method="add"> 
+       <string>ステ</string> 
+      </void> 
+      <void method="add"> 
+       <string>テイ</string> 
+      </void> 
+      <void method="add"> 
+       <string>イツ</string> 
+      </void> 
+      <void method="add"> 
+       <string>ツク</string> 
+      </void> 
+      <void method="add"> 
+       <string>クフ</string> 
+      </void> 
+      <void method="add"> 
+       <string>フリ</string> 
+      </void> 
+      <void method="add"> 
+       <string>リン</string> 
+      </void> 
+      <void method="add"> 
+       <string>ンス</string> 
       </void> 
      </object> 
     </void> 
     <void property="titlePop"> 
-     <string>犬トハサミハ使イヨウ</string> 
+     <string>銀河機攻隊マシエステイツクフリンス</string> 
+    </void> 
+   </object> 
+  </void> 
+  <void method="add"> 
+   <object class="tainavi.TraceKey"> 
+    <void property="center"> 
+     <string>ＮＨＫ Ｅテレ</string> 
+    </void> 
+    <void property="fazzyThreshold"> 
+     <int>35</int> 
+    </void> 
+    <void property="label"> 
+     <string>黒魔女 (ＮＨＫ Ｅテレ)</string> 
+    </void> 
+    <void property="okiniiri"> 
+     <string>★★★★★</string> 
+    </void> 
+    <void property="searchStrKeys"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <string>黒魔</string> 
+      </void> 
+      <void method="add"> 
+       <string>魔女</string> 
+      </void> 
+     </object> 
+    </void> 
+    <void property="titlePop"> 
+     <string>黒魔女</string> 
     </void> 
    </object> 
   </void> 

diff --git a/TinyBannavi/src/remoteCtrl/Viewer.java b/TinyBannavi/src/remoteCtrl/Viewer.java
index 5caadbe..d23100f 100644 (file)
--- a/TinyBannavi/src/remoteCtrl/Viewer.java
+++ b/TinyBannavi/src/remoteCtrl/Viewer.java
@@ -987,7 +987,10 @@ public class Viewer extends JFrame {
                ArrayList<taiSync.RecorderInfo> syncrl = taiSync.RecorderInfo.load();\r
                \r
                for (RecorderInfo r : recInfos) {\r
-               if (r.getRecorderIPAddr().equals("") == true || r.getRecorderId().indexOf("RD-") == -1) {\r
+                       if ( r.getRecorderIPAddr().equals("") ) {\r
+                               continue;\r
+                       }\r
+               if ( r.getRecorderId().contains("RD-") || r.getRecorderId().contains("DBR-Z") ) {\r
                        continue;\r
                }\r
                \r

diff --git a/TinyBannavi/src/statusView/Viewer.java b/TinyBannavi/src/statusView/Viewer.java
index 0e06e1b..4d8bfaa 100644 (file)
--- a/TinyBannavi/src/statusView/Viewer.java
+++ b/TinyBannavi/src/statusView/Viewer.java
@@ -330,7 +330,10 @@ public class Viewer extends JFrame {
                \r
                // 必要なレコーダのみ抽出する\r
                for (RecorderInfo r : recInfos) {\r
-               if (r.getRecorderIPAddr().equals("") == true || r.getRecorderId().indexOf("RD-") == -1) {\r
+                       if ( r.getRecorderIPAddr().equals("") ) {\r
+                               continue;\r
+                       }\r
+               if ( r.getRecorderId().contains("RD-") || r.getRecorderId().contains("DBR-Z") ) {\r
                        continue;\r
                }\r
                \r

diff --git a/TinyBannavi/src/tainavi/AbsKeywordDialog.java b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
index f91dbbf..33223c0 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsKeywordDialog.java
+++ b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
@@ -1,10 +1,13 @@
 package tainavi;\r
 \r
+import java.awt.Color;\r
 import java.awt.Dimension;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
 import java.awt.event.ItemEvent;\r
 import java.awt.event.ItemListener;\r
+import java.awt.event.MouseAdapter;\r
+import java.awt.event.MouseEvent;\r
 import java.util.ArrayList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
@@ -126,6 +129,7 @@ abstract class AbsKeywordDialog extends JDialog {
        private JComboBox jComboBox_regex = null;\r
        private JComboBox jComboBox_contain = null;\r
        private JButton jButton_add = null;\r
+       private JButton jButton_replace = null;\r
        private JButton jButton_remove = null;\r
        private JComboBox jComboBox_condition = null;\r
        private JComboBox jComboBox_infection = null;\r
@@ -143,12 +147,14 @@ abstract class AbsKeywordDialog extends JDialog {
        // コンポーネント以外\r
        \r
        private String windowTitle = "";\r
-       private String originalLabel = "";\r
        private SearchProgram xKeys = null;\r
        private SearchGroupList xGroups = null;\r
+       private SearchKey xKey = null;\r
        \r
        private boolean reg = false;\r
        \r
+       private int selectedRow = -1;\r
+       \r
        private ArrayList<TargetId> target_items = new ArrayList<TargetId>();\r
        private ArrayList<String> contain_items = new ArrayList<String>(); \r
        private ArrayList<String> condition_items = new ArrayList<String>(); \r
@@ -209,31 +215,45 @@ abstract class AbsKeywordDialog extends JDialog {
         */\r
        public boolean isRegistered() { return reg; } \r
        \r
-       // 使っている人いないね…\r
-       /*\r
-       private void open(String s, SearchProgram sKeys) {\r
-               //\r
-               xKeys = sKeys;\r
-               //\r
-               jComboBox_target.setSelectedIndex(0);\r
-               jComboBox_contain.setSelectedIndex(0);\r
-               jComboBox_condition.setSelectedIndex(0);\r
-               for (int i=jTable_keywords.getRowCount()-1; i>=0; i--) {\r
-                       jTable_keywords.getRowItemList().remove(i);\r
+       /***************************************\r
+        * 新規オープン２種＋１種\r
+        **************************************/\r
+       \r
+       // キーワード検索管理としてのオープン（右クリックメニューから新規）\r
+       public void open(SearchProgram sKeys, SearchGroupList gList, ProgDetailList tvd) {\r
+               \r
+               SearchKey sK = new SearchKey();\r
+               \r
+               // タイトル\r
+               {\r
+                       sK.setCondition("0");\r
+                       sK.alTarget.add(TargetId.TITLE);\r
+                       sK.alContain.add("0");\r
+                       sK.alKeyword.add(tvd.title);\r
                }\r
-               //\r
-               jTextField_label.setText(s);\r
-               jTextField_label.setCaretPosition(0);\r
-               jComboBox_regex.addItem(s);\r
+               \r
+               // 放送局\r
+               {\r
+                       sK.setCondition("0");\r
+                       sK.alTarget.add(TargetId.CHANNEL);\r
+                       sK.alContain.add("0");\r
+                       sK.alKeyword.add(tvd.center);\r
+               }\r
+               \r
+               sK.setCaseSensitive(false);\r
+               sK.setShowInStandby(true);\r
+               \r
+               open(tvd.title,sKeys,gList,sK);\r
        }\r
-       */\r
        \r
-       // キーワード検索管理としてのオープン（新規）\r
-       public void open(String label, SearchKey sK, SearchProgram sKeys, SearchGroupList gList) {\r
-               //\r
+       // キーワード検索管理としてのオープン（ツールバーから新規）\r
+       public void open(String label, SearchProgram sKeys, SearchGroupList gList, SearchKey sK) {\r
+               \r
                xKeys = sKeys;\r
-               xGroups = gList; \r
-               //\r
+               xGroups = gList;\r
+               xKey = null;\r
+               \r
+               // テーブルの作り直し\r
                jComboBox_target.setSelectedIndex(0);\r
                jComboBox_contain.setSelectedIndex(0);\r
                jComboBox_condition.setSelectedIndex(0);\r
@@ -242,7 +262,6 @@ abstract class AbsKeywordDialog extends JDialog {
                }\r
                //\r
                for (int i=0; i<sK.alTarget.size(); i++) {\r
-                       \r
                        KDItem data = new KDItem();\r
                        data.target = sK.alTarget.get(i);\r
                        data.regex = sK.alKeyword.get(i);\r
@@ -252,9 +271,11 @@ abstract class AbsKeywordDialog extends JDialog {
                }\r
                jTable_keywords.fireChanged();\r
                \r
+               // ラベル\r
                jTextField_label.setText(label);\r
                jTextField_label.setCaretPosition(0);\r
-               //\r
+               \r
+               // グループリスト\r
                if ( xGroups != null && xGroups.size() != 0 ) {\r
                        jComboBox_group.setEnabled(true);\r
                        jComboBox_group.addItem("");\r
@@ -263,14 +284,22 @@ abstract class AbsKeywordDialog extends JDialog {
                        }\r
                }\r
 \r
+               // オプション\r
+               jComboBox_okiniiri.setEnabled(true);\r
                jCheckBox_caseSensitive.setSelected(sK.getCaseSensitive());\r
                jCheckBox_showInStandby.setSelected(sK.getShowInStandby());\r
+               jCheckBox_showInStandby.setEnabled(true);\r
+               \r
+               //\r
+               jButton_add.setText("登録");\r
        }\r
        \r
        // 延長警告管理としてのオープン（新規）\r
        public void open(String title, String center, boolean isInfection, SearchProgram sKeys) {\r
                //\r
                xKeys = sKeys;\r
+               xGroups = null;\r
+               xKey = null;\r
                //\r
                if (isInfection) {\r
                        jTextField_label.setText("●"+title);\r
@@ -309,65 +338,105 @@ abstract class AbsKeywordDialog extends JDialog {
                jTable_keywords.getRowItemList().add(d2);\r
                \r
                jTable_keywords.fireChanged();\r
+               \r
+               // オプション\r
+               jComboBox_okiniiri.setEnabled(false);\r
+               jCheckBox_caseSensitive.setSelected(false);\r
+               jCheckBox_showInStandby.setSelected(false);\r
+               jCheckBox_showInStandby.setEnabled(false);\r
+               \r
+               //\r
+               jButton_label.setText("登録");\r
        }\r
        \r
+       /***************************************\r
+        * 新規オープン１種＋１種＋α\r
+        **************************************/\r
+       \r
        // キーワード検索管理としてのオープン（更新）\r
-       public void reopen(String s, SearchProgram sKeys) {\r
-               //\r
+       public void reopen(String label, SearchProgram sKeys) {\r
+       \r
                xKeys = sKeys;\r
-               originalLabel = s;\r
-               //\r
-               jTextField_label.setText(s);\r
-               jTextField_label.setCaretPosition(0);\r
-\r
-               jComboBox_regex.addItem("");\r
-               jComboBox_target.setSelectedIndex(0);\r
-               jComboBox_contain.setSelectedIndex(0);\r
-               jComboBox_condition.setSelectedIndex(0);\r
-               for (int i=jTable_keywords.getRowCount()-1; i>=0; i--) {\r
-                       jTable_keywords.getRowItemList().remove(i);\r
-               }\r
-               //\r
+               xGroups = null;\r
+               \r
                for (SearchKey k : xKeys.getSearchKeys()) {\r
-                       if (k.getLabel().equals(s)) {\r
-                       jComboBox_condition.setSelectedIndex(Integer.valueOf(k.getCondition()));\r
-                       \r
-                               Matcher ma = Pattern.compile("(.*?)\t").matcher(k.getTarget());\r
-                               Matcher mb = Pattern.compile("(.*?)\t").matcher(k.getKeyword());\r
-                               Matcher mc = Pattern.compile("(.*?)\t").matcher(k.getContain());\r
-                               while (ma.find()) {\r
-                                       mb.find();\r
-                                       mc.find();\r
-                                       KDItem data = new KDItem();\r
-                                       data.target = TargetId.getTargetId(ma.group(1));\r
-                                       data.regex = mb.group(1);\r
-                                       data.contain = contain_items.get(Integer.valueOf(mc.group(1)));\r
-                                       data.fireChanged();\r
-                                       jTable_keywords.getRowItemList().add(data);\r
-                               }\r
-                               \r
-                               jComboBox_okiniiri.setSelectedItem(k.getOkiniiri());\r
-                               \r
-                               jCheckBox_caseSensitive.setSelected(k.getCaseSensitive());\r
-                               jCheckBox_showInStandby.setSelected(k.getShowInStandby());\r
+                       if (k.getLabel().equals(label)) {\r
+                               // 操作対象をみつけた\r
+                               _reopen(sKeys, k);\r
+                               break;\r
                        }\r
                }\r
-               \r
-               jTable_keywords.fireChanged();\r
        }\r
        \r
        // 延長警告管理としてのオープン（更新）\r
-       public void reopen(String s, ExtProgram sKeys) {\r
-               //\r
+       public void reopen(String label, ExtProgram sKeys) {\r
+       \r
+               xKeys = sKeys;\r
+               xGroups = null;\r
+               \r
                for (SearchKey k : sKeys.getSearchKeys()) {\r
-                       if (k.getLabel().equals(s)) {\r
+                       if (k.getLabel().equals(label)) {\r
+                               // 操作対象をみつけた\r
                                int idx = Integer.valueOf(k.getInfection());\r
                                if (jComboBox_infection.getItemCount() >= idx) {\r
                                        jComboBox_infection.setSelectedIndex(idx);\r
                                }\r
+                               _reopen((SearchProgram)sKeys, k);\r
+                               break;\r
                        }\r
                }\r
-               reopen(s,(SearchProgram)sKeys);\r
+       }\r
+       \r
+       private void _reopen(SearchProgram sKeys, SearchKey sKey) {\r
+               \r
+               xKey = sKey;\r
+               \r
+               jComboBox_regex.addItem("");\r
+               jComboBox_target.setSelectedIndex(0);\r
+               jComboBox_contain.setSelectedIndex(0);\r
+               jComboBox_condition.setSelectedIndex(0);\r
+               for (int i=jTable_keywords.getRowCount()-1; i>=0; i--) {\r
+                       jTable_keywords.getRowItemList().remove(i);\r
+               }\r
+               \r
+               jComboBox_condition.setSelectedIndex(Integer.valueOf(xKey.getCondition()));\r
+               \r
+               Matcher ma = Pattern.compile("(.*?)\t").matcher(xKey.getTarget());\r
+               Matcher mb = Pattern.compile("(.*?)\t").matcher(xKey.getKeyword());\r
+               Matcher mc = Pattern.compile("(.*?)\t").matcher(xKey.getContain());\r
+               while (ma.find()) {\r
+                       mb.find();\r
+                       mc.find();\r
+                       KDItem data = new KDItem();\r
+                       data.target = TargetId.getTargetId(ma.group(1));\r
+                       data.regex = mb.group(1);\r
+                       data.contain = contain_items.get(Integer.valueOf(mc.group(1)));\r
+                       data.fireChanged();\r
+                       jTable_keywords.getRowItemList().add(data);\r
+               }\r
+               \r
+               jComboBox_okiniiri.setSelectedItem(xKey.getOkiniiri());\r
+               \r
+               jCheckBox_caseSensitive.setSelected(xKey.getCaseSensitive());\r
+               if ( sKeys instanceof ExtProgram ) {\r
+                       jComboBox_okiniiri.setEnabled(false);\r
+                       jCheckBox_showInStandby.setSelected(false);\r
+                       jCheckBox_showInStandby.setEnabled(false);\r
+               }\r
+               else {\r
+                       jComboBox_okiniiri.setEnabled(true);\r
+                       jCheckBox_showInStandby.setSelected(xKey.getShowInStandby());\r
+                       jCheckBox_showInStandby.setEnabled(true);\r
+               }\r
+               \r
+               jTextField_label.setText(xKey.getLabel());\r
+               jTextField_label.setCaretPosition(0);\r
+\r
+               //\r
+               jTable_keywords.fireChanged();\r
+               \r
+               //\r
+               jButton_label.setText("更新");\r
        }\r
        \r
        /**\r
@@ -449,35 +518,50 @@ abstract class AbsKeywordDialog extends JDialog {
        private final ActionListener al_save = new ActionListener() {\r
                @Override\r
                public void actionPerformed(ActionEvent e) {\r
-                       if (jTextField_label.getText().equals("") || jTable_keywords.getRowCount()<=0) {\r
-                               return;\r
-                       }\r
-                       \r
-                       SearchKey sk = skCompile();\r
-                       if (sk == null) {\r
-                               return;\r
-                       }\r
-                       \r
-                       // 検索キーワードを保存する\r
-                       if (xKeys.replace(originalLabel, sk) == null) {\r
-                               xKeys.add(sk);\r
-                       }\r
-                       xKeys.save();\r
-                       \r
-                       // グループに登録するかも\r
-                       if ( jComboBox_group.getSelectedItem() != null && ! ((String)jComboBox_group.getSelectedItem()).equals("")) {\r
-                               xGroups.add((String)jComboBox_group.getSelectedItem(),sk.getLabel());\r
-                               xGroups.save();\r
-                       }\r
-                       \r
-                       // 登録したお！\r
-                       reg = true;\r
-                       \r
                        // ウィンドウを閉じる\r
-                       dispose();\r
+                       if ( addToSearchKeyList() ) {\r
+                               dispose();\r
+                       }\r
                }\r
        };\r
        \r
+       private boolean addToSearchKeyList() {\r
+               if (jTextField_label.getText().equals("") || jTable_keywords.getRowCount()<=0) {\r
+                       return false;\r
+               }\r
+               \r
+               // 重複登録を許さない\r
+               for ( SearchKey k : xKeys.getSearchKeys() ) {\r
+                       if ( k != xKey && k.getLabel().equals(getNewLabel()) ) {\r
+                               JOptionPane.showConfirmDialog(this, "既に登録されています:"+getNewLabel(), "警告", JOptionPane.CLOSED_OPTION);                                                      // キーワード検索の追加ではダイアログで修正できるので止めない\r
+                               return false;\r
+                       }\r
+               }\r
+               \r
+               SearchKey sk = skCompile();\r
+               if (sk == null) {\r
+                       return false;\r
+               }\r
+               \r
+               // 検索キーワードを保存する\r
+               if ( xKey == null ) {\r
+                       xKeys.add(sk);\r
+               }\r
+               else {\r
+                       xKeys.replace(xKey, sk);\r
+               }\r
+               reg = xKeys.save();\r
+               \r
+               // グループに登録するかも\r
+               String grpName = (String)jComboBox_group.getSelectedItem();\r
+               if ( grpName != null && grpName.length() > 0 ) {\r
+                       xGroups.add(grpName,sk.getLabel());\r
+                       xGroups.save();\r
+               }\r
+               \r
+               return reg;\r
+       }\r
+       \r
        /**\r
         * キャンセルしたい\r
         */\r
@@ -552,6 +636,7 @@ abstract class AbsKeywordDialog extends JDialog {
                }\r
        };\r
        \r
+       \r
        /**\r
         * 条件を追加する\r
         */\r
@@ -571,44 +656,79 @@ abstract class AbsKeywordDialog extends JDialog {
                        data.regex = re;\r
                        data.contain = (String) jComboBox_contain.getSelectedItem();\r
                        data.fireChanged();\r
-                       jTable_keywords.getRowItemList().add(data);\r
+                       if ( selectedRow == -1 ) {\r
+                               jTable_keywords.getRowItemList().add(data);\r
+                       }\r
+                       else {\r
+                               jTable_keywords.getRowItemList().add(selectedRow+1, data);\r
+                       }\r
                        jTable_keywords.fireChanged();\r
                        \r
                        if (jComboBox_regex.getItemCount() <= 1) {\r
                                jComboBox_regex.removeAllItems();\r
                                jComboBox_regex.addItem("");\r
                        }\r
+                       \r
+                       selectedRow = -1;\r
+                       jButton_replace.setEnabled(false);\r
+                       jButton_remove.setEnabled(false);\r
                }\r
        };\r
        \r
+       \r
        /**\r
-        * 条件を削除する（コンボボックスに戻す）\r
+        * 条件を置換する\r
         */\r
-       private final ActionListener al_removeTarget = new ActionListener() {\r
+       private final ActionListener al_replaceTarget = new ActionListener() {\r
                @Override\r
                public void actionPerformed(ActionEvent e) {\r
-                       int row = -1;\r
-                       if ((row = jTable_keywords.getSelectedRow()) == -1) {\r
+                       if ( selectedRow == -1 ) {\r
                                return;\r
                        }\r
                        \r
-                       KDItem c = jTable_keywords.getRowItemList().get(row);\r
-                       jComboBox_target.setSelectedItem(c.target);\r
-                       if (jComboBox_target.getSelectedItem() ==  TargetId.GENRE ||\r
-                                       jComboBox_target.getSelectedItem() ==  TargetId.SUBGENRE ||\r
-                                       jComboBox_target.getSelectedItem() ==  TargetId.LENGTH ||\r
-                                       jComboBox_target.getSelectedItem() ==  TargetId.STARTA ||\r
-                                       jComboBox_target.getSelectedItem() ==  TargetId.STARTZ ) {\r
-                               jComboBox_regex.setSelectedItem(c.regex);\r
+                       TargetId ti = (TargetId) jComboBox_target.getSelectedItem();\r
+                       String re = (String) jComboBox_regex.getSelectedItem();\r
+                       \r
+                       if ( ti.getUseKeyword() && re.length() == 0 ) {\r
+                               // キーワードが必要なのに入力されていなければＮＧ\r
+                               return;\r
                        }\r
-                       else {\r
+                       \r
+                       KDItem data = jTable_keywords.getRowItemList().get(selectedRow);\r
+                       data.target = ti;\r
+                       data.regex = re;\r
+                       data.contain = (String) jComboBox_contain.getSelectedItem();\r
+                       data.fireChanged();\r
+                       jTable_keywords.fireChanged();\r
+                       \r
+                       if (jComboBox_regex.getItemCount() <= 1) {\r
                                jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.addItem(c.regex);\r
+                               jComboBox_regex.addItem("");\r
                        }\r
-                       jComboBox_contain.setSelectedItem(c.contain);\r
                        \r
-                       jTable_keywords.getRowItemList().remove(jTable_keywords.getSelectedRow());\r
+                       selectedRow = -1;\r
+                       jButton_replace.setEnabled(false);\r
+                       jButton_remove.setEnabled(false);\r
+               }\r
+       };\r
+       \r
+       \r
+       /**\r
+        * 条件を削除する（コンボボックスに戻す）\r
+        */\r
+       private final ActionListener al_removeTarget = new ActionListener() {\r
+               @Override\r
+               public void actionPerformed(ActionEvent e) {\r
+                       if ( selectedRow == -1 ) {\r
+                               return;\r
+                       }\r
+                       \r
+                       jTable_keywords.getRowItemList().remove(selectedRow);\r
                        jTable_keywords.fireChanged();\r
+                       \r
+                       selectedRow = -1;\r
+                       jButton_replace.setEnabled(false);\r
+                       jButton_remove.setEnabled(false);\r
                }\r
        };\r
        \r
@@ -622,6 +742,7 @@ abstract class AbsKeywordDialog extends JDialog {
                        if ( jTable_keywords.getRowItemList().up(row, 1) ) {\r
                                jTable_keywords.fireChanged();\r
                                jTable_keywords.setRowSelectionInterval(row-1,row-1);\r
+                               selectedRow = row-1;\r
                        }\r
                }\r
        };\r
@@ -636,10 +757,45 @@ abstract class AbsKeywordDialog extends JDialog {
                        if ( jTable_keywords.getRowItemList().down(row, 1) ) {\r
                                jTable_keywords.fireChanged();\r
                                jTable_keywords.setRowSelectionInterval(row+1,row+1);\r
+                               selectedRow = row+1;\r
                        }\r
                }\r
        };\r
 \r
+       /**\r
+        * 行を選択したら編集ブロックにコピーする\r
+        */\r
+       private final MouseAdapter ml_keywordSelected = new MouseAdapter() {\r
+               @Override\r
+               public void mouseClicked(MouseEvent e) {\r
+                       int row = jTable_keywords.getSelectedRow();\r
+                       if (row == -1) {\r
+                               return;\r
+                       }\r
+                       \r
+                       KDItem c = jTable_keywords.getRowItemList().get(row);\r
+                       \r
+                       jComboBox_target.setSelectedItem(c.target);\r
+                       \r
+                       if ( ! c.target.getUseRegexpr() && c.target.getUseKeyword() ) {\r
+                               jComboBox_regex.setSelectedItem(c.regex);\r
+                       }\r
+                       else {\r
+                               jComboBox_regex.removeAllItems();\r
+                               if ( c.target.getUseRegexpr() ) {\r
+                                       jComboBox_regex.addItem(c.regex);\r
+                               }\r
+                       }\r
+                       \r
+                       jComboBox_contain.setSelectedItem(c.contain);\r
+                       \r
+                       selectedRow = row;\r
+                       jButton_replace.setEnabled(true);\r
+                       jButton_remove.setEnabled(true);\r
+               }\r
+       };\r
+       \r
+       \r
        /*******************************************************************************\r
         * コンポーネント\r
         ******************************************************************************/\r
@@ -667,9 +823,9 @@ abstract class AbsKeywordDialog extends JDialog {
                        CommonSwingUtils.putComponentOn(jPanel, getJComboBox_contain(), TARGET_WIDTH, PARTS_HEIGHT, x+=REGEX_WIDTH+SEP_WIDTH, y);\r
                        \r
                        y += PARTS_HEIGHT+SEP_HEIGHT_NARROW;\r
-                       x = (TABLE_WIDTH/2-(BUTTON_WIDTH_L+SEP_WIDTH/2))+SEP_WIDTH;\r
-                       CommonSwingUtils.putComponentOn(jPanel, getJButton_add("追加↓"), BUTTON_WIDTH_L, PARTS_HEIGHT, x , y);\r
-                       CommonSwingUtils.putComponentOn(jPanel, getJButton_remove("↑削除"), BUTTON_WIDTH_L, PARTS_HEIGHT, x+=BUTTON_WIDTH_L+SEP_WIDTH, y);\r
+                       x = SEP_HEIGHT+TABLE_WIDTH/2;\r
+                       CommonSwingUtils.putComponentOn(jPanel, getJButton_add("追加↓"), BUTTON_WIDTH_L, PARTS_HEIGHT, x-(BUTTON_WIDTH_L+SEP_WIDTH*2) , y);\r
+                       CommonSwingUtils.putComponentOn(jPanel, getJButton_replace("置換↓"), BUTTON_WIDTH_L, PARTS_HEIGHT, x+(SEP_WIDTH*2), y);\r
                        \r
                        CommonSwingUtils.putComponentOn(jPanel, getJCheckBox_caseSensitive("文字列比較は完全一致で",CHECKLABEL_WIDTH,false), CHECKBOX_WIDTH, PARTS_HEIGHT, PANEL_WIDTH-CHECKBOX_WIDTH-SEP_WIDTH, y);\r
                        \r
@@ -682,6 +838,7 @@ abstract class AbsKeywordDialog extends JDialog {
                        int yz = y + (TABLE_HEIGHT/2-(PARTS_HEIGHT+SEP_HEIGHT/2));\r
                        CommonSwingUtils.putComponentOn(jPanel, getJButton_up("↑"), UPDOWN_WIDTH, PARTS_HEIGHT, TABLEPANE_WIDTH+SEP_WIDTH*2, yz);\r
                        CommonSwingUtils.putComponentOn(jPanel, getJButton_down("↓"), UPDOWN_WIDTH, PARTS_HEIGHT, TABLEPANE_WIDTH+SEP_WIDTH*2, yz+=SEP_HEIGHT+PARTS_HEIGHT);\r
+                       CommonSwingUtils.putComponentOn(jPanel, getJButton_remove("削除"), UPDOWN_WIDTH, PARTS_HEIGHT, TABLEPANE_WIDTH+SEP_WIDTH*2, yz+=SEP_HEIGHT*2+PARTS_HEIGHT);\r
 \r
                        y += TABLE_HEIGHT+SEP_HEIGHT;\r
                        x = SEP_WIDTH;\r
@@ -881,17 +1038,33 @@ abstract class AbsKeywordDialog extends JDialog {
                if (jButton_add == null) {\r
                        jButton_add = new JButton();\r
                        jButton_add.setText(s);\r
+                       jButton_add.setEnabled(true);\r
                        \r
                        jButton_add.addActionListener(al_addTarget);\r
                }\r
                return(jButton_add);\r
        }\r
        \r
+       // 条件置換のボタン\r
+       private JButton getJButton_replace(String s) {\r
+               if (jButton_replace == null) {\r
+                       jButton_replace = new JButton();\r
+                       jButton_replace.setText(s);\r
+                       jButton_replace.setEnabled(false);\r
+                       jButton_replace.setForeground(Color.BLUE);\r
+                       \r
+                       jButton_replace.addActionListener(al_replaceTarget);\r
+               }\r
+               return(jButton_replace);\r
+       }\r
+       \r
        // 条件削除のボタン\r
        private JButton getJButton_remove(String s) {\r
                if (jButton_remove == null) {\r
                        jButton_remove = new JButton();\r
                        jButton_remove.setText(s);\r
+                       jButton_remove.setEnabled(false);\r
+                       jButton_remove.setForeground(Color.RED);\r
                        \r
                        jButton_remove.addActionListener(al_removeTarget);\r
                }\r
@@ -956,6 +1129,8 @@ abstract class AbsKeywordDialog extends JDialog {
                                columnModel.getColumn(rc.ordinal()).setPreferredWidth(rc.getIniWidth());;\r
                        }\r
 \r
+                       // 行を選択したら入力に値を戻す\r
+                       jTable_keywords.addMouseListener(ml_keywordSelected);\r
                }\r
                return(jTable_keywords);\r
        }\r

diff --git a/TinyBannavi/src/tainavi/AbsReserveDialog.java b/TinyBannavi/src/tainavi/AbsReserveDialog.java
index 87a9ac8..a25c597 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsReserveDialog.java
+++ b/TinyBannavi/src/tainavi/AbsReserveDialog.java
@@ -11,6 +11,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;\r
 \r
 import javax.swing.JDialog;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 \r
@@ -449,11 +450,6 @@ abstract class AbsReserveDialog extends JDialog implements HDDRecorderListener,R
                        MWin.appendMessage(MSGID+"画質・音質の自動設定候補がありません： "+recId+" & "+selected_key);\r
                }\r
                \r
-               // TvRockではコンピュータ名は指定しない\r
-               if ( "TvRock".equals(recId) ) {\r
-                       myavs.setLvoice(null);\r
-               }\r
-               \r
                return myavs;\r
        }\r
        \r
@@ -488,11 +484,6 @@ abstract class AbsReserveDialog extends JDialog implements HDDRecorderListener,R
                \r
                r.setExec(true);\r
                \r
-               // TvRockではコンピュータ名は指定しない\r
-               if ( "TvRock".equals(recorder.getRecorderId()) ) {\r
-                       r.setRec_lvoice(null);\r
-               }\r
-               \r
                return r;\r
        }\r
        \r
@@ -857,6 +848,13 @@ abstract class AbsReserveDialog extends JDialog implements HDDRecorderListener,R
                jPane_title.getSelectedValues(newRsv);                  // タイトル\r
                jPane_recsetting.getSelectedValues(newRsv);             // 録画設定\r
                \r
+               if ( newRsv.getRec_audio() == HDDRecorder.ITEM_REC_TYPE_EPG &&\r
+                               (newRsv.getContentId() == null || newRsv.getContentId().length() == 0) ) {\r
+                       ringBeep();\r
+                       JOptionPane.showConfirmDialog(this, "EPG予約では番組IDが必要になります。", "警告", JOptionPane.CLOSED_OPTION);\r
+                       return;\r
+               }\r
+               \r
                newRsv.setId(null);                                                             // PostRdEntry()中で取得するのでここはダミー\r
                newRsv.setUpdateOnlyExec(false);                                // 新規ONLYなのでfalse固定\r
 \r
@@ -938,6 +936,13 @@ abstract class AbsReserveDialog extends JDialog implements HDDRecorderListener,R
                jPane_title.getSelectedValues(newRsv);                          // タイトル\r
                jPane_recsetting.getSelectedValues(newRsv);                     // 録画設定\r
                \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
+                       ringBeep();\r
+                       JOptionPane.showConfirmDialog(this, String.format("%s予約を%s予約には変更できません。",oldRsv.getRec_audio(),newRsv.getRec_audio()), "警告", JOptionPane.CLOSED_OPTION);\r
+                       return;\r
+               }\r
+               \r
                newRsv.setId(oldRsv.getId());                                           // 更新では引き継ぐ\r
                newRsv.setUpdateOnlyExec(vals.isUpdateOnlyExec);        // 実行ON・OFFのみかもしんない\r
 \r

diff --git a/TinyBannavi/src/tainavi/JListSortDialog.java b/TinyBannavi/src/tainavi/JListSortDialog.java
index 66b02b2..c6ddb12 100644 (file)
--- a/TinyBannavi/src/tainavi/JListSortDialog.java
+++ b/TinyBannavi/src/tainavi/JListSortDialog.java
@@ -26,6 +26,7 @@ public class JListSortDialog extends JDialog {
        private JPanel jpan = null;\r
        private JButton jbtn_update = null;\r
        private JButton jbtn_cancel = null;\r
+       private JButton jbtn_sort = null;\r
        private JButton jbtn_remove = null;\r
        private JButton jbtn_up = null;\r
        private JButton jbtn_down = null;\r
@@ -76,6 +77,8 @@ public class JListSortDialog extends JDialog {
                        int y = 10;\r
                        CommonSwingUtils.putComponentOn(jpan, getJScr_entries(), 400, 500, 10, y);\r
                        \r
+                       CommonSwingUtils.putComponentOn(jpan, getJBtn_sort("ソート"), 100, 25, 10+400+10, y+500-(10+25)*8);\r
+                       \r
                        CommonSwingUtils.putComponentOn(jpan, getJBtn_remove("削除"), 100, 25, 10+400+10, y+500-(10+25)*4);\r
                        \r
                        CommonSwingUtils.putComponentOn(jpan, getJBtn_up("上へ"), 100, 25, 10+400+10, y+500-(10+25)*2);\r
@@ -129,6 +132,37 @@ public class JListSortDialog extends JDialog {
                return jtbl_entries;\r
        }\r
        \r
+       // ソート\r
+       private JButton getJBtn_sort(String s) {\r
+               if (jbtn_sort == null) {\r
+                       jbtn_sort = new JButton(s);\r
+                       jbtn_sort.addActionListener(new ActionListener() {\r
+                               @Override\r
+                               public void actionPerformed(ActionEvent e) {\r
+                                       ArrayList<String> tmpData = new ArrayList<String>();\r
+                                       for ( String data : rowData ) {\r
+                                               int index = 0;\r
+                                               for ( ; index<tmpData.size(); index++ ) {\r
+                                                       String tmp = tmpData.get(index);\r
+                                                       if ( tmp.compareTo(data) > 0 ) {\r
+                                                               break;\r
+                                                       }\r
+                                               }\r
+                                               tmpData.add(index,data);\r
+                                       }\r
+                                       \r
+                                       rowData.clear();\r
+                                       for ( String tmp : tmpData ) {\r
+                                               rowData.add(tmp);\r
+                                       }\r
+                                       \r
+                                       ((DefaultTableModel) jtbl_entries.getModel()).fireTableDataChanged();\r
+                               }\r
+                       });\r
+               }\r
+               return jbtn_sort;\r
+       }\r
+       \r
        // 削除\r
        private JButton getJBtn_remove(String s) {\r
                if (jbtn_remove == null) {\r

diff --git a/TinyBannavi/src/tainavi/RecSettingEditorPanel.java b/TinyBannavi/src/tainavi/RecSettingEditorPanel.java
index abe4b40..c5a70fa 100644 (file)
--- a/TinyBannavi/src/tainavi/RecSettingEditorPanel.java
+++ b/TinyBannavi/src/tainavi/RecSettingEditorPanel.java
@@ -116,7 +116,9 @@ public class RecSettingEditorPanel extends JPanel {
                jButton_load.addActionListener(f_al_loadAction);\r
                jButton_save.addActionListener(f_al_saveAction);\r
                jButton_savedefault.addActionListener(f_al_saveDefaultAction);\r
-               jCBXPanel_audiorate.addItemListener(f_il_arateChanged);\r
+               jCBXPanel_audiorate.addItemListener(f_il_recTypeChanged);\r
+               jCBXPanel_msChapter.addItemListener(f_il_marginTopChanged);\r
+               jCBXPanel_mvChapter.addItemListener(f_il_marginBottomChanged);\r
                \r
                // 付けたり外したりするリスナー\r
                setEnabledListenerAll(true);\r
@@ -627,8 +629,16 @@ public class RecSettingEditorPanel extends JPanel {
        private String setSelectedValue(JComboBoxPanel comp, String value) {\r
                \r
                if ( value != null && value.length() > 0 ) {\r
+                       int index = comp.getSelectedIndex();\r
                        comp.setSelectedItem(null);\r
                        comp.setSelectedItem(value);\r
+                       String s = (String) comp.getSelectedItem();\r
+                       if ( s != null ) {\r
+                               return s;\r
+                       }\r
+                       \r
+                       // 存在しない選択肢が指定されたからもともと選択してた項目を選びなおすわー\r
+                       comp.setSelectedIndex(index);\r
                }\r
                else if ( comp.getItemCount() > 0 ){\r
                        comp.setSelectedItem(null);\r
@@ -743,49 +753,84 @@ public class RecSettingEditorPanel extends JPanel {
        /**\r
         * EPG予約以外では番組追従が設定できないようにしたいな\r
         */\r
-       private final ItemListener f_il_arateChanged = new ItemListener() {\r
+       private final ItemListener f_il_recTypeChanged = new ItemListener() {\r
                @Override\r
                public void itemStateChanged(ItemEvent e) {\r
                        if ( e.getStateChange() != ItemEvent.SELECTED ) {\r
                                return;\r
                        }\r
 \r
-                       jCBXPanel_msChapter.setLabelForeground(Color.BLACK);\r
-                       jCBXPanel_mvChapter.setLabelForeground(Color.BLACK);\r
-                       jCBXPanel_pursues.setEnabled(true);\r
-                       \r
+\r
                        String pgtype = (String) jCBXPanel_audiorate.getSelectedItem();\r
                        if ( pgtype == HDDRecorder.ITEM_REC_TYPE_PROG ) {\r
                                // "ﾌﾟﾗｸﾞﾗﾑ予約"なら触る必要なし\r
                                jCBXPanel_pursues.setSelectedItem(ITEM_NO);\r
                                jCBXPanel_pursues.setEnabled(false);\r
+                               checkMarginTop(true);\r
+                               checkMarginBottom(true);\r
+                       }\r
+                       else if ( pgtype == HDDRecorder.ITEM_REC_TYPE_EPG ) {\r
+                               jCBXPanel_pursues.setSelectedItem(ITEM_YES);    // EPG予約にするなら追従ありがデフォルトでいいだろ？\r
+                               jCBXPanel_pursues.setEnabled(true);\r
+                               checkMarginTop(true);\r
+                               checkMarginBottom(true);\r
                        }\r
                        else {\r
-                               if ( pgtype == HDDRecorder.ITEM_REC_TYPE_EPG ) {\r
-                                       try {\r
-                                               jCBXPanel_pursues.setSelectedItem(ITEM_YES);    // EPG予約にするなら追従ありがデフォルトでいいだろ？\r
-                                               \r
-                                               if ( Integer.valueOf((String) jCBXPanel_msChapter.getSelectedItem()) <= 0 ) {\r
-                                                       // 開始マージン０は危ないよね\r
-                                                       jCBXPanel_msChapter.setLabelForeground(Color.RED);\r
-                                               }\r
-                                       }\r
-                                       catch (NumberFormatException ev) {\r
-                                               //\r
-                                       }\r
-                                       try {\r
-                                               if ( Integer.valueOf((String) jCBXPanel_mvChapter.getSelectedItem()) <= 0 ) {\r
-                                                       // 終了マージン０は危ないよね\r
-                                                       jCBXPanel_mvChapter.setLabelForeground(Color.RED);\r
-                                               }\r
-                                       }\r
-                                       catch (NumberFormatException ev) {\r
-                                               //\r
-                                       }\r
-                               }\r
+                               jCBXPanel_pursues.setEnabled(true);\r
+                               checkMarginTop(false);\r
+                               checkMarginBottom(false);\r
                        }\r
+                       \r
                }\r
        };\r
+       private final ItemListener f_il_marginTopChanged = new ItemListener() {\r
+               @Override\r
+               public void itemStateChanged(ItemEvent e) {\r
+                       if ( e.getStateChange() != ItemEvent.SELECTED ) {\r
+                               return;\r
+                       }\r
+                       \r
+                       String pgtype = (String) jCBXPanel_audiorate.getSelectedItem();\r
+                       if ( pgtype == HDDRecorder.ITEM_REC_TYPE_EPG || pgtype == HDDRecorder.ITEM_REC_TYPE_PROG ) {\r
+                               checkMarginTop(true);\r
+                       }\r
+               }\r
+       };\r
+       private final ItemListener f_il_marginBottomChanged = new ItemListener() {\r
+               @Override\r
+               public void itemStateChanged(ItemEvent e) {\r
+                       if ( e.getStateChange() != ItemEvent.SELECTED ) {\r
+                               return;\r
+                       }\r
+                       \r
+                       String pgtype = (String) jCBXPanel_audiorate.getSelectedItem();\r
+                       if ( pgtype == HDDRecorder.ITEM_REC_TYPE_EPG || pgtype == HDDRecorder.ITEM_REC_TYPE_PROG ) {\r
+                               checkMarginBottom(true);\r
+                       }\r
+               }\r
+       };\r
+       private void checkMarginTop(boolean check) {\r
+               Color c = Color.BLACK;\r
+               try {\r
+                       if ( check && Integer.valueOf((String) jCBXPanel_msChapter.getSelectedItem()) <= 0) {\r
+                               c = Color.RED;\r
+                       }\r
+               }\r
+               catch (NumberFormatException ev) {\r
+               }\r
+               jCBXPanel_msChapter.setLabelForeground(c);      // 開始マージン０は危ないよね\r
+       }\r
+       private void checkMarginBottom(boolean check) {\r
+               Color c = Color.BLACK;\r
+               try {\r
+                       if ( check && Integer.valueOf((String) jCBXPanel_msChapter.getSelectedItem()) <= 0) {\r
+                               c = Color.RED;\r
+                       }\r
+               }\r
+               catch (NumberFormatException ev) {\r
+               }\r
+               jCBXPanel_mvChapter.setLabelForeground(c);      // 終了マージン０は危ないよね\r
+       }\r
        \r
        /**\r
         * ジャンル別ＡＶ設定のロード\r

diff --git a/TinyBannavi/src/tainavi/SearchProgram.java b/TinyBannavi/src/tainavi/SearchProgram.java
index def6643..7970a9a 100644 (file)
--- a/TinyBannavi/src/tainavi/SearchProgram.java
+++ b/TinyBannavi/src/tainavi/SearchProgram.java
@@ -25,15 +25,17 @@ public class SearchProgram {
        protected void setSearchKeyLabel(String s) { searchKeyLabel = s; }\r
        \r
        // 設定ファイルに書き出し\r
-       public void save() {\r
+       public boolean save() {\r
                System.out.println(searchKeyLabel+"設定を保存します: "+searchKeyFile);\r
                if ( ! CommonUtils.writeXML(searchKeyFile, searchKeys) ) {\r
                        System.err.println(searchKeyLabel+"設定の保存に失敗しました.");\r
-                       return;\r
+                       return false;\r
                }\r
+               return true;\r
        }\r
        \r
        // 設定ファイルから読み出し\r
+       @SuppressWarnings("unchecked")\r
        public void load() {\r
                System.out.println(searchKeyLabel+"設定を読み込みます: "+searchKeyFile);\r
                searchKeys = (ArrayList<SearchKey>) CommonUtils.readXML(searchKeyFile);\r
@@ -79,17 +81,14 @@ public class SearchProgram {
        }\r
        \r
        // キーワード検索の置き換え\r
-       public SearchKey replace(String key, SearchKey sk) {\r
-               int i = 0;\r
-               for ( SearchKey k : searchKeys ) {\r
-                       if (k.getLabel().equals(key)) {\r
-                               searchKeys.add(i,sk);\r
-                               searchKeys.remove(i+1);\r
-                               return(sk);\r
-                       }\r
-                       i++;\r
+       public SearchKey replace(SearchKey xk, SearchKey sk) {\r
+               int index = searchKeys.indexOf(xk);\r
+               if ( index >= 0 ) {\r
+                       searchKeys.remove(xk);\r
+                       searchKeys.add(index,sk);\r
+                       return sk;\r
                }\r
-               return(null);\r
+               return null ;\r
        }\r
        \r
        // キーワード検索の整理\r

diff --git a/TinyBannavi/src/tainavi/TraceProgram.java b/TinyBannavi/src/tainavi/TraceProgram.java
index b60a485..0f441df 100644 (file)
--- a/TinyBannavi/src/tainavi/TraceProgram.java
+++ b/TinyBannavi/src/tainavi/TraceProgram.java
@@ -13,12 +13,13 @@ public class TraceProgram {
        private ArrayList<TraceKey> traceKeys = new ArrayList<TraceKey>();\r
        \r
        // 設定ファイルに書き出し\r
-       public void save() {\r
+       public boolean save() {\r
                System.out.println(MSGID+"保存します: "+traceKeyFile);\r
                if ( ! CommonUtils.writeXML(traceKeyFile, traceKeys) ) {\r
                        System.err.println(ERRID+"保存に失敗しました： "+traceKeyFile);\r
+                       return false;\r
                }\r
-               return;\r
+               return true;\r
        }\r
        \r
        // 設定ファイルから読み出し\r

diff --git a/TinyBannavi/src/tainavi/VWTraceKeyDialog.java b/TinyBannavi/src/tainavi/VWTraceKeyDialog.java
index 50a9f7d..f57eafb 100644 (file)
--- a/TinyBannavi/src/tainavi/VWTraceKeyDialog.java
+++ b/TinyBannavi/src/tainavi/VWTraceKeyDialog.java
@@ -4,8 +4,6 @@ import java.awt.Dimension;
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
 import java.util.ArrayList;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
 \r
 import javax.swing.DefaultComboBoxModel;\r
 import javax.swing.JButton;\r
@@ -14,6 +12,7 @@ import javax.swing.JComboBox;
 import javax.swing.JComponent;\r
 import javax.swing.JDialog;\r
 import javax.swing.JLabel;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JSlider;\r
 import javax.swing.JTextField;\r
@@ -33,10 +32,13 @@ public class VWTraceKeyDialog extends JDialog {
 \r
        private TraceProgram xKeys = null;\r
        private TraceKey xKey = null;\r
+       private ProgDetailList xTvd = null;\r
        \r
        private boolean reg = false;\r
        \r
-       public String getNewLabel() { return jTextField_title.getText()+" ("+jTextField_channel.getText()+")"; }\r
+       public String getNewLabel() { return getNewLabel(jTextField_title.getText(),jTextField_channel.getText()); }\r
+       \r
+       public static String getNewLabel(String title, String center) { return title+" ("+center+")"; }\r
        \r
        private ArrayList<String> okiniiri_items = new ArrayList<String>(); \r
        public void clean_okiniiri_items() { okiniiri_items.clear(); }\r
@@ -46,7 +48,7 @@ public class VWTraceKeyDialog extends JDialog {
        \r
        private JPanel jPanel = null;\r
        \r
-       private JLabel jLabel_title = null;\r
+       private JButton jButton_title = null;\r
        private JTextField jTextField_title = null;\r
        private JLabel jLabel_channel = null;\r
        private JTextField jTextField_channel = null;\r
@@ -65,33 +67,54 @@ public class VWTraceKeyDialog extends JDialog {
 \r
        public boolean isRegistered() { return reg; }\r
        \r
-       public void reopen(String s, TraceProgram sKeys) {\r
-               //\r
+       public void open(TraceProgram sKeys, ProgDetailList tvd, int threshold) {\r
+               \r
                xKeys = sKeys;\r
-               //\r
+               xKey = null;\r
+               xTvd = tvd;\r
+               \r
+               jTextField_title.setText(tvd.title);\r
+               jTextField_title.setCaretPosition(0);\r
+               jTextField_channel.setText(tvd.center);\r
+               jSlider_fazzyThreshold.setValue(threshold);\r
+               jComboBox_okiniiri.setSelectedItem(TVProgram.OKINIIRI[0]);\r
+               jCheckBox_disableRepeat.setSelected(false);\r
+               jCheckBox_showLatestOnly.setSelected(false);\r
+               \r
+               jButton_title.setEnabled(true);\r
+       }\r
+       \r
+       public void reopen(String label, TraceProgram sKeys) {\r
+               \r
+               xKeys = sKeys;\r
+               xKey = null;\r
+               xTvd = null;\r
+               \r
                for (TraceKey k : xKeys.getTraceKeys()) {\r
-                       if (k.getLabel().equals(s)) {\r
-                               //\r
+                       if (k.getLabel().equals(label)) {\r
+                               // 操作対象をみつけた\r
                                xKey = k;\r
-                               //\r
-                               Matcher ma = Pattern.compile("^(.+) \\(.+?\\)$",Pattern.DOTALL).matcher(k.getLabel());\r
-                               if (ma.find()) {\r
-                                       jTextField_title.setText(ma.group(1));\r
-                                       jTextField_title.setCaretPosition(0);\r
-                               }\r
-                               else {\r
-                                       jTextField_title.setText(k.getLabel());\r
-                               }\r
-                               jTextField_channel.setText(k.getCenter());\r
-                               jSlider_fazzyThreshold.setValue(k.getFazzyThreshold());\r
-                               jComboBox_okiniiri.setSelectedItem(k.getOkiniiri());\r
-                               jCheckBox_disableRepeat.setSelected(k.getDisableRepeat());\r
-                               jCheckBox_showLatestOnly.setSelected(k.getShowLatestOnly());\r
+                               break;\r
                        }\r
                }\r
+               \r
+               int index = xKey.getLabel().indexOf("("+xKey.getCenter()+")");\r
+               if ( index > 0 ) {\r
+                       jTextField_title.setText(xKey.getLabel().substring(0,index));\r
+               }\r
+               else {\r
+                       jTextField_title.setText(xKey.getLabel());\r
+               }\r
+               jTextField_title.setCaretPosition(0);\r
+               jTextField_channel.setText(xKey.getCenter());\r
+               jSlider_fazzyThreshold.setValue(xKey.getFazzyThreshold());\r
+               jComboBox_okiniiri.setSelectedItem(xKey.getOkiniiri());\r
+               jCheckBox_disableRepeat.setSelected(xKey.getDisableRepeat());\r
+               jCheckBox_showLatestOnly.setSelected(xKey.getShowLatestOnly());\r
+               \r
+               jButton_title.setEnabled(false);\r
        }\r
        \r
-       \r
        //\r
        private JPanel getJPanel() {\r
                if (jPanel == null) {\r
@@ -103,7 +126,7 @@ public class VWTraceKeyDialog extends JDialog {
                        int iw = 200;\r
                        int ix = 10+lw+10;\r
                        int y = 10;\r
-                       _getJComponent(jPanel, getJLabel_title("番組タイトル"), lw, 25, 10, y);\r
+                       _getJComponent(jPanel, getJButton_title("番組タイトル"), lw, 25, 10, y);\r
                        _getJComponent(jPanel, getJTextField_title(), iw, 25, ix, y);\r
                        \r
                        y += 30;\r
@@ -151,11 +174,20 @@ public class VWTraceKeyDialog extends JDialog {
        \r
        \r
        //\r
-       private JLabel getJLabel_title(String s) {\r
-               if (jLabel_title == null) {\r
-                       jLabel_title = new JLabel(s);\r
+       private JButton getJButton_title(String s) {\r
+               if (jButton_title == null) {\r
+                       jButton_title = new JButton(s);\r
+                       \r
+                       jButton_title.addActionListener(new ActionListener() {\r
+                               @Override\r
+                               public void actionPerformed(ActionEvent e) {\r
+                                       jTextField_title.setText(jTextField_title.getText().equals(xTvd.title) ? xTvd.splitted_title : xTvd.title);\r
+                                       jTextField_title.setCaretPosition(jTextField_title.getText().length());\r
+                                       jTextField_title.requestFocusInWindow();\r
+                               }\r
+                       });\r
                }\r
-               return(jLabel_title);\r
+               return(jButton_title);\r
        }\r
        \r
        //\r
@@ -261,31 +293,49 @@ public class VWTraceKeyDialog extends JDialog {
                        jButton_label.addActionListener(new ActionListener() {\r
                                @Override\r
                                public void actionPerformed(ActionEvent e) {\r
-                                       if (jTextField_title.getText().equals("")) {\r
-                                               return;\r
+                                       if ( addToTraceKeyList() ) {\r
+                                               // ウィンドウを閉じる\r
+                                               dispose();\r
                                        }\r
-                                       \r
-                                       //xKey.setLabel(jTextField_title.getText()+" ("+jTextField_channel.getText()+")");\r
-                                       xKey.setLabel(getNewLabel());\r
-                                       xKey.setTitlePop(TraceProgram.replacePop(jTextField_title.getText()));\r
-                                       xKey.setSearchStrKeys(TraceProgram.splitKeys(xKey.getTitlePop()));\r
-                                       xKey.setFazzyThreshold(jSlider_fazzyThreshold.getValue());\r
-                                       xKey.setOkiniiri((String) jComboBox_okiniiri.getSelectedItem());\r
-                                       xKey.setDisableRepeat(jCheckBox_disableRepeat.isSelected());\r
-                                       xKey.setShowLatestOnly(jCheckBox_showLatestOnly.isSelected());\r
-                                       xKeys.save();\r
-                                       \r
-                                       //\r
-                                       reg = true;\r
-                                       \r
-                                       // ウィンドウを閉じる\r
-                                       dispose();\r
-                       }\r
+                               }\r
                        });\r
                }\r
                return(jButton_label);\r
        }\r
        \r
+       private boolean addToTraceKeyList() {\r
+               if (jTextField_title.getText().equals("")) {\r
+                       return false;\r
+               }\r
+               \r
+               // 重複登録を許さない\r
+               for (TraceKey k : xKeys.getTraceKeys()) {\r
+                       if ( k != xKey && k.getLabel().equals(getNewLabel()) ) {\r
+                               JOptionPane.showConfirmDialog(this, "既に登録されています:"+getNewLabel(), "警告", JOptionPane.CLOSED_OPTION);                                                      // キーワード検索の追加ではダイアログで修正できるので止めない\r
+                               return false;\r
+                       }\r
+               }\r
+               \r
+               if ( xKey == null ) {\r
+                       // 新規登録の場合はエントリがないので作成する\r
+                       xKey = new TraceKey();\r
+                       xKeys.add(xKey);\r
+               }\r
+               \r
+               xKey.setLabel(getNewLabel());\r
+               xKey.setCenter(jTextField_channel.getText());\r
+               xKey.setTitlePop(TraceProgram.replacePop(jTextField_title.getText()));\r
+               xKey.setSearchStrKeys(TraceProgram.splitKeys(xKey.getTitlePop()));\r
+               xKey.setFazzyThreshold(jSlider_fazzyThreshold.getValue());\r
+               xKey.setOkiniiri((String) jComboBox_okiniiri.getSelectedItem());\r
+               xKey.setDisableRepeat(jCheckBox_disableRepeat.isSelected());\r
+               xKey.setShowLatestOnly(jCheckBox_showLatestOnly.isSelected());\r
+               \r
+               reg = xKeys.save();\r
+               \r
+               return reg;\r
+       }\r
+       \r
        //\r
        private JButton getJButton_cancel(String s) {\r
                if (jButton_cancel == null) {\r

diff --git a/TinyBannavi/src/tainavi/Viewer.java b/TinyBannavi/src/tainavi/Viewer.java
index d607136..5482243 100644 (file)
--- a/TinyBannavi/src/tainavi/Viewer.java
+++ b/TinyBannavi/src/tainavi/Viewer.java
@@ -1403,7 +1403,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                        AbsKeywordDialog kD = new VWKeywordDialog();\r
                        CommonSwingUtils.setLocationCenter(Viewer.this,kD);\r
                        \r
-                       kD.open(search.getLabel(), search, srKeys, srGrps);\r
+                       kD.open(search.getLabel(), srKeys, srGrps, search);\r
                        kD.setVisible(true);\r
                        \r
                        if (kD.isRegistered()) {\r
@@ -1731,26 +1731,15 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                \r
                // 番組追跡へ追加する\r
                {\r
-                       final String label = tvd.title+" ("+tvd.center+")";\r
+                       final String label = VWTraceKeyDialog.getNewLabel(tvd.title, tvd.center);\r
                        JMenuItem menuItem = new JMenuItem("番組追跡への追加【"+label+"】");\r
                        menuItem.addActionListener(new ActionListener() {\r
                                public void actionPerformed(ActionEvent e) {\r
                                        //\r
-                                       for (TraceKey tr : trKeys.getTraceKeys()) {\r
-                                               if (tr.getLabel().equals(label)) {\r
-                                                       mwin.appendMessage("【警告】すでに番組追跡に登録されています："+label);\r
-                                                       ringBeep();\r
-                                                       return;\r
-                                               }\r
-                                       }\r
-                                       \r
-                                       //\r
-                                       trKeys.add(label, tvd.title, tvd.center, env.getDefaultFazzyThreshold());\r
-\r
                                        VWTraceKeyDialog tD = new VWTraceKeyDialog(0,0);\r
                                        CommonSwingUtils.setLocationCenter(mainWindow,tD);\r
                                        \r
-                                       tD.reopen(label, trKeys);\r
+                                       tD.open(trKeys, tvd, env.getDefaultFazzyThreshold());\r
                                        tD.setVisible(true);\r
                                        \r
                                        if (tD.isRegistered()) { \r
@@ -1784,51 +1773,28 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                        JMenuItem menuItem = new JMenuItem("キーワード検索への追加【"+label+"】");\r
                        menuItem.addActionListener(new ActionListener(){\r
                                public void actionPerformed(ActionEvent e){\r
-                                       //\r
-                                       for (SearchKey sr : srKeys.getSearchKeys()) {\r
-                                               if (sr.getLabel().equals(tvd.title)) {\r
-                                                       ringBeep();\r
-                                                       String msg = "すでにキーワード検索に登録されています： "+tvd.title;\r
-                                                       mwin.appendMessage(msg);\r
-                                                       JOptionPane.showConfirmDialog(null, msg, "警告", JOptionPane.CLOSED_OPTION);                                                  // キーワード検索の追加ではダイアログで修正できるので止めない\r
-                                                       //return;\r
-                                               }\r
-                                       }\r
+                                       \r
                                        // 「キーワード検索の設定」ウィンドウを開く\r
-                                       SearchKey search = new SearchKey();\r
-                                       {\r
-                                               search.setCondition("0");\r
-                                               search.alTarget.add(TargetId.TITLE);\r
-                                               search.alContain.add("0");\r
-                                               search.alKeyword.add(tvd.title);\r
-                                       }\r
-                                       {\r
-                                               search.setCondition("0");\r
-                                               search.alTarget.add(TargetId.CHANNEL);\r
-                                               search.alContain.add("0");\r
-                                               search.alKeyword.add(tvd.center);\r
-                                       }\r
-                                       {\r
-                                               AbsKeywordDialog kD = new VWKeywordDialog();\r
-                                               CommonSwingUtils.setLocationCenter(mainWindow,kD);\r
-                                               \r
-                                               kD.open(tvd.title, search, srKeys, srGrps);\r
-                                               kD.setVisible(true);\r
+                                       \r
+                                       AbsKeywordDialog kD = new VWKeywordDialog();\r
+                                       CommonSwingUtils.setLocationCenter(mainWindow,kD);\r
+                                       \r
+                                       kD.open(srKeys, srGrps, tvd);\r
+                                       kD.setVisible(true);\r
+                                       \r
+                                       if (kD.isRegistered()) {\r
+                                               // 検索結果の再構築\r
+                                               mpList.clear(env.getDisableFazzySearch(), env.getDisableFazzySearchReverse());\r
+                                               mpList.build(tvprograms, trKeys.getTraceKeys(), srKeys.getSearchKeys());\r
                                                \r
-                                               if (kD.isRegistered()) {\r
-                                                       // 検索結果の再構築\r
-                                                       mpList.clear(env.getDisableFazzySearch(), env.getDisableFazzySearchReverse());\r
-                                                       mpList.build(tvprograms, trKeys.getTraceKeys(), srKeys.getSearchKeys());\r
-                                                       \r
-                                                       // ツリーに反映する\r
-                                                       listed.redrawTreeByKeyword();\r
+                                               // ツリーに反映する\r
+                                               listed.redrawTreeByKeyword();\r
 \r
-                                                       // 表示を更新する\r
-                                                       paper.updateBangumiColumns();\r
-                                                       listed.reselectTree();\r
-                                                       \r
-                                                       mwin.appendMessage("キーワード検索へ追加しました【"+label+"】");\r
-                                               }\r
+                                               // 表示を更新する\r
+                                               paper.updateBangumiColumns();\r
+                                               listed.reselectTree();\r
+                                               \r
+                                               mwin.appendMessage("キーワード検索へ追加しました【"+label+"】");\r
                                        }\r
                                }\r
                        });\r
@@ -4620,7 +4586,8 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
                }\r
                else {\r
                        // 設定が存在する場合\r
-                       mainWindow.setSelectedTab(MWinTab.getAt(bounds.getSelectedTab()));\r
+                       MWinTab tab = MWinTab.getAt(bounds.getSelectedTab());\r
+                       mainWindow.setSelectedTab(tab);\r
                }\r
        }\r
        \r

diff --git a/TinyBannavi/src/todo.txt b/TinyBannavi/src/todo.txt
index 3c76d38..9cbf241 100644 (file)
--- a/TinyBannavi/src/todo.txt
+++ b/TinyBannavi/src/todo.txt
@@ -14,6 +14,8 @@
 【リスト形式】検索結果生成後にノードの赤黒を更新していない？\r
 \r
 【予約ダイアログ】EPG予約選択時のマージン警告がうまく動かない場合があるみたい\r
+【予約ダイアログ】EPG予約を更新するとき、レコーダ側で設定された開始終了時刻が鯛ナビの予約情報に反映されない？\r
+【予約ダイアログ】チューナー１個の時、裏番組がなくても「空きエンコーダなし」と表示されてしまうようになった？\r
 \r
 ---優先度高\r
 \r