From 86a5ed81aa01d65812d2e305ff344a4efb3968f0 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Sat, 17 Sep 2011 17:03:33 +0900
Subject: [PATCH] =?utf8?q?default=20cookie=E5=87=A6=E7=90=86=E3=82=AF?=
 =?utf8?q?=E3=83=A9=E3=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/net/BrowserInfo.java   | 44 ----------------------------
 frontend/src/saccubus/net/CookieDefault.java | 37 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 44 deletions(-)
 create mode 100644 frontend/src/saccubus/net/CookieDefault.java

diff --git a/frontend/src/saccubus/net/BrowserInfo.java b/frontend/src/saccubus/net/BrowserInfo.java
index b3749f5..52436c2 100644
--- a/frontend/src/saccubus/net/BrowserInfo.java
+++ b/frontend/src/saccubus/net/BrowserInfo.java
@@ -53,20 +53,6 @@ public class BrowserInfo {
             case IE6:
                 user_session = GetUserSessionFromIE6(NICOVIDEO_URL);
                 break;
-            case MSIE:
-                user_session = GetUserSessionFromMSIE();
-                break;
-            case Firefox:
-                user_session = GetUserSessionFromFilefox4();
-                if (!user_session.isEmpty()) {
-                    break;
-                }
-            case Firefox3:
-                user_session = GetUserSessionFromFilefox3();
-                break;
-            case Chrome:
-                user_session = GetUserSesionChrome();
-                break;
             case Chromium:
                 user_session = GetUserSesionChromium();
                 break;
@@ -80,36 +66,6 @@ public class BrowserInfo {
         return user_session;
     }
 
-    /**
-     *
-     * @param fileOrDir fullname of file or directory
-     * @return
-     */
-    public String getUserSessionOther(String fileOrDir) {
-        String user_session = "";
-        try {
-            if (Path.isDirectory(fileOrDir)) {
-                // Directory Type like MSIE
-                user_session = GetUserSessionFromDirectory(fileOrDir);
-                return user_session;
-            }
-            if (Path.isFile(fileOrDir)) {
-                // File Type like Firefox3
-                String dataStr = Path.ReadAllText(fileOrDir, "UTF-8");
-                user_session = CutUserSession(dataStr, fileOrDir);
-                return user_session;
-            }
-            return "";
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        } finally {
-            if (!user_session.isEmpty()) {
-                validBrowser = BrowserCookieKind.Other;
-            }
-        }
-    }
-
     /// <summary>
     /// IE6 から user_session を取得
     /// </summary>
diff --git a/frontend/src/saccubus/net/CookieDefault.java b/frontend/src/saccubus/net/CookieDefault.java
new file mode 100644
index 0000000..655958d
--- /dev/null
+++ b/frontend/src/saccubus/net/CookieDefault.java
@@ -0,0 +1,37 @@
+package saccubus.net;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.commons.io.FileUtils;
+
+/**
+ *
+ * @author yuki
+ */
+public class CookieDefault extends Cookie {
+
+    private final File fileOrDir;
+
+    public CookieDefault(File dir) {
+        this.fileOrDir = dir;
+    }
+
+    /**
+     * @param fileOrDir fullname of file or directory
+     * @return
+     */
+    @Override
+    public String getUserSessionString() throws IOException {
+        if (fileOrDir.isDirectory()) {
+            // Directory Type like MSIE
+            return getUserSessionFromDir("UTF-8", fileOrDir);
+        }
+
+        if (fileOrDir.isFile()) {
+            // File Type like Firefox3
+            String dataStr = FileUtils.readFileToString(fileOrDir, "UTF-8");
+            return cutUserSession(dataStr);
+        }
+        return "";
+    }
+}
-- 
2.11.0