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

Timestamp:

2016-01-11T19:07:11+01:00 (8 years ago)

Author:

simon04

Message:

see #8824 - Fail fast when initializing imagery entries while starting

Use a short HTTP connect timeout of 1s for fetching the entries

File:

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

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

@@ -156 +156 @@
         layerInfo.save();
         ImageryLayerInfo.instance.clear();
-        ImageryLayerInfo.instance.load();
+        ImageryLayerInfo.instance.load(false);
         Main.main.menu.imageryMenu.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
@@ -642 +642 @@
             @Override
             public void actionPerformed(ActionEvent evt) {
-                layerInfo.loadDefaults(true, false);
+                layerInfo.loadDefaults(true, false, false);
                 defaultModel.fireTableDataChanged();
                 defaultTable.getSelectionModel().clearSelection();
@@ -946 +946 @@
      */
     public static void initialize() {
-        ImageryLayerInfo.instance.load();
+        ImageryLayerInfo.instance.load(true);
         OffsetBookmark.loadBookmarks();
         Main.main.menu.imageryMenu.refreshImageryMenu();