Changeset 34544 in osm for applications/editors/josm

Timestamp:

2018-08-18T19:30:20+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLHandler.java (added)
• src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLReader.java (modified) (3 diffs)

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

@@ -3 +3 @@
     <property name="commit.message" value="[josm/PicLayer] - #12045 add ability to localize dialog titles"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13050"/>
+    <property name="plugin.main.version" value="14153"/>
         
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -151 +150 @@
     public void layerRemoving(LayerRemoveEvent e) {
         if (e.getRemovedLayer() instanceof PicLayerAbstract && ((PicLayerAbstract) e.getRemovedLayer()).getTransformer().isModified()) {
-            if (JOptionPane.showConfirmDialog(Main.parent, tr("Do you want to save current calibration of layer {0}?",
+            if (JOptionPane.showConfirmDialog(MainApplication.getMainFrame(), tr("Do you want to save current calibration of layer {0}?",
                     ((PicLayerAbstract) e.getRemovedLayer()).getPicLayerName()),
                     tr("Select an option"),

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java

@@ -11 +11 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.layer.CalibrationFileFilter;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
@@ -48 +48 @@
         fc.setFileFilter(new CalibrationFileFilter());
         fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
-        int result = fc.showOpenDialog(Main.parent);
+        int result = fc.showOpenDialog(MainApplication.getMainFrame());
 
         if (result == JFileChooser.APPROVE_OPTION) {
@@ -58 +58 @@
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
 
@@ -32 +32 @@
         JFileChooser fc = new JFileChooser();
         fc.setAcceptAllFileFilterUsed(true);
-        int result = fc.showOpenDialog(Main.parent);
+        int result = fc.showOpenDialog(MainApplication.getMainFrame());
 
         if (result == JFileChooser.APPROVE_OPTION) {
@@ -42 +42 @@
                 // Error
                 ex.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java

@@ -12 +12 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.layer.CalibrationFileFilter;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
@@ -47 +47 @@
         fc.setFileFilter(new CalibrationFileFilter());
         fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
-        int result = fc.showSaveDialog(Main.parent);
+        int result = fc.showSaveDialog(MainApplication.getMainFrame());
 
         if (result == JFileChooser.APPROVE_OPTION) {
@@ -66 +66 @@
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java

@@ -13 +13 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
 
@@ -63 +63 @@
         fc.setAcceptAllFileFilterUsed(true);
         fc.setSelectedFile(new File(picFilenameNoext + "." + wext));
-        int result = fc.showSaveDialog(Main.parent);
+        int result = fc.showSaveDialog(MainApplication.getMainFrame());
 
         if (result == JFileChooser.APPROVE_OPTION) {
@@ -83 +83 @@
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java

@@ -15 +15 @@
 import javax.swing.filechooser.FileFilter;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -25 +24 @@
 import org.openstreetmap.josm.plugins.piclayer.layer.kml.KMLGroundOverlay;
 import org.openstreetmap.josm.plugins.piclayer.layer.kml.KMLReader;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -88 +88 @@
 
         // Choose a file
-        JFileChooser fc = new JFileChooser(Main.pref.get(m_lastdirprefname));
+        JFileChooser fc = new JFileChooser(Config.getPref().get(m_lastdirprefname));
         fc.setAcceptAllFileFilterUsed(true);
         fc.setFileFilter(new ImageFileFilter());
 
         fc.setMultiSelectionEnabled(true);
-        int result = fc.showOpenDialog(Main.parent);
+        int result = fc.showOpenDialog(MainApplication.getMainFrame());
 
         // Create a layer?
@@ -109 +109 @@
                 // TODO: we need a progress bar here, it can take quite some time
 
-                Main.pref.put(m_lastdirprefname, file.getParent());
+                Config.getPref().put(m_lastdirprefname, file.getParent());
 
                 // Create layer from file
@@ -148 +148 @@
         MainApplication.getMap().mapView.moveLayer(layer, newLayerPos++);
 
-        if (isZoomToLayer && Main.pref.getInt("piclayer.zoom-on-load", 1) != 0) {
+        if (isZoomToLayer && Config.getPref().getInt("piclayer.zoom-on-load", 1) != 0) {
             // if we are loading a single picture file, zoom on it, so that the user can see something
             BoundingXYVisitor v = new BoundingXYVisitor();

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -30 +31 @@
             }
         } catch (NoninvertibleTransformException e1) {
-            e1.printStackTrace();
+            Logging.error(e1);
         }
     }
@@ -46 +47 @@
             currentCommand.addIfChanged();
         } catch (NoninvertibleTransformException e1) {
-            e1.printStackTrace();
+            Logging.error(e1);
         }
     }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -37 +38 @@
             currentCommand.addIfChanged();
         } catch (NoninvertibleTransformException e1) {
-            e1.printStackTrace();
+            Logging.error(e1);
         }
     }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java

@@ -8 +8 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -81 +81 @@
             !(beforeTransform.getImagePosition().equals(afterTransform.getImagePosition()));
         if (changed && !alreadyAdded) {
-            Main.main.undoRedo.add(this);
+            UndoRedoHandler.getInstance().add(this);
             alreadyAdded = true;
         }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -18 +18 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
@@ -24 +25 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -127 +128 @@
         }
 
-        projection = Main.getProjection();
+        projection = ProjectionRegistry.getProjection();
     }
 
@@ -462 +463 @@
 
         try (
-            Reader reader = new InputStreamReader(is);
+            Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
             BufferedReader br = new BufferedReader(reader)
         ) {
@@ -480 +481 @@
                     dy + w/2*ry + h/2*sy
             );
-//            initialImagePosition.setLocation(imagePosition);
-//            m_angle = 0;
             double scalex = 100*sx*getMetersPerEasting(imagePosition);
             double scaley = -100*sy*getMetersPerNorthing(imagePosition);
@@ -613 +612 @@
             return selected;
         } catch (NoninvertibleTransformException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
         return selected;

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java

@@ -17 +17 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -181 +182 @@
     protected boolean confirmCalibrationLoading(String fileName) {
         String prefkey = "piclayer.autoloadcal";
-        String policy = Main.pref.get(prefkey, "");
+        String policy = Config.getPref().get(prefkey, "");
         policy = policy.trim().toLowerCase();
         boolean loadcal = false;
@@ -194 +195 @@
                             "to control the autoloading of calibration files.", prefkey);
             msg += "\n" + tr("Do you want to apply it ?");
-            int answer = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Load calibration file?"), JOptionPane.YES_NO_OPTION);
+            int answer = JOptionPane.showConfirmDialog(MainApplication.getMainFrame(), msg, tr("Load calibration file?"), JOptionPane.YES_NO_OPTION);
             if (answer == JOptionPane.YES_OPTION) {
                 loadcal = true;
@@ -204 +205 @@
                             "to control the autoloading of calibration files.", prefkey);
             // TODO: there should be here a yes/no dialog with a checkbox "do not ask again"
-            JOptionPane.showMessageDialog(Main.parent, msg,
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg,
                 "Automatic loading of the calibration", JOptionPane.INFORMATION_MESSAGE);
-            Main.pref.put(prefkey, "yes");
+            Config.getPref().put(prefkey, "yes");
             loadcal = true;
         }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLReader.java

@@ -5 +5 @@
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
-import org.xml.sax.Attributes;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
 
@@ -30 +28 @@
             xr.setContentHandler(handler);
             xr.parse(new InputSource(new FileReader(file)));
-        } catch (SAXException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (SAXException | IOException e) {
+            Logging.error(e);
         }
         groundOverlays = handler.getResult();
@@ -42 +38 @@
     }
 }
-
-class KMLHandler extends DefaultHandler {
-
-    private boolean inGroundOverlay = false;
-    private boolean inIcon = false;
-    private boolean inLatLonBox = false;
-    private String value;
-    private List<KMLGroundOverlay> result;
-    private KMLGroundOverlay overlay;
-
-    KMLHandler() {
-        result = new ArrayList<>();
-    }
-
-    @Override
-    public void startElement(String uri, String localName, String qName,
-            Attributes attributes) throws SAXException {
-        if ("GroundOverlay".equals(localName)) {
-            inGroundOverlay = true;
-            overlay = new KMLGroundOverlay();
-        } else if (inGroundOverlay && "Icon".equals(localName)) {
-            inIcon = true;
-        } else if (inGroundOverlay && "LatLonBox".equals(localName)) {
-            inLatLonBox = true;
-        }
-    }
-
-    @Override
-    public void endElement(String uri, String localName, String qName)
-            throws SAXException {
-        if (inGroundOverlay && "name".equals(localName)) {
-            overlay.setName(value.trim());
-        } else if (inIcon && "href".equals(localName)) {
-            overlay.setFileName(value.trim());
-        } else if (inLatLonBox && "north".equals(localName)) {
-            overlay.setNorth(Double.valueOf(value.trim()));
-        } else if (inLatLonBox && "east".equals(localName)) {
-            overlay.setEast(Double.valueOf(value.trim()));
-        } else if (inLatLonBox && "south".equals(localName)) {
-            overlay.setSouth(Double.valueOf(value.trim()));
-        } else if (inLatLonBox && "west".equals(localName)) {
-            overlay.setWest(Double.valueOf(value.trim()));
-        } else if (inLatLonBox && "rotation".equals(localName)) {
-            overlay.setRotate(Double.valueOf(value.trim()));
-        } else if (inLatLonBox && "LatLonBox".equals(localName)) {
-            inLatLonBox = false;
-        } else if (inIcon && "Icon".equals(localName)) {
-            inIcon = false;
-        } else if (inGroundOverlay && "GroundOverlay".equals(localName)) {
-            inGroundOverlay = false;
-            result.add(overlay);
-        }
-    }
-
-    @Override
-    public void characters(char[] ch, int start, int length)
-            throws SAXException {
-        value = new String(ch, start, length);
-    }
-
-    public List<KMLGroundOverlay> getResult() {
-        return result;
-    }
-}