Removed dependency from Base in the uploaders.

Author: bitron

app/src/cc/arduino/packages/uploaders/SSHUploader.java

@@ -35,7 +35,7 @@
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
-import processing.app.Base;
+import processing.app.BaseNoGui;
 import processing.app.I18n;
 import processing.app.Preferences;
 import processing.app.debug.RunnerException;
@@ -117,9 +117,9 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
   }
 
   private boolean runAVRDude(SSH ssh) throws IOException, JSchException {
-    TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
     PreferencesMap prefs = Preferences.getMap();
-    prefs.putAll(Base.getBoardPreferences());
+    prefs.putAll(BaseNoGui.getBoardPreferences());
     prefs.putAll(targetPlatform.getTool(prefs.get("upload.tool")));
 
     String additionalParams = verbose ? prefs.get("upload.params.verbose") : prefs.get("upload.params.quiet");

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -32,7 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import processing.app.Base;
+import processing.app.BaseNoGui;
 import processing.app.I18n;
 import processing.app.Preferences;
 import processing.app.Serial;
@@ -48,13 +48,13 @@ public class SerialUploader extends Uploader {
 
   public boolean uploadUsingPreferences(File sourcePath, String buildPath, String className, boolean usingProgrammer, List<String> warningsAccumulator) throws Exception {
     // FIXME: Preferences should be reorganized
-    TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
     PreferencesMap prefs = Preferences.getMap();
-    prefs.putAll(Base.getBoardPreferences());
+    prefs.putAll(BaseNoGui.getBoardPreferences());
     String tool = prefs.getOrExcept("upload.tool");
     if (tool.contains(":")) {
       String[] split = tool.split(":", 2);
-      targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      targetPlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
       tool = split[1];
     }
     prefs.putAll(targetPlatform.getTool(tool));
@@ -202,16 +202,16 @@ private String waitForUploadPort(String uploadPort, List<String> before) throws
 
   public boolean uploadUsingProgrammer(String buildPath, String className) throws Exception {
 
-    TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
     String programmer = Preferences.get("programmer");
     if (programmer.contains(":")) {
       String[] split = programmer.split(":", 2);
-      targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      targetPlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
       programmer = split[1];
     }
 
     PreferencesMap prefs = Preferences.getMap();
-    prefs.putAll(Base.getBoardPreferences());
+    prefs.putAll(BaseNoGui.getBoardPreferences());
     PreferencesMap programmerPrefs = targetPlatform.getProgrammer(programmer);
     if (programmerPrefs == null)
       throw new RunnerException(
@@ -245,14 +245,14 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws
   }
 
   public boolean burnBootloader() throws Exception {
-    TargetPlatform targetPlatform = Base.getTargetPlatform();
+    TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
 
     // Find preferences for the selected programmer
     PreferencesMap programmerPrefs;
     String programmer = Preferences.get("programmer");
     if (programmer.contains(":")) {
       String[] split = programmer.split(":", 2);
-      TargetPlatform platform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      TargetPlatform platform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
       programmer = split[1];
       programmerPrefs = platform.getProgrammer(programmer);
     } else {
@@ -264,15 +264,15 @@ public boolean burnBootloader() throws Exception {
 
     // Build configuration for the current programmer
     PreferencesMap prefs = Preferences.getMap();
-    prefs.putAll(Base.getBoardPreferences());
+    prefs.putAll(BaseNoGui.getBoardPreferences());
     prefs.putAll(programmerPrefs);
 
     // Create configuration for bootloader tool
     PreferencesMap toolPrefs = new PreferencesMap();
     String tool = prefs.getOrExcept("bootloader.tool");
     if (tool.contains(":")) {
       String[] split = tool.split(":", 2);
-      TargetPlatform platform = Base.getCurrentTargetPlatformFromPackage(split[0]);
+      TargetPlatform platform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
       tool = split[1];
       toolPrefs.putAll(platform.getTool(tool));
       if (toolPrefs.size() == 0)

app/src/processing/app/Base.java

@@ -2008,7 +2008,7 @@ static public TargetPlatform getTargetPlatform(String packageName,
   }
 
   static public TargetPlatform getCurrentTargetPlatformFromPackage(String pack) {
-    return getTargetPlatform(pack, Preferences.get("target_platform"));
+    return BaseNoGui.getCurrentTargetPlatformFromPackage(pack);
   }
 
   static public PreferencesMap getBoardPreferences() {

app/src/processing/app/BaseNoGui.java

@@ -107,6 +107,10 @@ static public File getContentFile(String name) {
     return new File(working, name);
   }
 
+  static public TargetPlatform getCurrentTargetPlatformFromPackage(String pack) {
+    return getTargetPlatform(pack, Preferences.get("target_platform"));
+  }
+
   static public File getHardwareFolder() {
     // calculate on the fly because it's needed by Preferences.init() to find
     // the boards.txt and programmers.txt preferences files (which happens