Changeset 34555 in osm for applications/editors/josm/plugins/seachartedit/src/panels

Timestamp:

2018-08-18T20:15:48+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/seachartedit/src/panels

Files:

• PanelMain.java (modified) (4 diffs)
• PanelS57.java (modified) (3 diffs)

applications/editors/josm/plugins/seachartedit/src/panels/PanelMain.java

@@ -28 +28 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 import messages.Messages;
@@ -52 +53 @@
     };
     private JButton importButton = null;
-    JFileChooser ifc = new JFileChooser(Main.pref.get("nceditplugin.encinpfile"));
+    JFileChooser ifc = new JFileChooser(Config.getPref().get("nceditplugin.encinpfile"));
     private ActionListener alImport = new ActionListener() {
         @Override
@@ -59 +60 @@
                 SCeditAction.panelS57.setVisible(true);
         setStatus("Select S-57 ENC file for import", Color.yellow);
-                int returnVal = ifc.showOpenDialog(Main.parent);
+                int returnVal = ifc.showOpenDialog(MainApplication.getMainFrame());
                 if (returnVal == JFileChooser.APPROVE_OPTION) {
                     try {
-                        Main.pref.put("smed2plugin.encinpfile", ifc.getSelectedFile().getPath());
+                        Config.getPref().put("smed2plugin.encinpfile", ifc.getSelectedFile().getPath());
                         SCeditAction.panelS57.startImport(ifc.getSelectedFile());
                     } catch (IOException e1) {
@@ -84 +85 @@
                 SCeditAction.panelS57.setVisible(true);
         setStatus("Select S-57 ENC file for export", Color.yellow);
-        int returnVal = efc.showOpenDialog(Main.parent);
+        int returnVal = efc.showOpenDialog(MainApplication.getMainFrame());
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             try {

applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java

@@ -23 +23 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -33 +31 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 import s57.S57att;
@@ -69 +69 @@
         FileInputStream in = new FileInputStream(inf);
         PanelMain.setStatus("Select OSM types file", Color.yellow);
-        JFileChooser ifc = new JFileChooser(Main.pref.get("smed2plugin.typesfile"));
-        ifc.setSelectedFile(new File(Main.pref.get("smed2plugin.typesfile")));
-        int returnVal = ifc.showOpenDialog(Main.parent);
+        JFileChooser ifc = new JFileChooser(Config.getPref().get("smed2plugin.typesfile"));
+        ifc.setSelectedFile(new File(Config.getPref().get("smed2plugin.typesfile")));
+        int returnVal = ifc.showOpenDialog(MainApplication.getMainFrame());
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-            Main.pref.put("smed2plugin.typesfile", ifc.getSelectedFile().getPath());
+            Config.getPref().put("smed2plugin.typesfile", ifc.getSelectedFile().getPath());
             Scanner tin = new Scanner(new FileInputStream(ifc.getSelectedFile()), "UTF-8");
             while (tin.hasNext()) {