Changeset 33541 in osm

Timestamp:

2017-08-26T02:51:22+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12663

Location:

applications/editors/josm/plugins/wikipedia

Files:

• build.xml (modified) (1 diff)
• src/org/wikipedia/WikipediaApp.java (modified) (3 diffs)
• src/org/wikipedia/WikipediaPlugin.java (modified) (2 diffs)
• src/org/wikipedia/actions/FetchWikidataAction.java (modified) (4 diffs)
• src/org/wikipedia/actions/WikipediaAddNamesAction.java (modified) (2 diffs)
• src/org/wikipedia/actions/WikipediaCopyTemplate.java (modified) (2 diffs)
• src/org/wikipedia/gui/GuiUtils.java (modified) (1 diff)
• src/org/wikipedia/gui/WikidataItemSearchDialog.java (modified) (2 diffs)
• src/org/wikipedia/gui/WikidataTagCellRenderer.java (modified) (2 diffs)
• src/org/wikipedia/gui/WikipediaToggleDialog.java (modified) (11 diffs)

applications/editors/josm/plugins/wikipedia/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12663"/>
     <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
@@ -193 +194 @@
                             status.put(x[0], "1".equals(x[1]));
                         } else {
-                            Main.error("Unknown element " + line);
+                            Logging.error("Unknown element " + line);
                         }
                     });
@@ -483 +484 @@
             return DocumentBuilderFactory.newInstance().newDocumentBuilder();
         } catch (ParserConfigurationException e) {
-            Main.warn("Cannot create DocumentBuilder");
-            Main.warn(e);
+                Logging.warn("Cannot create DocumentBuilder");
+                Logging.warn(e);
             throw new RuntimeException(e);
         }

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaPlugin.java

@@ -2 +2 @@
 package org.wikipedia;
 
-import org.openstreetmap.josm.Main;
+import javax.swing.JMenu;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -19 +21 @@
         super(info);
         new WikipediaCopyTemplate();
-        MainMenu.add(Main.main.menu.dataMenu, new WikipediaAddNamesAction());
-        MainMenu.add(Main.main.menu.dataMenu, new FetchWikidataAction());
-        MainMenu.add(Main.main.menu.dataMenu, new WikidataItemSearchDialog.Action());
+        JMenu dataMenu = MainApplication.getMenu().dataMenu;
+        MainMenu.add(dataMenu, new WikipediaAddNamesAction());
+        MainMenu.add(dataMenu, new FetchWikidataAction());
+        MainMenu.add(dataMenu, new WikidataItemSearchDialog.Action());
     }
 

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/FetchWikidataAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -45 +47 @@
             return;
         }
-        Main.worker.submit(new Fetcher(ds.getSelected()));
+        MainApplication.worker.submit(new Fetcher(ds.getSelected()));
     }
 
@@ -99 +101 @@
         protected void finish() {
             if (!canceled && !commands.isEmpty()) {
-                Main.main.undoRedo.add(commands.size() == 1 ? commands.get(0) : new SequenceCommand(tr("Add Wikidata"), commands));
+                MainApplication.undoRedo.add(commands.size() == 1 ? commands.get(0) : new SequenceCommand(tr("Add Wikidata"), commands));
             }
             if (!canceled && !notFound.isEmpty()) {
@@ -140 +142 @@
                 } else {
                     final WikipediaEntry article = new WikipediaEntry(lang, wikipedia);
-                    Main.warn(tr("No Wikidata ID found for: {0}", article));
+                    Logging.warn(tr("No Wikidata ID found for: {0}", article));
                     notFound.add(article);
                 }

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaAddNamesAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
+import org.openstreetmap.josm.tools.Logging;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.data.WikipediaEntry;
@@ -35 +36 @@
                 .map(i -> new String[]{"name:" + i.lang, i.article})
                 .forEach(tags::add);
-        if (Main.isDebugEnabled()) {
-            Main.debug(tags.toString());
+        if (Logging.isDebugEnabled()) {
+                Logging.debug(tags.toString());
         }
         AddTagsDialog.addTags(tags.toArray(new String[tags.size()][]), "Wikipedia", getLayerManager().getEditDataSet().getSelected());

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaCopyTemplate.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
@@ -34 +35 @@
 
     public WikipediaCopyTemplate() {
-        JosmAction previous = Main.main.menu.copyCoordinates;
+        JosmAction previous = MainApplication.getMenu().copyCoordinates;
         for (final CoordCopyTemplateEntry templateEntry : TEMPLATE_ENTRIES) {
             CoordCopyTemplate t = new CoordCopyTemplate(templateEntry);
-            final JMenuItem menu = MainMenu.addAfter(Main.main.menu.editMenu, t, false, previous);
+            final JMenuItem menu = MainMenu.addAfter(MainApplication.getMenu().editMenu, t, false, previous);
             menu.setToolTipText(tr("Copies the {0} template to the system clipboard instantiated with the coordinates of the first selected node", templateEntry.name));
             previous = t;

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

@@ -3 +3 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.AlphanumComparator;

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
@@ -74 +75 @@
 
     private void initTargetKeys() {
-        final DataSet editDataSet = Main.getLayerManager().getEditDataSet();
+        final DataSet editDataSet = MainApplication.getLayerManager().getEditDataSet();
         if (editDataSet == null) {
             return;

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp;
@@ -70 +71 @@
                 label = labelCache.get(id).get();
             } catch (InterruptedException | ExecutionException e) {
-                Main.warn("Could not fetch Wikidata label for " + id);
-                Main.warn(e);
+                Logging.warn("Could not fetch Wikidata label for " + id);
+                Logging.warn(e);
                 return null;
             }

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -40 +43 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.wikipedia.WikipediaApp;
@@ -71 +75 @@
                 @Override
                 public void mouseClicked(MouseEvent e) {
-                    if (e.getClickCount() == 2 && getSelectedValue() != null && Main.getLayerManager().getEditDataSet() != null) {
+                    if (e.getClickCount() == 2 && getSelectedValue() != null && MainApplication.getLayerManager().getEditDataSet() != null) {
                         final WikipediaEntry entry = getSelectedValue();
                         if (entry.coordinate != null) {
                             BoundingXYVisitor bbox = new BoundingXYVisitor();
                             bbox.visit(entry.coordinate);
-                            Main.map.mapView.zoomTo(bbox);
+                            MainApplication.getMap().mapView.zoomTo(bbox);
                         }
                         final String search = entry.getSearchText().replaceAll("\\(.*\\)", "");
-                        SearchAction.search(search, SearchAction.SearchMode.replace);
+                        SearchAction.search(search, SearchMode.replace);
                     }
                 }
@@ -146 +150 @@
             try {
                 // determine bbox
-                final LatLon min = Main.map.mapView.getLatLon(0, Main.map.mapView.getHeight());
-                final LatLon max = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), 0);
+                MapView mapView = MainApplication.getMap().mapView;
+                final LatLon min = mapView.getLatLon(0, mapView.getHeight());
+                final LatLon max = mapView.getLatLon(mapView.getWidth(), 0);
                 // add entries to list model
                 titleContext = tr("coordinates");
@@ -258 +263 @@
             if (list.getSelectedValue() != null) {
                 final String url = list.getSelectedValue().getBrowserUrl();
-                Main.info("Wikipedia: opening " + url);
+                Logging.info("Wikipedia: opening " + url);
                 OpenBrowser.displayUrl(url);
             }
@@ -313 +318 @@
                 return;
             }
-            final Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
+            final Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getSelected();
             if (!GuiUtils.confirmOverwrite(tag.getKey(), tag.getValue(), selected)) {
                 return;
@@ -320 +325 @@
                     selected,
                     tag.getKey(), tag.getValue());
-            Main.main.undoRedo.add(cmd);
-            Main.worker.submit(new FetchWikidataAction.Fetcher(selected));
+            MainApplication.undoRedo.add(cmd);
+            MainApplication.worker.submit(new FetchWikidataAction.Fetcher(selected));
         }
     }
@@ -345 +350 @@
                 return;
             }
-            Main.map.mapView.zoomTo(latLon);
+            MainApplication.getMap().mapView.zoomTo(latLon);
         }
     }
@@ -352 +357 @@
         final String language = getLanguageOfFirstItem();
         articles.clear();
-        if (Main.main != null && Main.getLayerManager().getEditDataSet() != null) {
-            Main.getLayerManager().getEditDataSet().allPrimitives().stream()
+        if (Main.main != null && MainApplication.getLayerManager().getEditDataSet() != null) {
+                MainApplication.getLayerManager().getEditDataSet().allPrimitives().stream()
                     .flatMap(p -> WikipediaApp.forLanguage(language).getWikipediaArticles(p))
                     .forEach(articles::add);
@@ -364 +369 @@
     public void showNotify() {
         DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         updateWikipediaArticles();
     }
@@ -371 +376 @@
     public void hideNotify() {
         DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         articles.clear();
     }