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

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

diff --git a/TinyBannavi/src/tainavi/LikeReserveList.java b/TinyBannavi/src/tainavi/LikeReserveList.java
index 8c12a8b..80a0dbe 100644 (file)
--- a/TinyBannavi/src/tainavi/LikeReserveList.java
+++ b/TinyBannavi/src/tainavi/LikeReserveList.java
@@ -10,19 +10,25 @@ public class LikeReserveList extends ArrayList<LikeReserveItem> {
        \r
        /**\r
         * 一番開始日時が近い類似予約を選択\r
+        * @param myself 「すべて」「ピックアップのみ」の場合はnullを返す \r
         */\r
        public LikeReserveItem getClosest(String myself) {\r
                \r
                closest = null;\r
                closestIndex = -1;\r
                \r
+               if ( myself == HDDRecorder.SELECTED_ALL || myself == HDDRecorder.SELECTED_PICKUP ) {\r
+                       // レコーダの個別指定がなければ\r
+                       return closest;\r
+               }\r
+               \r
                for ( int i=0; i<size(); i++ ) {\r
-                       LikeReserveItem lr = get(i);\r
-                       if ( (myself!=HDDRecorder.SELECTED_ALL && myself!=HDDRecorder.SELECTED_PICKUP) && ! lr.getRec().Myself().equals(myself) ) {\r
-                               // レコーダの個別指定があれば\r
+                       LikeReserveItem lr = super.get(i);\r
+                       if ( ! lr.getRec().Myself().equals(myself) ) {\r
                                continue;\r
                        }\r
-                       if ( closest == null || Math.abs(closest.getDist()) > lr.getDist() ) {\r
+                       \r
+                       if ( closest == null || Math.abs(closest.getDist()) > Math.abs(lr.getDist()) ) {\r
                                closest = lr;\r
                                closestIndex = i;\r
                        }\r