Changeset 8862 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-10-12T00:20:21+02:00 (9 years ago)

Author:

wiktorn

Message:

Revert move of tileSource initialization to constructor.

Fixes regression test.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)

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

@@ -160 +160 @@
         this.setVisible(true);
         MapView.addZoomChangeListener(this);
-        this.tileSource = getTileSource(info);
-        if (this.tileSource == null) {
-            throw new IllegalArgumentException(tr("Failed to create tile source"));
-        }
     }
 
@@ -506 +502 @@
     @Override
     public void hookUpMapView() {
+        // this needs to be here and not in constructor to allow empty TileSource class construction
+        // using SessionWriter
+        this.tileSource = getTileSource(info);
+        if (this.tileSource == null) {
+            throw new IllegalArgumentException(tr("Failed to create tile source"));
+        }
+
         super.hookUpMapView();
         projectionChanged(null, Main.getProjection()); // check if projection is supported