@@ -134,7 +134,7 @@ public boolean apply(Sketch sketch) {
134
134
static JMenu examplesMenu ;
135
135
static JMenu importMenu ;
136
136
137
- private static JMenu serialMenu ;
137
+ private static JMenu portMenu ;
138
138
139
139
static AbstractMonitor serialMonitor ;
140
140
@@ -223,7 +223,7 @@ public void windowDeactivated(WindowEvent e) {
223
223
for (Component menuItem : toolsMenuItemsToRemove ) {
224
224
toolsMenu .remove (menuItem );
225
225
}
226
- toolsMenu .remove (serialMenu );
226
+ toolsMenu .remove (portMenu );
227
227
}
228
228
});
229
229
@@ -552,16 +552,16 @@ public void menuSelected(MenuEvent e) {
552
552
toolsMenu .addMenuListener (new StubMenuListener () {
553
553
@ Override
554
554
public void menuSelected (MenuEvent e ) {
555
- List <Component > components = Arrays .asList (fileMenu .getComponents ());
555
+ List <Component > components = Arrays .asList (toolsMenu .getComponents ());
556
556
int offset = 0 ;
557
557
for (JMenu menu : base .getBoardsCustomMenus ()) {
558
558
if (!components .contains (menu )) {
559
559
toolsMenu .insert (menu , numTools + offset );
560
560
offset ++;
561
561
}
562
562
}
563
- if (!components .contains (serialMenu )) {
564
- toolsMenu .insert (serialMenu , numTools + offset );
563
+ if (!components .contains (portMenu )) {
564
+ toolsMenu .insert (portMenu , numTools + offset );
565
565
}
566
566
toolsMenu .revalidate ();
567
567
validate ();
@@ -780,11 +780,7 @@ private JMenu buildToolsMenu() {
780
780
addInternalTools (toolsMenu );
781
781
782
782
JMenuItem item = newJMenuItemShift (_ ("Serial Monitor" ), 'M' );
783
- item .addActionListener (new ActionListener () {
784
- public void actionPerformed (ActionEvent e ) {
785
- handleSerial ();
786
- }
787
- });
783
+ item .addActionListener (e -> handleSerial ());
788
784
toolsMenu .add (item );
789
785
790
786
addTools (toolsMenu , BaseNoGui .getToolsFolder ());
@@ -798,26 +794,20 @@ public void actionPerformed(ActionEvent e) {
798
794
// XXX: DAM: these should probably be implemented using the Tools plugin
799
795
// API, if possible (i.e. if it supports custom actions, etc.)
800
796
801
- for (JMenu menu : base .getBoardsCustomMenus ()) {
802
- toolsMenu .add (menu );
803
- }
797
+ base .getBoardsCustomMenus ().stream ().forEach (toolsMenu ::add );
804
798
805
- if (serialMenu == null )
806
- serialMenu = new JMenu (_ ("Port" ));
799
+ if (portMenu == null )
800
+ portMenu = new JMenu (_ ("Port" ));
807
801
populatePortMenu ();
808
- toolsMenu .add (serialMenu );
802
+ toolsMenu .add (portMenu );
809
803
toolsMenu .addSeparator ();
810
804
811
805
JMenu programmerMenu = new JMenu (_ ("Programmer" ));
812
806
base .rebuildProgrammerMenu (programmerMenu );
813
807
toolsMenu .add (programmerMenu );
814
808
815
809
item = new JMenuItem (_ ("Burn Bootloader" ));
816
- item .addActionListener (new ActionListener () {
817
- public void actionPerformed (ActionEvent e ) {
818
- handleBurnBootloader ();
819
- }
820
- });
810
+ item .addActionListener (e -> handleBurnBootloader ());
821
811
toolsMenu .add (item );
822
812
823
813
toolsMenu .addMenuListener (new StubMenuListener () {
@@ -1098,7 +1088,7 @@ public void actionPerformed(ActionEvent e) {
1098
1088
}
1099
1089
1100
1090
private void selectSerialPort (String name ) {
1101
- if (serialMenu == null ) {
1091
+ if (portMenu == null ) {
1102
1092
System .out .println (_ ("serialMenu is null" ));
1103
1093
return ;
1104
1094
}
@@ -1107,8 +1097,8 @@ private void selectSerialPort(String name) {
1107
1097
return ;
1108
1098
}
1109
1099
JCheckBoxMenuItem selection = null ;
1110
- for (int i = 0 ; i < serialMenu .getItemCount (); i ++) {
1111
- JMenuItem menuItem = serialMenu .getItem (i );
1100
+ for (int i = 0 ; i < portMenu .getItemCount (); i ++) {
1101
+ JMenuItem menuItem = portMenu .getItem (i );
1112
1102
if (!(menuItem instanceof JCheckBoxMenuItem )) {
1113
1103
continue ;
1114
1104
}
@@ -1135,7 +1125,7 @@ private void selectSerialPort(String name) {
1135
1125
1136
1126
1137
1127
private void populatePortMenu () {
1138
- serialMenu .removeAll ();
1128
+ portMenu .removeAll ();
1139
1129
1140
1130
String selectedPort = PreferencesData .get ("serial.port" );
1141
1131
@@ -1155,7 +1145,7 @@ public int compare(BoardPort o1, BoardPort o2) {
1155
1145
for (BoardPort port : ports ) {
1156
1146
if (lastProtocol == null || !port .getProtocol ().equals (lastProtocol )) {
1157
1147
if (lastProtocol != null ) {
1158
- serialMenu .addSeparator ();
1148
+ portMenu .addSeparator ();
1159
1149
}
1160
1150
lastProtocol = port .getProtocol ();
1161
1151
@@ -1166,17 +1156,17 @@ public int compare(BoardPort o1, BoardPort o2) {
1166
1156
}
1167
1157
JMenuItem lastProtocolMenuItem = new JMenuItem (_ (lastProtocolTranslated ));
1168
1158
lastProtocolMenuItem .setEnabled (false );
1169
- serialMenu .add (lastProtocolMenuItem );
1159
+ portMenu .add (lastProtocolMenuItem );
1170
1160
}
1171
1161
String address = port .getAddress ();
1172
1162
String label = port .getLabel ();
1173
1163
1174
1164
JCheckBoxMenuItem item = new JCheckBoxMenuItem (label , address .equals (selectedPort ));
1175
1165
item .addActionListener (new SerialMenuListener (address ));
1176
- serialMenu .add (item );
1166
+ portMenu .add (item );
1177
1167
}
1178
1168
1179
- serialMenu .setEnabled (serialMenu .getMenuComponentCount () > 0 );
1169
+ portMenu .setEnabled (portMenu .getMenuComponentCount () > 0 );
1180
1170
}
1181
1171
1182
1172
@@ -2320,10 +2310,10 @@ public boolean handleSaveAs() {
2320
2310
2321
2311
2322
2312
private boolean serialPrompt () {
2323
- int count = serialMenu .getItemCount ();
2313
+ int count = portMenu .getItemCount ();
2324
2314
Object [] names = new Object [count ];
2325
2315
for (int i = 0 ; i < count ; i ++) {
2326
- names [i ] = serialMenu .getItem (i ).getText ();
2316
+ names [i ] = portMenu .getItem (i ).getText ();
2327
2317
}
2328
2318
2329
2319
String result = (String )
@@ -2390,7 +2380,7 @@ public void run() {
2390
2380
statusNotice (_ ("Done uploading." ));
2391
2381
}
2392
2382
} catch (SerialNotFoundException e ) {
2393
- if (serialMenu .getItemCount () == 0 ) statusError (e );
2383
+ if (portMenu .getItemCount () == 0 ) statusError (e );
2394
2384
else if (serialPrompt ()) run ();
2395
2385
else statusNotice (_ ("Upload canceled." ));
2396
2386
} catch (PreferencesMapException e ) {
@@ -2460,7 +2450,7 @@ public void run() {
2460
2450
statusNotice (_ ("Done uploading." ));
2461
2451
}
2462
2452
} catch (SerialNotFoundException e ) {
2463
- if (serialMenu .getItemCount () == 0 ) statusError (e );
2453
+ if (portMenu .getItemCount () == 0 ) statusError (e );
2464
2454
else if (serialPrompt ()) run ();
2465
2455
else statusNotice (_ ("Upload canceled." ));
2466
2456
} catch (PreferencesMapException e ) {
0 commit comments