noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UploadFactory: removed duplication

This commit is contained in:
Federico Fissore 2015-06-01 09:55:12 +02:00
parent 0b8e7922bf
commit 740a14e638
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -135,15 +135,12 @@ public class Compiler implements MessageConsumer {
TargetPlatform target = BaseNoGui.getTargetPlatform(); TargetPlatform target = BaseNoGui.getTargetPlatform();
String board = PreferencesData.get("board"); String board = PreferencesData.get("board");
if (noUploadPort) BoardPort boardPort = null;
{ if (!noUploadPort) {
return new UploaderFactory().newUploader(target.getBoards().get(board), null, noUploadPort); boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
}
else
{
BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);
} }
return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);
} }
static public boolean upload(SketchData data, Uploader uploader, String buildPath, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception { static public boolean upload(SketchData data, Uploader uploader, String buildPath, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception {