From 7adeef1ee37811b91b8bcc9bc76ae3a7b6cfa6f3 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 9 Nov 2018 12:39:37 +0100
Subject: [PATCH] Refactor: simplified TargetBoard retrieve

---
 arduino-core/src/cc/arduino/UploaderUtils.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arduino-core/src/cc/arduino/UploaderUtils.java b/arduino-core/src/cc/arduino/UploaderUtils.java
index 108d7c137..9987354a3 100644
--- a/arduino-core/src/cc/arduino/UploaderUtils.java
+++ b/arduino-core/src/cc/arduino/UploaderUtils.java
@@ -35,7 +35,7 @@ import cc.arduino.packages.UploaderFactory;
 import processing.app.BaseNoGui;
 import processing.app.PreferencesData;
 import processing.app.Sketch;
-import processing.app.debug.TargetPlatform;
+import processing.app.debug.TargetBoard;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -45,9 +45,6 @@ import static processing.app.I18n.tr;
 public class UploaderUtils {
 
   public Uploader getUploaderByPreferences(boolean noUploadPort) {
-    TargetPlatform target = BaseNoGui.getTargetPlatform();
-    String board = PreferencesData.get("board");
-
     BoardPort boardPort = null;
     if (!noUploadPort) {
       String port = PreferencesData.get("serial.port");
@@ -57,7 +54,8 @@ public class UploaderUtils {
       boardPort = BaseNoGui.getDiscoveryManager().find(port);
     }
 
-    return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);
+    TargetBoard board = BaseNoGui.getTargetBoard();
+    return new UploaderFactory().newUploader(board, boardPort, noUploadPort);
   }
 
   public boolean upload(Sketch data, Uploader uploader, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception {