From c0ab536b7b028b25112f4e50976b84e2374501bf Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Mon, 7 Apr 2014 10:11:57 +0200 Subject: [PATCH] Add Base.selectSerialPort This method takes care of setting the serial.port preference to the given value, as well as deriving the serial.port.file preference. This should prevent duplicate code in the future. Note that a second copy of this code lives in SerialUploader, but that doesn't write to the global Preferences but a local prefs map. Since the global Preferences are currently static, there is no way to share code between these two copies. --- app/src/processing/app/Base.java | 7 +++++++ app/src/processing/app/Editor.java | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 016bd2b1f..48a98e3a2 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1600,6 +1600,13 @@ public class Base { rebuildExamplesMenu(Editor.examplesMenu); } + public static void selectSerialPort(String port) { + Preferences.set("serial.port", port); + if (port.startsWith("/dev/")) + Preferences.set("serial.port.file", port.substring(5)); + else + Preferences.set("serial.port.file", port); + } public void rebuildProgrammerMenu(JMenu menu) { menu.removeAll(); diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 2138974d3..3f2f7c601 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -965,11 +965,7 @@ public class Editor extends JFrame implements RunnerListener { } if (selection != null) selection.setState(true); //System.out.println(item.getLabel()); - Preferences.set("serial.port", name); - if (name.startsWith("/dev/")) - Preferences.set("serial.port.file", name.substring(5)); - else - Preferences.set("serial.port.file", name); + Base.selectSerialPort(name); if (serialMonitor != null) { try { serialMonitor.close();