Changeset 11889 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

PMD - fix some InefficientEmptyStringCheck (new in PMD 5.5.5)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SearchNotesDownloadAction.java (modified) (2 diffs)
• data/Version.java (modified) (4 diffs)
• data/imagery/ImageryInfo.java (modified) (2 diffs)
• data/projection/CustomProjection.java (modified) (2 diffs)
• data/validation/routines/UrlValidator.java (modified) (2 diffs)
• data/validation/tests/OpeningHourTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java

@@ -10 +10 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.JLabel;
@@ -61 +62 @@
         }
 
-        String searchTerm = searchTermBox.getText();
-        if (searchTerm == null || searchTerm.trim().isEmpty()) {
+        String searchTerm = Optional.ofNullable(searchTermBox.getText()).orElse("").trim();
+        if (searchTerm.isEmpty()) {
             Notification notification = new Notification(tr("You must enter a search term"));
             notification.setIcon(JOptionPane.WARNING_MESSAGE);

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

@@ -7 +7 @@
 import java.io.InputStream;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Properties;
 
@@ -14 +15 @@
 /**
  * Provides basic information about the currently used JOSM build.
- *
+ * @since 2358
  */
 public class Version {
@@ -61 +62 @@
             Main.warn(e, tr("Error reading revision info from revision file: {0}", e.getMessage()));
         }
-        String value = properties.getProperty("Revision");
-        if (value != null) {
-            value = value.trim();
+        String value = Optional.ofNullable(properties.getProperty("Revision")).orElse("").trim();
+        if (!value.isEmpty()) {
             try {
                 version = Integer.parseInt(value);
@@ -83 +83 @@
         // is this a local build ?
         //
-        isLocalBuild = false;
-        value = properties.getProperty("Is-Local-Build");
-        if (value != null && "true".equalsIgnoreCase(value.trim())) {
-            isLocalBuild = true;
-        }
+        isLocalBuild = "true".equalsIgnoreCase(
+                Optional.ofNullable(properties.getProperty("Is-Local-Build")).orElse("").trim());
 
         // is this a specific build ?
         //
-        buildName = null;
-        value = properties.getProperty("Build-Name");
-        if (value != null && !value.trim().isEmpty()) {
-            buildName = value.trim();
-        }
+        buildName = Optional.ofNullable(properties.getProperty("Build-Name")).orElse("").trim();
 
         // the revision info

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -375 +375 @@
         if (t != null) {
             this.imageryType = t;
-        } else if (type != null && !type.trim().isEmpty()) {
+        } else if (type != null && !type.isEmpty()) {
             throw new IllegalArgumentException("unknown type: "+type);
         }
     }
 
+    /**
+     * Constructs a new {@code ImageryInfo} with given name, url, id, extended and EULA URLs.
+     * @param name The entry name
+     * @param url The entry URL
+     * @param type The entry imagery type. If null, WMS will be used as default
+     * @param eulaAcceptanceRequired The EULA URL
+     * @param cookies The data part of HTTP cookies header in case the service requires cookies to work
+     * @param id tile id
+     * @throws IllegalArgumentException if type refers to an unknown imagery type
+     */
     public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies, String id) {
         this(name, url, type, eulaAcceptanceRequired, cookies);
@@ -558 +568 @@
     }
 
+    /**
+     * Determines if URL is equal to given imagery info.
+     * @param in imagery info
+     * @return {@code true} if URL is equal to given imagery info
+     */
     public boolean equalsBaseValues(ImageryInfo in) {
         return url.equals(in.url);

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(",");

trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

@@ -24 +24 @@
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -428 +429 @@
         }
 
-        String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
-        if (extra != null && !extra.trim().isEmpty()) {
-            return false;
-        }
-
-        return true;
+        return Optional.ofNullable(authorityMatcher.group(PARSE_AUTHORITY_EXTRA)).orElse("").trim().isEmpty();
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -197 +197 @@
     public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode,
             boolean ignoreOtherSeverity, String locale) {
-        if (ENGINE == null || value == null || value.trim().isEmpty()) {
+        if (ENGINE == null || value == null || value.isEmpty()) {
             return Collections.emptyList();
         }