Ticket #12045: 12045.patch

build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="[josm/PicLayer] - #10335 add interpolation hints for the image drawing"/>
+    <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="7817"/>
         

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

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -52 +47 @@
 import org.openstreetmap.josm.plugins.piclayer.actions.transform.affine.RemovePointAction;
 import org.openstreetmap.josm.plugins.piclayer.actions.transform.affine.TransformPointAction;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
  * Main Plugin class.
@@ -157 +153 @@
         if (arg0 instanceof PicLayerAbstract && ((PicLayerAbstract) arg0).getTransformer().isModified()) {
             if (JOptionPane.showConfirmDialog(Main.parent, tr("Do you want to save current calibration of layer {0}?",
                     ((PicLayerAbstract)arg0).getPicLayerName()),
-                    UIManager.getString("OptionPane.titleText"),
+                    tr("Select an option"),
                     JOptionPane.YES_NO_OPTION) == 0)
                 new SavePictureCalibrationAction((PicLayerAbstract) arg0).actionPerformed(null);
         }

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

@@ -76 +76 @@
             } catch (Exception e) {
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage()));
+                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }
     }

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

@@ -38 +38 @@
             } catch (Exception ex) {
                 // Error
                 ex.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", ex.getMessage()));
+                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }
     }

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

@@ -84 +84 @@
             } catch (Exception e) {
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()));
+                JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }
     }

src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java

@@ -59 +59 @@
         catch (IOException e) {
             // Failed
             System.out.println( "NewLayerFromClipboardAction::actionPerformed - " + e.getMessage() );
-            JOptionPane.showMessageDialog(null, e.getMessage() );
+            JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             return;
         }
         // Add layer

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

@@ -135 +135 @@
                     kml.process();
                     JOptionPane.showMessageDialog(null, tr("KML calibration is in beta stage and may produce incorrectly calibrated layers!\n"+
                     "Please use {0} to upload your KMLs that were calibrated incorrectly.",
-                    "https://josm.openstreetmap.de/ticket/5451"));
+                    "https://josm.openstreetmap.de/ticket/5451"), tr("Notification"), JOptionPane.INFORMATION_MESSAGE);
                     for (KMLGroundOverlay overlay : kml.getGroundOverlays()) {
                         //TODO: zoom to whole picture, not only the last
                         addNewLayerFromKML(file, overlay, newLayerPos);
@@ -157 +157 @@
         catch (IOException e) {
             // Failed
             System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() );
-            JOptionPane.showMessageDialog(null, e.getMessage() );
+            JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
         }
     }
 
@@ -183 +183 @@
         } catch (IOException e) {
             // Failed
             System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() );
-            JOptionPane.showMessageDialog(null, e.getMessage() );
+            JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
         }
     }
 }

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

@@ -215 +215 @@
             msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
                             "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(Main.parent, msg, tr("Load calibration file?"), JOptionPane.YES_NO_OPTION);
             if (answer == JOptionPane.YES_OPTION) {
                 loadcal = true;
             }