From 197d3e662049ff888cfc8abb63d3d58f9967eac5 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Sun, 29 Nov 2015 16:57:35 -0800
Subject: [PATCH] Factor out addAll(String[], List<String>).

---
 .../threerings/getdown/data/Application.java  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java
index c8422f0..d53dd2e 100644
--- a/src/main/java/com/threerings/getdown/data/Application.java
+++ b/src/main/java/com/threerings/getdown/data/Application.java
@@ -624,32 +624,20 @@ public class Application
 
         // transfer our JVM arguments
         String[] jvmargs = ConfigUtil.getMultiValue(cdata, "jvmarg");
-        if (jvmargs != null) {
-            for (String jvmarg : jvmargs) {
-                _jvmargs.add(jvmarg);
-            }
-        }
+        addAll(jvmargs, _jvmargs);
 
         // Add the launch specific JVM arguments
-        for (String arg : _extraJvmArgs) {
-            _jvmargs.add(arg);
-        }
+        addAll(_extraJvmArgs, _jvmargs);
 
         // get the set of optimum JVM arguments
         _optimumJvmArgs = ConfigUtil.getMultiValue(cdata, "optimum_jvmarg");
 
         // transfer our application arguments
         String[] appargs = ConfigUtil.getMultiValue(cdata, prefix + "apparg");
-        if (appargs != null) {
-            for (String apparg : appargs) {
-                _appargs.add(apparg);
-            }
-        }
+        addAll(appargs, _appargs);
 
         // add the launch specific application arguments
-        for (String arg : _extraAppArgs) {
-            _appargs.add(arg);
-        }
+        addAll(_extraAppArgs, _appargs);
 
         // look for custom arguments
         fillAssignmentListFromPairs("extra.txt", _txtJvmArgs);
@@ -1568,6 +1556,15 @@ public class Application
         return (rect == null) ? def : rect;
     }
 
+    /** Helper function to add all values in {@code values} (if non-null) to {@code target}. */
+    protected static void addAll (String[] values, List<String> target) {
+        if (values != null) {
+            for (String value : values) {
+                target.add(value);
+            }
+        }
+    }
+
     /**
      * Make an immutable List from the specified int array.
      */