Editor: fixed port ordering in tools menu

cmaglie · cmaglie · commit 2647ce36ea42 · 2018-11-14T17:41:34.000+01:00
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -1060,7 +1060,8 @@ private void populatePortMenu() {
     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());
+        return (BOARD_PROTOCOLS_ORDER.indexOf(o1.getProtocol()) - BOARD_PROTOCOLS_ORDER.indexOf(o2.getProtocol())) * 10 +
+               o1.getAddress().compareTo(o2.getAddress());
       }
     });
 

Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,8 @@ private void populatePortMenu() {`
`1060`	`1060`	`Collections.sort(ports, new Comparator<BoardPort>() {`
`1061`	`1061`	`@Override`
`1062`	`1062`	`public int compare(BoardPort o1, BoardPort o2) {`
`1063`		`- return BOARD_PROTOCOLS_ORDER.indexOf(o1.getProtocol()) - BOARD_PROTOCOLS_ORDER.indexOf(o2.getProtocol());`
	`1063`	`+ return (BOARD_PROTOCOLS_ORDER.indexOf(o1.getProtocol()) - BOARD_PROTOCOLS_ORDER.indexOf(o2.getProtocol())) * 10 +`
	`1064`	`+ o1.getAddress().compareTo(o2.getAddress());`
`1064`	`1065`	`}`
`1065`	`1066`	`});`
`1066`	`1067`