Changeset 13974 in josm for trunk

Timestamp:

2018-06-24T19:57:43+02:00 (6 years ago)

Author:

Don-vip

Message:

fix recent minor issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/Addresses.java (modified) (9 diffs)
• gui/history/HistoryBrowserDialogManager.java (modified) (2 diffs)
• gui/widgets/TextContextualPopupMenu.java (modified) (1 diff)

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

@@ -65 +65 @@
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
-    private Map<String, Collection<OsmPrimitive>> addresses;
+    private Map<String, Collection<OsmPrimitive>> knownAddresses;
     private Set<String> ignoredAddresses;
 
@@ -124 +124 @@
     }
 
-    private boolean hasAddress(OsmPrimitive p) {
+    static boolean hasAddress(OsmPrimitive p) {
         return p.hasKey(ADDR_HOUSE_NUMBER) && p.hasKey(ADDR_STREET, ADDR_PLACE);
     }
@@ -136 +136 @@
             String simplifiedAddress = getSimplifiedAddress(p);
             if (!ignoredAddresses.contains(simplifiedAddress)) {
-                addresses.computeIfAbsent(simplifiedAddress, x -> new ArrayList<>()).add(p);
+                knownAddresses.computeIfAbsent(simplifiedAddress, x -> new ArrayList<>()).add(p);
             }
         }
@@ -142 +142 @@
 
     protected void initAddressMap(OsmPrimitive primitive) {
-        addresses = new HashMap<>();
+        knownAddresses = new HashMap<>();
         ignoredAddresses = new HashSet<>();
         for (OsmPrimitive p : primitive.getDataSet().allNonDeletedPrimitives()) {
@@ -153 +153 @@
                         if (!ignoredAddresses.contains(simplifiedAddress)) {
                             ignoredAddresses.add(simplifiedAddress);
-                        } else if (addresses.containsKey(simplifiedAddress)) {
-                            addresses.remove(simplifiedAddress);
+                        } else if (knownAddresses.containsKey(simplifiedAddress)) {
+                            knownAddresses.remove(simplifiedAddress);
                         }
                     }
@@ -167 +167 @@
     @Override
     public void endTest() {
-        addresses = null;
+        knownAddresses = null;
         ignoredAddresses = null;
         super.endTest();
@@ -173 +173 @@
 
     protected void checkForDuplicate(OsmPrimitive p) {
-        if (addresses == null) {
+        if (knownAddresses == null) {
             initAddressMap(p);
         }
@@ -181 +181 @@
                 return;
             }
-            if (addresses.containsKey(simplifiedAddress)) {
+            if (knownAddresses.containsKey(simplifiedAddress)) {
                 double maxDistance = MAX_DUPLICATE_DISTANCE.get();
-                for (OsmPrimitive p2 : addresses.get(simplifiedAddress)) {
+                for (OsmPrimitive p2 : knownAddresses.get(simplifiedAddress)) {
                     if (p == p2) {
                         continue;
                     }
-                    Severity severityLevel = Severity.WARNING;
+                    Severity severityLevel;
                     String city1 = p.get(ADDR_CITY);
                     String city2 = p2.get(ADDR_CITY);
@@ -227 +227 @@
                             .primitives(Arrays.asList(p, p2)).build());
                 }
-                addresses.get(simplifiedAddress).remove(p); // otherwise we would get every warning two times
+                knownAddresses.get(simplifiedAddress).remove(p); // otherwise we would get every warning two times
             }
         }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -198 +198 @@
      * Adds a new {@code HistoryHook}.
      * @param hook hook to add
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @return {@code true} (as specified by {@link Collection#add})
      * @since 13947
      */
@@ -208 +208 @@
      * Removes an existing {@code HistoryHook}.
      * @param hook hook to remove
-     * @return <tt>true</tt> if this list contained the specified element
+     * @return {@code true} if this list contained the specified element
      * @since 13947
      */

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -50 +50 @@
     private static ImageIcon loadIcon(String iconName) {
         return iconCache.computeIfAbsent(iconName,
-                x -> new ImageProvider(iconName).setOptional(true).setSize(ImageProvider.ImageSizes.SMALLICON).get());
+                x -> new ImageProvider(x).setOptional(true).setSize(ImageProvider.ImageSizes.SMALLICON).get());
     }