Changeset 34545 in osm for applications

Timestamp:

2018-08-18T19:32:21+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/pointInfo

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPreference.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/pointinfo/ReverseFinder.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java (modified) (6 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="PointInfo: Adds a link to photo metadata in Catastro module. Patch by Javier Sánchez Portero."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12666"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- plugin can load at runtime -->

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.plugins.pointinfo.AbstractPointInfoModule;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java

@@ -8 +8 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.pointinfo.catastro.CatastroModule;
 import org.openstreetmap.josm.plugins.pointinfo.ruian.RuianModule;
-import org.openstreetmap.josm.plugins.pointinfo.catastro.CatastroModule;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -71 +71 @@
         AbstractPointInfoModule module;
         module = null;
-        if (Main.pref.getBoolean("plugin.pointinfo.automode", true)) {
+        if (Config.getPref().getBoolean("plugin.pointinfo.automode", true)) {
             ReverseRecord r = ReverseFinder.queryNominatim(pos);
             Iterator i = modules.values().iterator();
@@ -81 +81 @@
             }
         } else {
-            module = modules.get(Main.pref.get("plugin.pointinfo.module", "RUIAN"));
+            module = modules.get(Config.getPref().get("plugin.pointinfo.module", "RUIAN"));
         }
         if (module == null) {

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPreference.java

@@ -13 +13 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -42 +42 @@
         JPanel panel = new JPanel(new GridBagLayout());
         // autoMode
-        autoMode.setSelected(Main.pref.getBoolean("plugin.pointinfo.automode", false));
+        autoMode.setSelected(Config.getPref().getBoolean("plugin.pointinfo.automode", false));
         autoMode.setToolTipText(tr("Try to guess the appropriate module from the location."
                 + " If it fails, use the module selected below."));
@@ -50 +50 @@
             module.addItem(modName);
         }
-        module.setSelectedItem(Main.pref.get("plugin.pointinfo.module", "RUIAN"));
+        module.setSelectedItem(Config.getPref().get("plugin.pointinfo.module", "RUIAN"));
         module.setToolTipText(tr("The module called to get the point information."));
         panel.add(new JLabel(tr("Module")), GBC.std());
@@ -60 +60 @@
     @Override
     public boolean ok() {
-        Main.pref.putBoolean("plugin.pointinfo.automode", autoMode.isSelected());
-        Main.pref.put("plugin.pointinfo.module", (String) module.getSelectedItem());
+        Config.getPref().putBoolean("plugin.pointinfo.automode", autoMode.isSelected());
+        Config.getPref().put("plugin.pointinfo.module", (String) module.getSelectedItem());
         return false;
     }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseFinder.java

@@ -4 +4 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.net.URL;
 import java.util.Locale;
 

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.plugins.pointinfo.AbstractPointInfoModule;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
-
-import org.openstreetmap.josm.plugins.pointinfo.AbstractPointInfoModule;
 
 /**

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.logging.Level;
 
 import javax.json.Json;
@@ -20 +21 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -25 +27 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.pointinfo.PointInfoUtils;
 import org.openstreetmap.josm.tools.Logging;
-import java.util.logging.Level;
 
 /**
@@ -851 +852 @@
         // Near address places
         if (!m_adresni_mista.isEmpty() && m_objekt_ruian_id == 0) {
-            String x, x_name;
+            String x;
             r.append("<i><u>Adresní místa v okolí</u></i><br/>")
              .append("<table>");
             for (int i = 0; i < m_adresni_mista.size(); i++) {
                 x = "";
-                x_name = "";
                 if (m_adresni_mista.get(i).getCisloTyp().equals("Číslo evidenční")) {
                     x = "ev.";
@@ -863 +863 @@
                 if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) {
                     x += "/" + m_adresni_mista.get(i).getCisloOrientacni();
-                    x_name += "/orientační";
                 }
                 r.append("<tr><td bgcolor=#e5e5ff>");
@@ -1125 +1124 @@
         tc.applyTo(coll);
 
-        MainApplication.undoRedo.add(new SequenceCommand(tr("Add new address point"), commands));
+        UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Add new address point"), commands));
     }