Ticket #6698: patch.diff

src/org/openstreetmap/josm/data/Version.java

@@ -109 +109 @@
                 version = Integer.parseInt(value);
             } catch(NumberFormatException e) {
                 version = 0;
-                System.err.println(tr("Warning: unexpected JOSM version number in revision file, value is ''{0}''", value));
+                System.err.println(tr("Warning: Unexpected JOSM version number in revision file, value is ''{0}''", value));
             }
         } else {
             version = JOSM_UNKNOWN_VERSION;

src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -88 +88 @@
                 dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             } catch(Exception e) {
                 if (isCanceled()) {
-                    System.out.println(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
+                    System.out.println(tr("Warning: Ignoring exception because download has been canceled. Exception: {0}", e.toString()));
                     return;
                 }
                 if (e instanceof OsmTransferCanceledException) {

src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java

@@ -74 +74 @@
                         KeyEvent.VK_R,
                         Shortcut.GROUP_NONE),
                         true
-        );
+                );
 
         // Add default services
         services.add(
                 new RectifierService("Metacarta Map Rectifier",
                         "http://labs.metacarta.com/rectifier/",
                         "http://labs.metacarta.com/rectifier/wms.cgi?id=__s__&srs=EPSG:4326"
-                        + "&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png&",
-                        // This matches more than the "classic" WMS link, so users can pretty much
-                        // copy any link as long as it includes the ID
-                        "labs\\.metacarta\\.com/(?:.*?)(?:/|=)([0-9]+)(?:\\?|/|\\.|$)",
-                "^[0-9]+$")
-        );
+                                + "&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png&",
+                                // This matches more than the "classic" WMS link, so users can pretty much
+                                // copy any link as long as it includes the ID
+                                "labs\\.metacarta\\.com/(?:.*?)(?:/|=)([0-9]+)(?:\\?|/|\\.|$)",
+                        "^[0-9]+$")
+                );
         services.add(
                 // TODO: Change all links to mapwarper.net once the project has moved.
                 // The RegEx already matches the new URL and old URLs will be forwarded
@@ -94 +94 @@
                 new RectifierService("Geothings Map Warper",
                         "http://warper.geothings.net/",
                         "http://warper.geothings.net/maps/wms/__s__?request=GetMap&version=1.1.1"
-                        + "&styles=&format=image/png&srs=epsg:4326&exceptions=application/vnd.ogc.se_inimage&",
-                        // This matches more than the "classic" WMS link, so users can pretty much
-                        // copy any link as long as it includes the ID
-                        "(?:mapwarper\\.net|warper\\.geothings\\.net)/(?:.*?)/([0-9]+)(?:\\?|/|\\.|$)",
-                "^[0-9]+$")
-        );
+                                + "&styles=&format=image/png&srs=epsg:4326&exceptions=application/vnd.ogc.se_inimage&",
+                                // This matches more than the "classic" WMS link, so users can pretty much
+                                // copy any link as long as it includes the ID
+                                "(?:mapwarper\\.net|warper\\.geothings\\.net)/(?:.*?)/([0-9]+)(?:\\?|/|\\.|$)",
+                        "^[0-9]+$")
+                );
 
         // This service serves the purpose of "just this once" without forcing the user
         // to commit the link to the preferences
@@ -207 +207 @@
 
             // and display an error message. The while(true) ensures that the dialog pops up again
             JOptionPane.showMessageDialog(Main.parent,
-                    tr("Couldn''t match the entered link or id to the selected service. Please try again."),
+                    tr("Could not match the entered link or id to the selected service. Please try again."),
                     tr("No valid WMS URL or id"),
                     JOptionPane.ERROR_MESSAGE);
             diag.setVisible(true);