Changeset 11889 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2017-04-12T22:22:52+02:00 (8 years ago)

Author:

Don-vip

Message:

PMD - fix some InefficientEmptyStringCheck (new in PMD 5.5.5)

File:

• trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -344 +344 @@
     public static Map<String, String> parseParameterList(String pref, boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
         Map<String, String> parameters = new HashMap<>();
-        if (pref.trim().isEmpty()) {
+        String trimmedPref = pref.trim();
+        if (trimmedPref.isEmpty()) {
             return parameters;
         }
 
         Pattern keyPattern = Pattern.compile("\\+(?<key>[a-zA-Z0-9_]+)(=(?<value>.*))?");
-        String[] parts = Utils.WHITE_SPACES_PATTERN.split(pref.trim());
+        String[] parts = Utils.WHITE_SPACES_PATTERN.split(trimmedPref);
         for (String part : parts) {
             Matcher m = keyPattern.matcher(part);
@@ -488 +489 @@
     }
 
+    /**
+     * Parse {@code towgs84} parameter.
+     * @param paramList List of parameter arguments (expected: 3 or 7)
+     * @param ellps ellipsoid
+     * @return parsed datum ({@link ThreeParameterDatum} or {@link SevenParameterDatum})
+     * @throws ProjectionConfigurationException if the arguments cannot be parsed
+     */
     public Datum parseToWGS84(String paramList, Ellipsoid ellps) throws ProjectionConfigurationException {
         String[] numStr = paramList.split(",");