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

Split ports in menu, grouping boards by their protocol 

Closes #2627
This commit is contained in:
Federico Fissore 2015-02-11 13:08:20 +01:00
parent 5128a062d8
commit fea3848ee0
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,9 @@ import cc.arduino.packages.uploaders.SerialUploader;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class Editor extends JFrame implements RunnerListener { public class Editor extends JFrame implements RunnerListener {
private final static List<String> BOARD_PROTOCOLS_ORDER = Arrays.asList(new String[]{"serial", "network"});
private final static List<String> BOARD_PROTOCOLS_ORDER_TRANSLATIONS = Arrays.asList(new String[]{_("Serial ports"), _("Network ports")});
Base base; Base base;
// otherwise, if the window is resized with the message label // otherwise, if the window is resized with the message label
@ -441,7 +444,7 @@ public class Editor extends JFrame implements RunnerListener {
textarea.setEditable(!external); textarea.setEditable(!external);
saveMenuItem.setEnabled(!external); saveMenuItem.setEnabled(!external);
saveAsMenuItem.setEnabled(!external); saveAsMenuItem.setEnabled(!external);
textarea.setDisplayLineNumbers(Preferences.getBoolean("editor.linenumbers")); textarea.setDisplayLineNumbers(Preferences.getBoolean("editor.linenumbers"));
TextAreaPainter painter = textarea.getPainter(); TextAreaPainter painter = textarea.getPainter();
@ -996,7 +999,30 @@ public class Editor extends JFrame implements RunnerListener {
String selectedPort = Preferences.get("serial.port"); String selectedPort = Preferences.get("serial.port");
List<BoardPort> ports = Base.getDiscoveryManager().discovery(); List<BoardPort> ports = Base.getDiscoveryManager().discovery();
Collections.sort(ports, new Comparator<BoardPort>() {
@Override
public int compare(BoardPort o1, BoardPort o2) {
return BOARD_PROTOCOLS_ORDER.indexOf(o1.getProtocol()) - BOARD_PROTOCOLS_ORDER.indexOf(o2.getProtocol());
}
});
String lastProtocol = null;
String lastProtocolTranslated;
for (BoardPort port : ports) { for (BoardPort port : ports) {
if (lastProtocol == null || !port.getProtocol().equals(lastProtocol)) {
if (lastProtocol != null) {
serialMenu.addSeparator();
}
lastProtocol = port.getProtocol();
if (BOARD_PROTOCOLS_ORDER.indexOf(port.getProtocol()) != -1) {
lastProtocolTranslated = BOARD_PROTOCOLS_ORDER_TRANSLATIONS.get(BOARD_PROTOCOLS_ORDER.indexOf(port.getProtocol()));
} else {
lastProtocolTranslated = port.getProtocol();
}
serialMenu.add(new JMenuItem(_(lastProtocolTranslated)));
}
String address = port.getAddress(); String address = port.getAddress();
String label = port.getLabel(); String label = port.getLabel();
@ -1646,7 +1672,7 @@ public class Editor extends JFrame implements RunnerListener {
if (document == null) { // this document not yet inited if (document == null) { // this document not yet inited
document = new SyntaxDocument(); document = new SyntaxDocument();
codeDoc.setDocument(document); codeDoc.setDocument(document);
// turn on syntax highlighting // turn on syntax highlighting
document.setTokenMarker(new PdeKeywords()); document.setTokenMarker(new PdeKeywords());
@ -1870,7 +1896,7 @@ public class Editor extends JFrame implements RunnerListener {
} catch (BadLocationException bl) { } catch (BadLocationException bl) {
bl.printStackTrace(); bl.printStackTrace();
} }
return text; return text;
} }