Changeset 11167 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-10-26T14:02:07+02:00 (7 years ago)

Author:

simon04

Message:

AbstractTileSourceLayer#getTileSource: drop method parameter, use field instead

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (2 diffs)
• TMSLayer.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)
• WMTSLayer.java (modified) (1 diff)

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

@@ -216 +216 @@
 
     /**
+     * Creates and returns a new {@link TileSource} instance depending on {@link #info} specified in the constructor.
      *
-     * @param info imagery info
      * @return TileSource for specified ImageryInfo
      * @throws IllegalArgumentException when Imagery is not supported by layer
      */
-    protected abstract T getTileSource(ImageryInfo info);
+    protected abstract T getTileSource();
 
     protected Map<String, String> getHeaders(T tileSource) {
@@ -679 +679 @@
     private void initializeIfRequired() {
         if (tileSource == null) {
-            tileSource = getTileSource(info);
+            tileSource = getTileSource();
             if (tileSource == null) {
                 throw new IllegalArgumentException(tr("Failed to create tile source"));

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

@@ -60 +60 @@
     /**
      * Creates and returns a new TileSource instance depending on the {@link ImageryType}
-     * of the passed ImageryInfo object.
+     * of the {@link ImageryInfo} object specified in the constructor.
      *
      * If no appropriate TileSource is found, null is returned.
@@ -67 +67 @@
      *
      *
-     * @param info imagery info
      * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
      * @throws IllegalArgumentException if url from imagery info is null or invalid
      */
     @Override
-    protected TMSTileSource getTileSource(ImageryInfo info) {
+    protected TMSTileSource getTileSource() {
         return getTileSourceStatic(info, () -> {
             Main.debug("Attribution loaded, running loadAllErrorTiles");

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

@@ -81 +81 @@
 
     @Override
-    protected AbstractWMSTileSource getTileSource(ImageryInfo info) {
+    protected AbstractWMSTileSource getTileSource() {
         if (info.getImageryType() == ImageryType.WMS && info.getUrl() != null) {
             TemplatedWMSTileSource.checkUrl(info.getUrl());

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

@@ -52 +52 @@
 
     @Override
-    protected WMTSTileSource getTileSource(ImageryInfo info) {
+    protected WMTSTileSource getTileSource() {
         try {
             if (info.getImageryType() == ImageryType.WMTS && info.getUrl() != null) {