Changeset 11510 in josm for trunk/src/org

Timestamp:

2017-01-29T23:58:49+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:ACEM_ABSTRACT_CLASS_EMPTY_METHODS

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/imagery/CachedAttributionBingAerialTileSource.java (modified) (3 diffs)
• gui/dialogs/layer/LayerVisibilityAction.java (modified) (1 diff)
• io/CacheCustomContent.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -580 +580 @@
      * Should set {@link #menu}
      */
-    protected void initializeMainWindow() {
-        // can be implementd by subclasses
-    }
+    protected abstract void initializeMainWindow();
 
     private static class InitializationTask implements Callable<Void> {

trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.StringReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -14 +15 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CacheCustomContent;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.xml.sax.InputSource;
@@ -58 +60 @@
             return r.getBytes("UTF-8");
         }
+
+        @Override
+        protected void checkOfflineAccess() {
+            try {
+                String attributionUrl = getAttributionUrl().toExternalForm();
+                OnlineResource.ALL.checkOfflineAccess(attributionUrl, attributionUrl);
+            } catch (MalformedURLException e) {
+                Main.error(e);
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -214 +214 @@
         }
 
-        protected void applyValueToLayer(T layer) {
-        }
+        abstract void applyValueToLayer(T layer);
 
         protected double getRealValue() {

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

@@ -103 +103 @@
     }
 
-    protected void checkOfflineAccess() {
-        // To be overriden by subclasses
-    }
+    /**
+     * Ensures underlying resource is not accessed in offline mode.
+     * @throws OfflineAccessException if resource is accessed in offline mode
+     */
+    protected abstract void checkOfflineAccess();
 
     /**