Changeset 33920 in osm for applications/editors/josm

Timestamp:

2017-11-26T15:47:40+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/seachartedit

Files:

• build.xml (modified) (1 diff)
• src/panels/PanelS57.java (modified) (5 diffs)
• src/scedit/SCedit.java (modified) (2 diffs)
• src/scedit/SCeditAction.java (modified) (4 diffs)

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

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

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

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -33 +34 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -72 +74 @@
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             Main.pref.put("smed2plugin.typesfile", ifc.getSelectedFile().getPath());
-            Scanner tin = new Scanner(new FileInputStream(ifc.getSelectedFile()));
+            Scanner tin = new Scanner(new FileInputStream(ifc.getSelectedFile()), "UTF-8");
             while (tin.hasNext()) {
                 Obj type = S57obj.enumType(tin.next());
@@ -86 +88 @@
 
         DataSet data = new DataSet();
-        data.setUploadDiscouraged(true);
+        data.setUploadPolicy(UploadPolicy.DISCOURAGED);
 
         for (long id : map.index.keySet()) {
@@ -201 +203 @@
 
         OsmDataLayer layer = new OsmDataLayer(data, "S-57 Import", null);
-        Main.getLayerManager().addLayer(layer);
-        Main.map.mapView.zoomTo(new Bounds(Math.toDegrees(map.bounds.minlat), Math.toDegrees(map.bounds.minlon),
+        MainApplication.getLayerManager().addLayer(layer);
+        MainApplication.getMap().mapView.zoomTo(new Bounds(Math.toDegrees(map.bounds.minlat), Math.toDegrees(map.bounds.minlon),
                                            Math.toDegrees(map.bounds.maxlat), Math.toDegrees(map.bounds.maxlon)));
         PanelMain.setStatus("Import done", Color.green);

applications/editors/josm/plugins/seachartedit/src/scedit/SCedit.java

@@ -10 +10 @@
 package scedit;
 
-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 @@
     public SCedit(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.toolsMenu, new SCeditAction());
+        MainMenu.add(MainApplication.getMenu().toolsMenu, new SCeditAction());
     }
 }

applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java

@@ -22 +22 @@
 import javax.swing.WindowConstants;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -152 +151 @@
         showFrame.setVisible(false);
 
-        Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
+        getLayerManager().addAndFireActiveLayerChangeListener(this);
         DataSet.addSelectionListener(this);
     }
@@ -158 +157 @@
     public void closeDialog() {
         if (isOpen) {
-                Main.getLayerManager().removeActiveLayerChangeListener(this);
+                getLayerManager().removeActiveLayerChangeListener(this);
             editFrame.setVisible(false);
             editFrame.dispose();
@@ -172 +171 @@
             e.getPreviousEditLayer().data.removeDataSetListener(dataSetListener);
         }
-        OsmDataLayer newLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer newLayer = getLayerManager().getEditLayer();
         if (newLayer != null) {
             newLayer.data.addDataSetListener(dataSetListener);