Refactor: removed useless parameter from StringReplacer.formatAndSplit

Author: cmaglie

arduino-core/src/cc/arduino/Compiler.java

@@ -405,7 +405,7 @@ private void runRecipe(String recipe, PreferencesMap prefs) throws RunnerExcepti
     String[] cmdArray;
     String cmd = prefs.getOrExcept(recipe);
     try {
-      cmdArray = StringReplacer.formatAndSplit(cmd, dict, true);
+      cmdArray = StringReplacer.formatAndSplit(cmd, dict);
     } catch (Exception e) {
       throw new RunnerException(e);
     }

arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java

@@ -95,7 +95,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       pattern = prefs.get("upload.network_pattern");
       if(pattern == null)
         pattern = prefs.getOrExcept("upload.pattern");
-      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs);
       uploadResult = executeUploadCommand(cmd);
     } catch (RunnerException e) {
       throw e;

arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java

@@ -165,7 +165,7 @@ private boolean runUploadTool(SSH ssh, PreferencesMap prefs) throws Exception {
     }
 
     String pattern = prefs.getOrExcept("upload.pattern");
-    String command = StringUtils.join(StringReplacer.formatAndSplit(pattern, prefs, true), " ");
+    String command = StringUtils.join(StringReplacer.formatAndSplit(pattern, prefs), " ");
     if (verbose) {
       System.out.println(command);
     }

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -108,7 +108,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       boolean uploadResult;
       try {
         String pattern = prefs.getOrExcept("upload.pattern");
-        String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+        String[] cmd = StringReplacer.formatAndSplit(pattern, prefs);
         uploadResult = executeUploadCommand(cmd);
       } catch (Exception e) {
         throw new RunnerException(e);
@@ -200,7 +200,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
     boolean uploadResult;
     try {
       String pattern = prefs.getOrExcept("upload.pattern");
-      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs);
       uploadResult = executeUploadCommand(cmd);
     } catch (RunnerException e) {
       throw e;
@@ -330,7 +330,7 @@ private boolean uploadUsingProgrammer(String buildPath, String className) throws
 
     try {
       String pattern = prefs.getOrExcept("program.pattern");
-      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+      String[] cmd = StringReplacer.formatAndSplit(pattern, prefs);
       return executeUploadCommand(cmd);
     } catch (RunnerException e) {
       throw e;
@@ -394,12 +394,12 @@ public boolean burnBootloader() throws Exception {
     new LoadVIDPIDSpecificPreferences().load(prefs);
 
     String pattern = prefs.getOrExcept("erase.pattern");
-    String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+    String[] cmd = StringReplacer.formatAndSplit(pattern, prefs);
     if (!executeUploadCommand(cmd))
       return false;
 
     pattern = prefs.getOrExcept("bootloader.pattern");
-    cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
+    cmd = StringReplacer.formatAndSplit(pattern, prefs);
     return executeUploadCommand(cmd);
   }
 }

arduino-core/src/processing/app/debug/Sizer.java

@@ -60,7 +60,7 @@ public long[] computeSize() throws RunnerException {
     int r = 0;
     try {
       String pattern = prefs.get("recipe.size.pattern");
-      String cmd[] = StringReplacer.formatAndSplit(pattern, prefs, true);
+      String cmd[] = StringReplacer.formatAndSplit(pattern, prefs);
 
       exception = null;
       textSize = -1;

arduino-core/src/processing/app/helpers/StringReplacer.java

@@ -27,16 +27,13 @@
 
 public class StringReplacer {
 
-  public static String[] formatAndSplit(String src, Map<String, String> dict,
-                                        boolean recursive) throws Exception {
+  public static String[] formatAndSplit(String src, Map<String, String> dict) throws Exception {
     String res;
 
     // Recursive replace with a max depth of 10 levels.
     for (int i = 0; i < 10; i++) {
       // Do a replace with dictionary
       res = StringReplacer.replaceFromMapping(src, dict);
-      if (!recursive)
-        break;
       if (res.equals(src))
         break;
       src = res;