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

Using static import to reduce code bloat in Serial.java

Browse Source
This commit is contained in:
Cristian Maglie 2015-06-25 12:50:40 +02:00
parent 1f175e9f1a
commit c08d4fde5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arduino-core/src/processing/app/Serial.java
View File

@ -32,7 +32,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import static processing.app.I18n._; import static processing.app.I18n._;
import static processing.app.I18n.format;
public class Serial implements SerialPortEventListener { public class Serial implements SerialPortEventListener {
@ -84,7 +84,7 @@ public class Serial implements SerialPortEventListener {
serialPort.closePort(); serialPort.closePort();
return true; return true;
} catch (SerialPortException e) { } catch (SerialPortException e) {
throw new SerialException(I18n.format(_("Error touching serial port ''{0}''."), iname), e); throw new SerialException(format(_("Error touching serial port ''{0}''."), iname), e);
} finally { } finally {
if (serialPort.isOpened()) { if (serialPort.isOpened()) {
try { try {
@ -116,13 +116,13 @@ public class Serial implements SerialPortEventListener {
port.addEventListener(this); port.addEventListener(this);
} catch (SerialPortException e) { } catch (SerialPortException e) {
if (e.getPortName().startsWith("/dev") && SerialPortException.TYPE_PERMISSION_DENIED.equals(e.getExceptionType())) { if (e.getPortName().startsWith("/dev") && SerialPortException.TYPE_PERMISSION_DENIED.equals(e.getExceptionType())) {
throw new SerialException(I18n.format(_("Error opening serial port ''{0}''. Try consulting the documentation at http://playground.arduino.cc/Linux/All#Permission"), iname)); throw new SerialException(format(_("Error opening serial port ''{0}''. Try consulting the documentation at http://playground.arduino.cc/Linux/All#Permission"), iname));
} }
throw new SerialException(I18n.format(_("Error opening serial port ''{0}''."), iname), e); throw new SerialException(format(_("Error opening serial port ''{0}''."), iname), e);
} }
if (port == null) { if (port == null) {
throw new SerialNotFoundException(I18n.format(_("Serial port ''{0}'' not found. Did you select the right one from the Tools > Serial Port menu?"), iname)); throw new SerialNotFoundException(format(_("Serial port ''{0}'' not found. Did you select the right one from the Tools > Serial Port menu?"), iname));
} }
} }
@ -231,7 +231,7 @@ public class Serial implements SerialPortEventListener {
* I think of something slightly more intelligent to do. * I think of something slightly more intelligent to do.
*/ */
private static void errorMessage(String where, Throwable e) { private static void errorMessage(String where, Throwable e) {
System.err.println(I18n.format(_("Error inside Serial.{0}()"), where)); System.err.println(format(_("Error inside Serial.{0}()"), where));
e.printStackTrace(); e.printStackTrace();
} }
} }