Ticket #7140: 7140_cache.patch

src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -53 +53 @@
     /**
      * Grabs current MOTD from cache or webpage and parses it.
      */
-    private static class MotdContent extends CacheCustomContent {
+    private static class MotdContent extends CacheCustomContent<RuntimeException> {
         public MotdContent() {
             super("motd.html", CacheCustomContent.INTERVAL_DAILY);
         }

src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -16 +16 @@
  * Use this class if you want to cache and store a single file that gets updated regularly.
  * Unless you flush() it will be kept in memory. If you want to cache a lot of data and/or files,
  * use CacheFiles
+ * @param <T> a {@link Throwable} that may be thrown during {@link #updateData()},
+ * use {@link RuntimeException} if no exception must be handled.
  * @author xeen
  *
  */
-public abstract class CacheCustomContent {
+public abstract class CacheCustomContent<T extends Throwable> {
     /**
      * Common intervals
      */
@@ -56 +58 @@
      * executed in the current thread.
      * @return the data to cache
      */
-    protected abstract byte[] updateData();
+    protected abstract byte[] updateData() throws T;
 
     /**
      * This function serves as a comfort hook to perform additional checks if the cache is valid
@@ -82 +84 @@
      * Updates data if required
      * @return Returns the data
      */
-    public byte[] updateIfRequired() {
+    public byte[] updateIfRequired() throws T {
         if(Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
                 || !isCacheValid())
             return updateForce();
@@ -93 +95 @@
      * Updates data if required
      * @return Returns the data as string
      */
-    public String updateIfRequiredString() {
+    public String updateIfRequiredString() throws T {
         if(Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
                 || !isCacheValid())
             return updateForceString();
@@ -104 +106 @@
      * Executes an update regardless of updateInterval
      * @return Returns the data
      */
-    public byte[] updateForce() {
+    public byte[] updateForce() throws T {
         this.data = updateData();
         saveToDisk();
         Main.pref.putInteger("cache." + ident, (int)(new Date().getTime()/1000));
@@ -115 +117 @@
      * Executes an update regardless of updateInterval
      * @return Returns the data as String
      */
-    public String updateForceString() {
+    public String updateForceString() throws T {
         updateForce();
         try {
             return new String(data,"utf-8");
@@ -129 +131 @@
      * Returns the data without performing any updates
      * @return the data
      */
-    public byte[] getData() {
+    public byte[] getData() throws T {
         if(data == null) {
             loadFromDisk();
         }
@@ -140 +142 @@
      * Returns the data without performing any updates
      * @return the data as String
      */
-    public String getDataString() {
+    public String getDataString() throws T {
         try {
             return new String(getData(), "utf-8");
         } catch(UnsupportedEncodingException e){
@@ -152 +154 @@
     /**
      * Tries to load the data using the given ident from disk. If this fails, data will be updated
      */
-    private void loadFromDisk() {
+    private void loadFromDisk() throws T {
         if(Main.applet)
             this.data = updateForce();
         else {

src/org/openstreetmap/josm/io/OsmApi.java

@@ -152 +152 @@
         return host;
     }
 
+    private class CapabilitiesCache extends CacheCustomContent<OsmTransferException> {
+
+        ProgressMonitor monitor;
+        boolean fastFail;
+
+        public CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {
+            super("capabilities" + getBaseUrl().hashCode(), CacheCustomContent.INTERVAL_WEEKLY);
+            this.monitor = monitor;
+            this.fastFail = fastFail;
+        }
+        @Override
+        protected byte[] updateData() throws OsmTransferException {
+            String s = sendRequest("GET", "capabilities", null, monitor, false, fastFail);
+            return s.getBytes();
+        }
+    }
+
     public void initialize(ProgressMonitor monitor) throws OsmApiInitializationException, OsmTransferCanceledException {
         initialize(monitor, false);
     }
@@ -167 +184 @@
             return;
         cancel = false;
         try {
-            String s = sendRequest("GET", "capabilities", null, monitor, false, fastFail);
+            String s = new CapabilitiesCache(monitor, fastFail).updateIfRequiredString();
             InputSource inputSource = new InputSource(new StringReader(s));
             SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new CapabilitiesParser());
             if (capabilities.supportsVersion("0.6")) {