Changeset 11739 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-03-17T23:03:26+01:00 (7 years ago)

Author:

Don-vip

Message:

enable more PMD rules

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• JosmUserIdentityManager.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -239 +239 @@
      */
     public boolean isCurrentUser(String username) {
-        return username != null && this.userName != null && this.userName.equals(username);
+        return this.userName != null && this.userName.equals(username);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -271 +271 @@
                 for (int i = gpxLst.size() - 1; i >= 0; i--) {
                     GpxDataWrapper wrapper = gpxLst.get(i);
-                    if (wrapper.file != null && sel.equals(wrapper.file)) {
+                    if (sel.equals(wrapper.file)) {
                         cbGpx.setSelectedIndex(i);
                         if (!sel.getName().equals(wrapper.name)) {