Changeset 33569 in osm for applications/editors/josm/plugins

Timestamp:

2017-08-27T20:24:58+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12675

Location:

applications/editors/josm/plugins/pdfimport

Files:

• build.xml (modified) (1 diff)
• src/pdfimport/LoadPdfDialog.java (modified) (7 diffs)
• src/pdfimport/PdfImportPlugin.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="Initial pdfimport version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12675"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -51 +51 @@
 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.SideButton;
+import org.openstreetmap.josm.gui.io.importexport.OsmExporter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
@@ -57 +59 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressRenderer;
-import org.openstreetmap.josm.gui.progress.SwingRenderingProgressMonitor;
-import org.openstreetmap.josm.io.OsmExporter;
+import org.openstreetmap.josm.gui.progress.swing.SwingRenderingProgressMonitor;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -66 +68 @@
 public class LoadPdfDialog extends JFrame {
 
-    class LoadProgressRenderer implements ProgressRenderer {
+    static class LoadProgressRenderer implements ProgressRenderer {
         private final JProgressBar pBar;
         private String title = "";
@@ -678 +680 @@
 
         //zoom to new location
-        Main.map.mapView.zoomTo(placement.getWorldBounds(this.data));
-        Main.map.repaint();
+        MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(this.data));
+        MainApplication.getMap().repaint();
     }
 
@@ -708 +710 @@
 
     private EastNorth getSelectedCoor() {
-        Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getSelected();
 
         if (selected.size() != 1 || !(selected.iterator().next() instanceof Node)) {
@@ -1040 +1042 @@
         this.removeLayer();
         this.layer = _layer;
-        Main.getLayerManager().addLayer(this.layer);
-        Main.map.mapView.zoomTo(placement.getWorldBounds(this.data));
+        MainApplication.getLayerManager().addLayer(this.layer);
+        MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(this.data));
     }
 
     private void removeLayer() {
         if (this.layer != null) {
-            Main.getLayerManager().removeLayer(this.layer);
+            MainApplication.getLayerManager().removeLayer(this.layer);
             this.layer.data.clear(); //saves memory
             this.layer = null;
@@ -1067 +1069 @@
             exporter.exportData(file, layer);
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
         }
 

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -19 +19 @@
         super(info);
         name = tr("Import PDF file");
-        MainMenu.add(Main.main.menu.imagerySubMenu, new PdfImportAction());
+        MainMenu.add(MainApplication.getMenu().imagerySubMenu, new PdfImportAction());
     }
 }