From 6415fa12dcec2d27b32625faeace7773ba518e50 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 20 Feb 2019 22:08:37 -0500 Subject: [PATCH] addAll() --- core/src/main/java/hudson/Main.java | 4 ++-- core/src/main/java/hudson/model/AperiodicWork.java | 4 +--- core/src/main/java/hudson/model/PeriodicWork.java | 4 +--- .../java/jenkins/model/lazy/BuildReferenceMapAdapter.java | 6 ++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java index 55ee2fb9f0..14ae9ee38f 100644 --- a/core/src/main/java/hudson/Main.java +++ b/core/src/main/java/hudson/Main.java @@ -42,6 +42,7 @@ import java.net.HttpRetryException; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.nio.charset.Charset; @@ -153,8 +154,7 @@ public class Main { long start = System.currentTimeMillis(); List cmd = new ArrayList<>(); - for( int i=1; i registered = new HashSet<>(); AperiodicWorkExtensionListListener(ExtensionList initiallyRegistered) { - for (AperiodicWork p : initiallyRegistered) { - registered.add(p); - } + registered.addAll(initiallyRegistered); } @Override diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java index 1079553551..b085a7bc41 100644 --- a/core/src/main/java/hudson/model/PeriodicWork.java +++ b/core/src/main/java/hudson/model/PeriodicWork.java @@ -129,9 +129,7 @@ public abstract class PeriodicWork extends SafeTimerTask implements ExtensionPoi private final Set registered = new HashSet<>(); PeriodicWorkExtensionListListener(ExtensionList initiallyRegistered) { - for (PeriodicWork p : initiallyRegistered) { - registered.add(p); - } + registered.addAll(initiallyRegistered); } @Override diff --git a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java index 8c2cd0167e..9ae3dce28b 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java @@ -170,8 +170,7 @@ class BuildReferenceMapAdapter implements SortedMap { public Object[] toArray() { List list = new ArrayList<>(); - for (R r : this) - list.add(r); + list.addAll(this); return list.toArray(); } @@ -275,8 +274,7 @@ class BuildReferenceMapAdapter implements SortedMap { public Object[] toArray() { List list = new ArrayList<>(); - for (Entry r : this) - list.add(r); + list.addAll(this); return list.toArray(); }