Changeset 8404 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2015-05-21T01:18:35+02:00 (9 years ago)

Author:

Don-vip

Message:

When doing a String.toLowerCase()/toUpperCase() call, use a Locale. This avoids problems with certain locales, i.e. Lithuanian or Turkish. See PMD UseLocaleWithCaseConversions rule and String.toLowerCase() javadoc.

Location:

trunk/src/org/openstreetmap/josm/io/imagery

Files:

• WMSGrabber.java (modified) (1 diff)
• WMSImagery.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -209 +209 @@
         // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
         boolean switchLatLon = false;
-        if (baseURL.toLowerCase().contains("crs=epsg:4326")) {
+        if (baseURL.toLowerCase(Locale.ENGLISH).contains("crs=epsg:4326")) {
             switchLatLon = true;
-        } else if (baseURL.toLowerCase().contains("crs=") && "EPSG:4326".equals(myProj)) {
+        } else if (baseURL.toLowerCase(Locale.ENGLISH).contains("crs=") && "EPSG:4326".equals(myProj)) {
             switchLatLon = true;
         }

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -15 +15 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -263 +264 @@
             String crs = (String) getContent(child);
             if (!crs.isEmpty()) {
-                String upperCase = crs.trim().toUpperCase();
+                String upperCase = crs.trim().toUpperCase(Locale.ENGLISH);
                 crsList.add(upperCase);
             }