Changeset 34520 in osm for applications/editors

Timestamp:

2018-08-18T18:06:33+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/importvec

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/importvec/Settings.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/importvec/SvgImporter.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="Remove the action, add importing SVG to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Upliner"/>

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java

@@ -12 +12 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -22 +22 @@
 
     public ImportDialog() {
-        super(Main.parent, tr("Import vector graphics"),
+        super(MainApplication.getMainFrame(), tr("Import vector graphics"),
                 new String[] { tr("OK"), tr("Cancel") },
                 true);

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/Settings.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.importvec;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 public class Settings {
 
     public static void setScaleNumerator(double value) {
-        Main.pref.putDouble("importvec.scalenum", value);
+        Config.getPref().putDouble("importvec.scalenum", value);
     }
     public static void setScaleDivisor(double value) {
         if (value == 0)
             throw new IllegalArgumentException("Scale divisor cannot be 0");
-        Main.pref.putDouble("importvec.scalediv", value);
+        Config.getPref().putDouble("importvec.scalediv", value);
     }
     public static void setCurveSteps(long value) {
         if (value < 1)
             throw new IllegalArgumentException("Curve steps cannot less than 1");
-        Main.pref.putLong("importvec.curvesteps", value);
+        Config.getPref().putLong("importvec.curvesteps", value);
     }
     
     public static double getScaleNumerator() {
-        return Main.pref.getDouble("importvec.scalenum", 1);
+        return Config.getPref().getDouble("importvec.scalenum", 1);
     }
     public static double getScaleDivisor() {
-        return Main.pref.getDouble("importvec.scalediv", 1);
+        return Config.getPref().getDouble("importvec.scalediv", 1);
     }
     public static double getCurveSteps() {
-        return Main.pref.getDouble("importvec.curvesteps", 4);
+        return Config.getPref().getDouble("importvec.curvesteps", 4);
     }
 }

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java

@@ -16 +16 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.I18n;
 
@@ -163 +165 @@
     @Override
     protected void realRun() throws IOException, OsmTransferException {
-        LatLon center = Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
+        LatLon center = ProjectionRegistry.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
         scale = Settings.getScaleNumerator() / Settings.getScaleDivisor() / Math.cos(Math.toRadians(center.lat()));
         this.center = projection.latlon2eastNorth(center);
         try {
             SVGUniverse universe = new SVGUniverse();
-            universe.setVerbose(Main.pref.getBoolean("importvec.verbose", false));
+            universe.setVerbose(Config.getPref().getBoolean("importvec.verbose", false));
             for (File f : files) {
                 if (f.isDirectory()) continue;
@@ -196 +198 @@
             cmds.add(new AddCommand(ds, w));
         }
-        MainApplication.undoRedo.add(new SequenceCommand("Import primitives", cmds));
+        UndoRedoHandler.getInstance().add(new SequenceCommand("Import primitives", cmds));
     }
     

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImporter.java

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -34 +33 @@
     public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
         if (MainApplication.getLayerManager().getEditLayer() == null) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Please open or create data layer before importing"));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Please open or create data layer before importing"));
             return;
         }