Changeset 6856 in josm for trunk

Timestamp:

2014-02-17T01:07:57+01:00 (11 years ago)

Author:

Don-vip

Message:

see #9715 - do not block start when external presets cannot be retrieved, save the error for later display in global network errors message dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• tagging/TaggingPresetReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -277 +277 @@
      */
     public static void readFromPreferences() {
-        taggingPresets = TaggingPresetReader.readFromPreferences(false);
+        taggingPresets = TaggingPresetReader.readFromPreferences(false, false);
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

@@ -237 +237 @@
     }
 
+    /**
+     * Reads all tagging presets from the given sources.
+     * @param sources Collection of tagging presets sources.
+     * @param validate if {@code true}, presets will be validated against XML schema
+     * @return Collection of all presets successfully read
+     */
     public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate) {
+        return readAll(sources, validate, true);
+    }
+
+    /**
+     * Reads all tagging presets from the given sources.
+     * @param sources Collection of tagging presets sources.
+     * @param validate if {@code true}, presets will be validated against XML schema
+     * @param displayErrMsg if {@code true}, a blocking error message is displayed in case of I/O exception.
+     * @return Collection of all presets successfully read
+     */
+    public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate, boolean displayErrMsg) {
         LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
         for(String source : sources)  {
@@ -243 +260 @@
                 allPresets.addAll(readAll(source, validate));
             } catch (IOException e) {
-                Main.error(e);
+                Main.error(e, false);
                 Main.error(source);
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("Could not read tagging preset source: {0}",source),
-                        tr("Error"),
-                        JOptionPane.ERROR_MESSAGE
-                        );
+                if (source.startsWith("http")) {
+                    Main.addNetworkError(source, e);
+                }
+                if (displayErrMsg) {
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            tr("Could not read tagging preset source: {0}",source),
+                            tr("Error"),
+                            JOptionPane.ERROR_MESSAGE
+                            );
+                }
             } catch (SAXException e) {
                 Main.error(e);
@@ -265 +287 @@
     }
     
-    public static Collection<TaggingPreset> readFromPreferences(boolean validate) {
-        return readAll(getPresetSources(), validate);
+    /**
+     * Reads all tagging presets from sources stored in preferences.
+     * @param validate if {@code true}, presets will be validated against XML schema
+     * @param displayErrMsg if {@code true}, a blocking error message is displayed in case of I/O exception.
+     * @return Collection of all presets successfully read
+     */
+    public static Collection<TaggingPreset> readFromPreferences(boolean validate, boolean displayErrMsg) {
+        return readAll(getPresetSources(), validate, displayErrMsg);
     }