Changeset 33624 in osm for applications/editors/josm

Timestamp:

2017-09-18T04:44:35+02:00 (7 years ago)

Author:

nyuriks

Message:

Fixed OSM+Wikidata service - added support for older core

Location:

applications/editors/josm/plugins/wikipedia/src/org/wikipedia

Files:

• gui/WikosmDownloadSource.java (modified) (3 diffs)
• gui/WikosmQueryList.java (modified) (3 diffs)
• io/WikosmDownloadReader.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java

@@ -19 +19 @@
 import javax.swing.plaf.basic.BasicArrowButton;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -153 +153 @@
             referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.,"
                     + "parent relations and for nodes, additionally, parent ways"));
-            referrers.setSelected(Config.getPref().getBoolean("wikosm.downloadprimitive.referrers", true));
-            referrers.addActionListener(e -> Config.getPref().putBoolean("wikosm.downloadprimitive.referrers", referrers.isSelected()));
+
+            // TODO: Once new core is widely avialable, replace:
+            //   Main.pref.getBoolean --> Config.getPref().getBoolean
+            //   Main.pref.put --> Config.getPref().putBoolean
+
+            referrers.setSelected(Main.pref.getBoolean("wikosm.downloadprimitive.referrers", true));
+            referrers.addActionListener(e -> Main.pref.put("wikosm.downloadprimitive.referrers", referrers.isSelected()));
 
             fullRel = new JCheckBox(tr("Download relation members"));
             fullRel.setToolTipText(tr("Select if the members of a relation should be downloaded as well"));
-            fullRel.setSelected(Config.getPref().getBoolean("wikosm.downloadprimitive.full", true));
-            fullRel.addActionListener(e -> Config.getPref().putBoolean("wikosm.downloadprimitive.full", fullRel.isSelected()));
+            fullRel.setSelected(Main.pref.getBoolean("wikosm.downloadprimitive.full", true));
+            fullRel.addActionListener(e -> Main.pref.put("wikosm.downloadprimitive.full", fullRel.isSelected()));
 
             JPanel centerPanel = new JPanel(new GridBagLayout());

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmQueryList.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -254 +253 @@
         }
 
-        Config.getPref().putListOfMaps(PREFERENCE_ITEMS, toSave);
+        // TODO: Core dependency:  Config.getPref().putListOfMaps(PREFERENCE_ITEMS, toSave);
+        Main.pref.putListOfStructs(PREFERENCE_ITEMS, toSave);
     }
 
@@ -262 +262 @@
      */
     private static Map<String, SelectorItem> restorePreferences() {
+        // TODO: Core dependency:  Config.getPref().getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
         Collection<Map<String, String>> toRetrieve =
-                Config.getPref().getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
+                Main.pref.getListOfStructs(PREFERENCE_ITEMS, Collections.emptyList());
         Map<String, SelectorItem> result = new HashMap<>();
 

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/io/WikosmDownloadReader.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.data.preferences.ListProperty;
+import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -48 +48 @@
      * Property for list of known Wikosm servers.
      */
-    public static final ListProperty WIKOSM_SERVER_HISTORY = new ListProperty("download.wikosm.servers",
+// TODO: Core dependency:
+//    public static final ListProperty WIKOSM_SERVER_HISTORY = new ListProperty("download.wikosm.servers",
+//            Arrays.asList("http://88.99.164.208/bigdata/namespace/wdq/sparql"));
+    public static final CollectionProperty WIKOSM_SERVER_HISTORY = new CollectionProperty("download.wikosm.servers",
             Arrays.asList("http://88.99.164.208/bigdata/namespace/wdq/sparql"));