rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-07 01:54:26 +01:00
Code Issues Releases Activity

Split UploaderAndMonitorFactory in two distinct classes.

Browse Source
This commit is contained in:
Claudio Indellicati 2014-08-25 12:13:45 +02:00 committed by Cristian Maglie
parent 0919b0e4fe
commit 83c61376e0
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/cc/arduino/packages/MonitorFactory.java Normal file
View File

@ -0,0 +1,17 @@
package cc.arduino.packages;
import processing.app.AbstractMonitor;
import processing.app.NetworkMonitor;
import processing.app.SerialMonitor;
public class MonitorFactory {
public AbstractMonitor newMonitor(BoardPort port) {
if ("network".equals(port.getProtocol())) {
return new NetworkMonitor(port);
}
return new SerialMonitor(port);
}
}

13
app/src/cc/arduino/packages/UploaderAndMonitorFactory.java → app/src/cc/arduino/packages/UploaderFactory.java
View File

@ -31,12 +31,9 @@ package cc.arduino.packages;
import cc.arduino.packages.uploaders.SSHUploader; import cc.arduino.packages.uploaders.SSHUploader;
import cc.arduino.packages.uploaders.SerialUploader; import cc.arduino.packages.uploaders.SerialUploader;
import processing.app.AbstractMonitor;
import processing.app.NetworkMonitor;
import processing.app.SerialMonitor;
import processing.app.debug.TargetBoard; import processing.app.debug.TargetBoard;
public class UploaderAndMonitorFactory { public class UploaderFactory {
public Uploader newUploader(TargetBoard board, BoardPort port) { public Uploader newUploader(TargetBoard board, BoardPort port) {
if ("true".equals(board.getPreferences().get("upload.via_ssh")) && port != null && "network".equals(port.getProtocol())) { if ("true".equals(board.getPreferences().get("upload.via_ssh")) && port != null && "network".equals(port.getProtocol())) {
@ -46,12 +43,4 @@ public class UploaderAndMonitorFactory {
return new SerialUploader(); return new SerialUploader();
} }
public AbstractMonitor newMonitor(BoardPort port) {
if ("network".equals(port.getProtocol())) {
return new NetworkMonitor(port);
}
return new SerialMonitor(port);
}
} }

4
app/src/processing/app/Editor.java
View File

@ -22,7 +22,7 @@
package processing.app; package processing.app;
import cc.arduino.packages.UploaderAndMonitorFactory; import cc.arduino.packages.MonitorFactory;
import com.jcraft.jsch.JSchException; import com.jcraft.jsch.JSchException;
@ -2518,7 +2518,7 @@ public class Editor extends JFrame implements RunnerListener {
return; return;
} }
serialMonitor = new UploaderAndMonitorFactory().newMonitor(port); serialMonitor = new MonitorFactory().newMonitor(port);
serialMonitor.setIconImage(getIconImage()); serialMonitor.setIconImage(getIconImage());
boolean success = false; boolean success = false;

4
app/src/processing/app/Sketch.java
View File

@ -24,7 +24,7 @@
package processing.app; package processing.app;
import cc.arduino.packages.BoardPort; import cc.arduino.packages.BoardPort;
import cc.arduino.packages.UploaderAndMonitorFactory; import cc.arduino.packages.UploaderFactory;
import cc.arduino.packages.Uploader; import cc.arduino.packages.Uploader;
import processing.app.debug.Compiler; import processing.app.debug.Compiler;
import processing.app.debug.Compiler.ProgressListener; import processing.app.debug.Compiler.ProgressListener;
@ -1198,7 +1198,7 @@ public class Sketch {
BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port")); BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort); Uploader uploader = new UploaderFactory().newUploader(target.getBoards().get(board), boardPort);
boolean success = false; boolean success = false;
do { do {

8
app/test/processing/app/debug/UploaderFactoryTest.java
View File

@ -2,7 +2,7 @@ package processing.app.debug;
import cc.arduino.packages.BoardPort; import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Uploader; import cc.arduino.packages.Uploader;
import cc.arduino.packages.UploaderAndMonitorFactory; import cc.arduino.packages.UploaderFactory;
import cc.arduino.packages.uploaders.SSHUploader; import cc.arduino.packages.uploaders.SSHUploader;
import cc.arduino.packages.uploaders.SerialUploader; import cc.arduino.packages.uploaders.SerialUploader;
import org.junit.Before; import org.junit.Before;
@ -29,7 +29,7 @@ public class UploaderFactoryTest extends AbstractWithPreferencesTest {
boardPort.setBoardName("yun"); boardPort.setBoardName("yun");
boardPort.setAddress("192.168.0.1"); boardPort.setAddress("192.168.0.1");
boardPort.setProtocol("network"); boardPort.setProtocol("network");
Uploader uploader = new UploaderAndMonitorFactory().newUploader(board, boardPort); Uploader uploader = new UploaderFactory().newUploader(board, boardPort);
assertTrue(uploader instanceof SSHUploader); assertTrue(uploader instanceof SSHUploader);
} }
@ -41,7 +41,7 @@ public class UploaderFactoryTest extends AbstractWithPreferencesTest {
boardPort.setBoardName("myyun"); boardPort.setBoardName("myyun");
boardPort.setAddress("192.168.0.1"); boardPort.setAddress("192.168.0.1");
boardPort.setProtocol("network"); boardPort.setProtocol("network");
Uploader uploader = new UploaderAndMonitorFactory().newUploader(board, boardPort); Uploader uploader = new UploaderFactory().newUploader(board, boardPort);
assertTrue(uploader instanceof SerialUploader); assertTrue(uploader instanceof SerialUploader);
} }
@ -53,7 +53,7 @@ public class UploaderFactoryTest extends AbstractWithPreferencesTest {
boardPort.setBoardName("Arduino Leonardo"); boardPort.setBoardName("Arduino Leonardo");
boardPort.setAddress("/dev/ttyACM0"); boardPort.setAddress("/dev/ttyACM0");
boardPort.setProtocol("serial"); boardPort.setProtocol("serial");
Uploader uploader = new UploaderAndMonitorFactory().newUploader(board, boardPort); Uploader uploader = new UploaderFactory().newUploader(board, boardPort);
assertTrue(uploader instanceof SerialUploader); assertTrue(uploader instanceof SerialUploader);
} }