Changeset 621 for AE/installer2/src/net/oni2/aeinstaller/backend/network

Timestamp:

Jan 15, 2013, 9:02:01 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added offline detection (should run without internet connection)
• Update check (manual/on startup), not actually updating yet

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/network/DrupalJSONQuery.java (modified) (6 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/network/DrupalJSONQuery.java

@@ -9 +9 @@
 import java.util.List;
 
-import net.oni2.aeinstaller.backend.Settings;
+import net.oni2.aeinstaller.backend.depot.DepotConfig;
 
 import org.apache.http.HttpEntity;
@@ -29 +29 @@
  */
 public class DrupalJSONQuery {
-
-        private static String getDepotUrl() {
-                return Settings.getInstance().get("depot_api_url",
-                                "http://mods.oni2.net/?q=api/");
-        }
 
         /**
@@ -56 +51 @@
                         }
                         HttpEntity data = new UrlEncodedFormEntity(nvps);
-                        return executeQuery(getDepotUrl() + resource + "/" + action
+                        return executeQuery(DepotConfig.getDepotApiUrl() + resource + "/" + action
                                         + ".json", data);
                 } catch (UnsupportedEncodingException e) {
@@ -80 +75 @@
                         String refName) throws Exception {
                 return executeQuery(
-                                getDepotUrl() + resource + "/" + Integer.toString(index) + "/"
+                                DepotConfig.getDepotApiUrl() + resource + "/" + Integer.toString(index) + "/"
                                                 + refName + ".json", null);
         }
@@ -100 +95 @@
                         String parameters) throws Exception {
                 return executeQuery(
-                                getDepotUrl() + resource + "/" + Integer.toString(index)
+                                DepotConfig.getDepotApiUrl() + resource + "/" + Integer.toString(index)
                                                 + ".json" + parameters, null);
         }
@@ -126 +121 @@
                 if (pagesize >= 0)
                         pagesizeN = "&pagesize=" + Integer.toString(pagesize);
-                return executeQuery(getDepotUrl() + resource + ".json" + pageN
+                return executeQuery(DepotConfig.getDepotApiUrl() + resource + ".json" + pageN
                                 + pagesizeN, null);
         }