Changeset 35343 in osm for applications/editors

Timestamp:

2020-03-01T00:40:49+01:00 (5 years ago)

Author:

donvip

Message:

see #josm17516 - fix error-prone errors

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• AddressEditContainer.java (modified) (1 diff)
• OSMAddress.java (modified) (1 diff)
• OSMEntityBase.java (modified) (1 diff)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

@@ -184 +184 @@
         }
 
-        OSMAddress aNode = null;
         // Address nodes are recycled in order to keep instance variables like guessed names
-        aNode = OsmFactory.createNode(n);
+        OSMAddress aNode = OsmFactory.createNode(n);
 
         if (aNode != null) {

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java

@@ -420 +420 @@
         return 0;
 
-    int cc = 0;
-    cc = this.getCountry().compareTo(other.getCountry());
+    int cc = this.getCountry().compareTo(other.getCountry());
     if (cc == 0) {
         cc = this.getState().compareTo(other.getState());

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java

@@ -26 +26 @@
  * </ol>
  */
-public class OSMEntityBase implements IOSMEntity, Comparable<IOSMEntity> {
+public class OSMEntityBase implements IOSMEntity {
     public static final String ANONYMOUS = tr("No name");
     private static List<IAddressEditContainerListener> containerListeners = new ArrayList<>();