Changeset 9430 in josm for trunk

Timestamp:

2016-01-13T03:32:00+01:00 (9 years ago)

Author:

Don-vip

Message:

add basic unit tests for tile source layers

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/WMTSLayerTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -89 +89 @@
  * Base abstract class that supports displaying images provided by TileSource. It might be TMS source, WMS or WMTS
  *
- * It implements all standard functions of tilesource based layers: autozoom,  tile reloads, layer saving, loading,etc.
+ * It implements all standard functions of tilesource based layers: autozoom, tile reloads, layer saving, loading,etc.
  *
  * @author Upliner
@@ -97 +97 @@
  */
 public abstract class AbstractTileSourceLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
-    private static final String PREFERENCE_PREFIX   = "imagery.generic";
+    private static final String PREFERENCE_PREFIX = "imagery.generic";
 
     /** maximum zoom level supported */

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -52 +52 @@
     }
 
-
     /**
      * Creates and returns a new TileSource instance depending on the {@link ImageryType}
@@ -76 +75 @@
         });
     }
-
-    /**
-     * Adds a context menu to the mapView.
-     */
 
     @Override
@@ -126 +121 @@
             info.setAttribution(t);
             return t;
-        } else if (info.getImageryType() == ImageryType.BING)
+        } else if (info.getImageryType() == ImageryType.BING) {
             return new CachedAttributionBingAerialTileSource(info, attributionLoadedTask);
-        else if (info.getImageryType() == ImageryType.SCANEX) {
+        } else if (info.getImageryType() == ImageryType.SCANEX) {
             return new ScanexTileSource(info);
         }
@@ -150 +145 @@
         return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
     }
-
 }

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -61 +61 @@
         this.supportedProjections = new TreeSet<>(info.getServerProjections());
         this.autoZoom = PROP_DEFAULT_AUTOZOOM.get();
-
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

@@ -37 +37 @@
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wmts.default_autozoom", true);
     private static final String CACHE_REGION_NAME = "WMTS";
-
 
     /**