arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

wrong device name was saved in preferences.txt

Browse Source
This commit is contained in:
Federico Fissore
2013-02-04 16:18:48 +01:00
parent e650e20760
commit 218e5fc7d2
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,6 @@ public class Editor extends JFrame implements RunnerListener {
static List<JMenu> boardsMenus; static List<JMenu> boardsMenus;
static JMenu serialMenu; static JMenu serialMenu;
static SerialMenuListener serialMenuListener;
static SerialMonitor serialMonitor; static SerialMonitor serialMonitor;
EditorHeader header; EditorHeader header;
@ -709,8 +708,6 @@ public class Editor extends JFrame implements RunnerListener {
base.rebuildImportMenu(importMenu, this); base.rebuildImportMenu(importMenu, this);
} }
if (serialMenuListener == null)
serialMenuListener = new SerialMenuListener();
if (serialMenu == null) if (serialMenu == null)
serialMenu = new JMenu(_("Serial Port")); serialMenu = new JMenu(_("Serial Port"));
populateSerialMenu(); populateSerialMenu();
@ -927,25 +924,20 @@ public class Editor extends JFrame implements RunnerListener {
class SerialMenuListener implements ActionListener { class SerialMenuListener implements ActionListener {
//public SerialMenuListener() { }
private final String serialPort;
public SerialMenuListener(String serialPort) {
this.serialPort = serialPort;
}
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
selectSerialPort(((JCheckBoxMenuItem)e.getSource()).getText()); selectSerialPort(serialPort);
base.onBoardOrPortChange(); base.onBoardOrPortChange();
} }
/*
public void actionPerformed(ActionEvent e) {
System.out.println(e.getSource());
String name = e.getActionCommand();
PdeBase.properties.put("serial.port", name);
System.out.println("set to " + get("serial.port"));
//editor.skOpen(path + File.separator + name, name);
// need to push "serial.port" into PdeBase.properties
}
*/
} }
protected void selectSerialPort(String name) { protected void selectSerialPort(String name) {
if(serialMenu == null) { if(serialMenu == null) {
System.out.println(_("serialMenu is null")); System.out.println(_("serialMenu is null"));
@ -1010,7 +1002,7 @@ public class Editor extends JFrame implements RunnerListener {
description += " (" + additionalDescription + ")"; description += " (" + additionalDescription + ")";
} }
rbMenuItem = new JCheckBoxMenuItem(description, curr_port.equals(Preferences.get("serial.port"))); rbMenuItem = new JCheckBoxMenuItem(description, curr_port.equals(Preferences.get("serial.port")));
rbMenuItem.addActionListener(serialMenuListener); rbMenuItem.addActionListener(new SerialMenuListener(curr_port));
//serialGroup.add(rbMenuItem); //serialGroup.add(rbMenuItem);
serialMenu.add(rbMenuItem); serialMenu.add(rbMenuItem);
empty = false; empty = false;