Changeset 16622 in josm

Timestamp:

2020-06-14T14:55:14+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/UnnecessaryLambda

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (modified) (5 diffs)

trunk/build.xml

@@ -302 +302 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF -Xep:StaticAssignmentInConstructor:OFF"/>
+            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:BadImport:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF -Xep:StaticAssignmentInConstructor:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <classpath>

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

@@ -29 +29 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -184 +183 @@
     protected final SortedMap<String, Setting<?>> defaultsMap = new TreeMap<>();
 
-    private final Predicate<Entry<String, Setting<?>>> NO_DEFAULT_SETTINGS_ENTRY =
-            e -> !e.getValue().equals(defaultsMap.get(e.getKey()));
-
     /**
      * Indicates whether {@link #init(boolean)} completed successfully.
@@ -420 +416 @@
      */
     public synchronized void save() throws IOException {
-        save(getPreferenceFile(), settingsMap.entrySet().stream().filter(NO_DEFAULT_SETTINGS_ENTRY), false);
+        save(getPreferenceFile(), settingsMap.entrySet().stream().filter(e -> !e.getValue().equals(defaultsMap.get(e.getKey()))), false);
     }
 

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

@@ -16 +16 @@
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 import javax.swing.JOptionPane;
@@ -42 +41 @@
 public final class HistoryBrowserDialogManager implements LayerChangeListener {
 
-    static final class UnloadedHistoryPredicate implements Predicate<PrimitiveId> {
-        private final HistoryDataSet hds = HistoryDataSet.getInstance();
-
-        @Override
-        public boolean test(PrimitiveId p) {
-            History h = hds.getHistory(p);
-            if (h == null)
-                // reload if the history is not in the cache yet
-                return true;
-            else
-                // reload if the history object of the selected object is not in the cache yet
-                return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
-        }
+    private static boolean isUnloaded(PrimitiveId p) {
+        History h = HistoryDataSet.getInstance().getHistory(p);
+        if (h == null)
+            // reload if the history is not in the cache yet
+            return true;
+        else
+            // reload if the history object of the selected object is not in the cache yet
+            return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
     }
 
@@ -62 +56 @@
 
     private final LinkedHashMap<Long, HistoryBrowserDialog> dialogs = new LinkedHashMap<>();
-
-    private final Predicate<PrimitiveId> unloadedHistoryPredicate = new UnloadedHistoryPredicate();
-
-    private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
 
     private static final List<HistoryHook> hooks = new ArrayList<>();
@@ -217 +207 @@
         final List<PrimitiveId> realPrimitives = new ArrayList<>(primitives);
         hooks.forEach(h -> h.modifyRequestedIds(realPrimitives));
-        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(realPrimitives, notNewPredicate);
+        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(realPrimitives, p1 -> !p1.isNew());
         if (notNewPrimitives.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -237 +227 @@
         }
 
-        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(notNewPrimitives, unloadedHistoryPredicate);
+        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(notNewPrimitives, HistoryBrowserDialogManager::isUnloaded);
         if (!toLoad.isEmpty()) {
             MainApplication.worker.submit(new HistoryLoadTask(parent).addPrimitiveIds(toLoad));