Changeset 9682 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2016-01-29T23:47:45+01:00 (8 years ago)

Author:

wiktorn

Message:

Check if the imagery is valid before returning the info object.

I decided for such solution, as WMTS is the only source, that needs such validation. Alternative approach is to change ImageryPreference.NewEntryAction.actionPerformed(...) so it would instantiate imagery layer using ImageryLayer.create(...) and then call getTileSource(...) on this object, but this would require making this method public.

Closes: #12450

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
+
 import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.WMTSTileSource;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -32 +35 @@
     @Override
     protected ImageryInfo getImageryInfo() {
-        return new ImageryInfo(getImageryName(), "wmts:" + sanitize(getImageryRawUrl(), ImageryType.WMTS));
+        ImageryInfo ret = new ImageryInfo(getImageryName(), "wmts:" + sanitize(getImageryRawUrl(), ImageryType.WMTS));
+        try {
+            new WMTSTileSource(ret); // check if constructor throws an error
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e); // if so, wrap exception, so proper message will be shown to the user
+        }
+        return ret;
+
     }