CommentInfo.DEFAULT 定数を削除し、CommentInfoにnullを許容するよう仕様変更

diff --git a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
index fae7cae..19c4343 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
@@ -60,7 +60,7 @@ public class WebFileInstanciator extends FileInstanciator {
                 String waybackkey = client.getWayBackKey(videoInfo);
                 commentInfo = new CommentInfo(waybackkey, waybacktime);
             }else{
-                commentInfo = CommentInfo.DEFAULT;
+                commentInfo = null;
             }
 
         } catch (IOException ex) {

diff --git a/frontend/src/saccubus/net/CommentInfo.java b/frontend/src/saccubus/net/CommentInfo.java
index a9f3cbb..790d4c1 100644 (file)
--- a/frontend/src/saccubus/net/CommentInfo.java
+++ b/frontend/src/saccubus/net/CommentInfo.java
@@ -5,15 +5,10 @@ package saccubus.net;
  * @author yuki
  */
 public class CommentInfo {
-    public static final CommentInfo DEFAULT = new CommentInfo();
 
     private final String wayBackKey;
     private final String wayBackTime;
 
-    private CommentInfo() {
-        this("0", "0");
-    }
-
     public CommentInfo(String wayBackKey, String wayBackTime) {
         this.wayBackKey = wayBackKey;
         this.wayBackTime = wayBackTime;

diff --git a/frontend/src/saccubus/net/NicoClientImpl.java b/frontend/src/saccubus/net/NicoClientImpl.java
index 7c5dd4f..e9541f1 100644 (file)
--- a/frontend/src/saccubus/net/NicoClientImpl.java
+++ b/frontend/src/saccubus/net/NicoClientImpl.java
@@ -86,7 +86,7 @@ public class NicoClientImpl implements NicoClient {
 
     private File downloadComment(int back_comment, final File file, VideoInfo vi, final TextProgressListener status,
             boolean isTcomm) throws NumberFormatException {
-        return downloadComment(back_comment, file, vi, CommentInfo.DEFAULT, status, isTcomm);
+        return downloadComment(back_comment, file, vi, null, status, isTcomm);
     }
 
     private File downloadComment(int back_comment, final File file, VideoInfo vi, CommentInfo ci, final TextProgressListener status,

diff --git a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
index 37b2085..fc79aee 100644 (file)
--- a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
+++ b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
@@ -68,10 +68,11 @@ public class NicoBrowserAdapter implements NicoClient {
 
     @Override
     public File getComment(VideoInfo videoInfo, CommentInfo commentInfo, File file, TextProgressListener listener,
-            int com) {
+            int commentNum) {
         try {
-            WayBackInfo wbi = new WayBackInfo(commentInfo.getWayBackKey(), commentInfo.getWayBackTime());
-            return client.getCommentFile(nicoBrowserVi, file.getPath(), wbi);
+            final WayBackInfo wbi = (commentInfo != null) ? new WayBackInfo(commentInfo.getWayBackKey(), commentInfo.
+                    getWayBackTime()) : null;
+            return client.getCommentFile(nicoBrowserVi, file.getPath(), wbi, commentNum);
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "コメント取得失敗", ex);
         }