Skip to content

Commit b8aeea3

Browse files
cmagliecmaglie
authored
Merge pull request #57 from arduino/rp2040
Fixed all warnings / added support for Arduino Nano RP2040 Connect
2 parents 09070b8 + 245dfd7 commit b8aeea3

12 files changed

+93
-120
lines changed

‎firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin

1.08 MB
Binary file not shown.

‎firmwares/NINA/1.4.5/NINA_W102-Uno_WiFi_Rev2.bin

1.08 MB
Binary file not shown.

‎firmwares/NINA/1.4.5/NINA_W102.bin

1.08 MB
Binary file not shown.

‎src/cc/arduino/plugins/wifi101/SerialPortListModel.java

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
package cc.arduino.plugins.wifi101;
2929

3030
import java.util.List;
31-
import java.util.Map;
32-
import java.util.HashMap;
3331

3432
import javax.swing.ListModel;
3533
import javax.swing.event.ListDataListener;

‎src/cc/arduino/plugins/wifi101/UpdaterImpl.java

+39-41
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,18 @@
2727
*/
2828
package cc.arduino.plugins.wifi101;
2929

30-
import java.io.File;
31-
import java.net.URISyntaxException;
32-
import java.util.ArrayList;
33-
import java.util.HashMap;
34-
import java.util.List;
35-
3630
import static java.util.Arrays.asList;
3731

38-
import java.io.IOException;
39-
import java.io.InputStream;
40-
import java.net.URISyntaxException;
32+
import java.util.ArrayList;
33+
import java.util.List;
4134

4235
import javax.swing.DefaultListModel;
4336
import javax.swing.JOptionPane;
4437

4538
import cc.arduino.packages.BoardPort;
4639
import cc.arduino.plugins.wifi101.flashers.Flasher;
47-
import cc.arduino.plugins.wifi101.flashers.java.WINCFlasher;
4840
import cc.arduino.plugins.wifi101.flashers.java.NinaFlasher;
41+
import cc.arduino.plugins.wifi101.flashers.java.WINCFlasher;
4942
import processing.app.Base;
5043

5144
@SuppressWarnings("serial")
@@ -55,7 +48,7 @@ public class UpdaterImpl extends UpdaterJFrame {
5548

5649
public ArrayList<String> compatibleBoard;
5750

58-
public static ArrayList<Flasher> fwAvailable = new ArrayList<Flasher>();
51+
public static ArrayList<Flasher> fwAvailable = new ArrayList<>();
5952

6053
public UpdaterImpl() throws Exception {
6154
super();
@@ -64,33 +57,36 @@ public UpdaterImpl() throws Exception {
6457
});
6558
Base.setIcon(this);
6659

67-
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.6.1", "firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin", true, 1000000, new ArrayList<String>(asList("Arduino/Genuino MKR1000"))));
68-
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.5.4", "firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin", true, 1000000, new ArrayList<String>(asList("Arduino/Genuino MKR1000"))));
69-
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.5.2", "firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin", true, 1000000, new ArrayList<String>(asList("Arduino/Genuino MKR1000"))));
70-
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.4.4", "firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin", true, 1000000, new ArrayList<String>(asList("Arduino/Genuino MKR1000"))));
71-
fwAvailable.add(new WINCFlasher("WINC1501 Model A", "19.4.4", "firmwares/WINC1500/19.4.4/m2m_aio_2b0.bin", true, 115200, new ArrayList<String>(asList("Arduino WiFi 101 Shield"))));
72-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.4", "firmwares/NINA/1.4.4/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
73-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.4", "firmwares/NINA/1.4.4/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
74-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.3", "firmwares/NINA/1.4.3/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
75-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.3", "firmwares/NINA/1.4.3/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
76-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.2", "firmwares/NINA/1.4.2/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
77-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.2", "firmwares/NINA/1.4.2/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
78-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.1", "firmwares/NINA/1.4.1/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
79-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.1", "firmwares/NINA/1.4.1/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
80-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.0", "firmwares/NINA/1.4.0/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
81-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.0", "firmwares/NINA/1.4.0/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
82-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.3.0", "firmwares/NINA/1.3.0/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
83-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.3.0", "firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
84-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.4", "firmwares/NINA/1.2.4/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT"))));
85-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.4", "firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
86-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.3", "firmwares/NINA/1.2.3/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010"))));
87-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.3", "firmwares/NINA/1.2.3/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
88-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.2", "firmwares/NINA/1.2.2/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010"))));
89-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.2", "firmwares/NINA/1.2.2/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
90-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.1", "firmwares/NINA/1.2.1/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010"))));
91-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.1", "firmwares/NINA/1.2.1/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, new ArrayList<String>(asList("Arduino Uno WiFi Rev2"))));
92-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.1.0", "firmwares/NINA/1.1.0/NINA_W102.bin", true, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino MKR Vidor 4000", "Arduino Uno WiFi Rev2"))));
93-
fwAvailable.add(new NinaFlasher("NINA firmware", "1.0.0", "firmwares/NINA/1.0.0/NINA_W102.bin", false, 1000000, new ArrayList<String>(asList("Arduino MKR WiFi 1010", "Arduino MKR Vidor 4000", "Arduino Uno WiFi Rev2"))));
60+
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.6.1", "firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin", true, 1000000, asList("Arduino/Genuino MKR1000")));
61+
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.5.4", "firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin", true, 1000000, asList("Arduino/Genuino MKR1000")));
62+
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.5.2", "firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin", true, 1000000, asList("Arduino/Genuino MKR1000")));
63+
fwAvailable.add(new WINCFlasher("WINC1501 Model B", "19.4.4", "firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin", true, 1000000, asList("Arduino/Genuino MKR1000")));
64+
fwAvailable.add(new WINCFlasher("WINC1501 Model A", "19.4.4", "firmwares/WINC1500/19.4.4/m2m_aio_2b0.bin", true, 115200, asList("Arduino WiFi 101 Shield")));
65+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.5", "firmwares/NINA/1.4.5/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
66+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.5", "firmwares/NINA/1.4.5/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
67+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.5", "firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin", true, 1000000, asList("Arduino Nano RP2040 Connect")));
68+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.4", "firmwares/NINA/1.4.4/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
69+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.4", "firmwares/NINA/1.4.4/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
70+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.3", "firmwares/NINA/1.4.3/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
71+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.3", "firmwares/NINA/1.4.3/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
72+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.2", "firmwares/NINA/1.4.2/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
73+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.2", "firmwares/NINA/1.4.2/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
74+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.1", "firmwares/NINA/1.4.1/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
75+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.1", "firmwares/NINA/1.4.1/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
76+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.0", "firmwares/NINA/1.4.0/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
77+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.4.0", "firmwares/NINA/1.4.0/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
78+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.3.0", "firmwares/NINA/1.3.0/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
79+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.3.0", "firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
80+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.4", "firmwares/NINA/1.2.4/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino NANO 33 IoT")));
81+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.4", "firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
82+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.3", "firmwares/NINA/1.2.3/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010")));
83+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.3", "firmwares/NINA/1.2.3/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
84+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.2", "firmwares/NINA/1.2.2/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010")));
85+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.2", "firmwares/NINA/1.2.2/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
86+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.1", "firmwares/NINA/1.2.1/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010")));
87+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.2.1", "firmwares/NINA/1.2.1/NINA_W102-Uno_WiFi_Rev2.bin", true, 1000000, asList("Arduino Uno WiFi Rev2")));
88+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.1.0", "firmwares/NINA/1.1.0/NINA_W102.bin", true, 1000000, asList("Arduino MKR WiFi 1010", "Arduino MKR Vidor 4000", "Arduino Uno WiFi Rev2")));
89+
fwAvailable.add(new NinaFlasher("NINA firmware", "1.0.0", "firmwares/NINA/1.0.0/NINA_W102.bin", false, 1000000, asList("Arduino MKR WiFi 1010", "Arduino MKR Vidor 4000", "Arduino Uno WiFi Rev2")));
9490

9591
for (Flasher firmware : fwAvailable) {
9692
getFirmwareSelector().addItem(firmware);
@@ -110,7 +106,7 @@ private void refreshCertList() {
110106

111107
@Override
112108
protected void refreshSerialPortList() {
113-
DefaultListModel<String> model = new DefaultListModel<String>();
109+
DefaultListModel<String> model = new DefaultListModel<>();
114110
BoardPort board;
115111
listModel = new SerialPortListModel();
116112
for (int i = 0; i < listModel.getSize(); i++) {
@@ -179,6 +175,7 @@ protected void testConnection() {
179175

180176
setEnabled(false);
181177
new Thread() {
178+
@Override
182179
public void run() {
183180
try {
184181
fw.testConnection(port.getAddress(), fw.getBaudrate());
@@ -191,7 +188,7 @@ public void run() {
191188
}
192189
setEnabled(true);
193190
resetProgress();
194-
};
191+
}
195192
}.start();
196193
}
197194

@@ -240,7 +237,7 @@ public void run() {
240237

241238
@Override
242239
protected void addCertificate() {
243-
String website = (String) JOptionPane.showInputDialog(this, "Enter the website to fetch SSL certificate:",
240+
String website = JOptionPane.showInputDialog(this, "Enter the website to fetch SSL certificate:",
244241
"Add SSL certificate from website", JOptionPane.QUESTION_MESSAGE);
245242
if (website.startsWith("http://")) {
246243
JOptionPane.showMessageDialog(UpdaterImpl.this, "Sorry \"http://\" protocol doesn't support SSL",
@@ -288,6 +285,7 @@ protected void uploadCertificates() {
288285

289286
setEnabled(false);
290287
new Thread() {
288+
@SuppressWarnings("synthetic-access")
291289
@Override
292290
public void run() {
293291
try {

‎src/cc/arduino/plugins/wifi101/UpdaterJFrame.java

+16-6
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
import javax.swing.JPanel;
4545
import javax.swing.JProgressBar;
4646
import javax.swing.JScrollPane;
47+
import javax.swing.WindowConstants;
4748
import javax.swing.border.EmptyBorder;
4849
import javax.swing.border.LineBorder;
4950
import javax.swing.border.TitledBorder;
5051
import javax.swing.event.ListSelectionEvent;
5152
import javax.swing.event.ListSelectionListener;
5253

5354
import cc.arduino.plugins.wifi101.flashers.Flasher;
54-
import processing.app.Base;
5555
import processing.app.Theme;
5656

5757
@SuppressWarnings("serial")
@@ -78,6 +78,7 @@ public class UpdaterJFrame extends JFrame {
7878

7979
public static void main(String[] args) {
8080
EventQueue.invokeLater(new Runnable() {
81+
@Override
8182
public void run() {
8283
try {
8384
UpdaterJFrame frame = new UpdaterJFrame();
@@ -94,7 +95,7 @@ public UpdaterJFrame() {
9495
int scale = Theme.getScale();
9596
setTitle("WiFi101 / WiFiNINA Firmware/Certificates Updater");
9697
setResizable(false);
97-
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
98+
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
9899
setBounds(100 * scale / 100, 100 * scale / 100, 500 * scale / 100, 520 * scale / 100);
99100
contentPane = new JPanel();
100101
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
@@ -133,7 +134,7 @@ public UpdaterJFrame() {
133134
gbc_textSelectPort.gridy = 0;
134135
panel_1.add(textSelectPort, gbc_textSelectPort);
135136

136-
serialPortList = new JList<String>();
137+
serialPortList = new JList<>();
137138
JScrollPane sp = new JScrollPane(serialPortList);
138139
serialPortList.setMaximumSize(new Dimension(300 * scale / 100, 100 * scale / 100));
139140
GridBagConstraints gbc_serialPortList = new GridBagConstraints();
@@ -144,14 +145,15 @@ public UpdaterJFrame() {
144145
gbc_serialPortList.gridheight = 5;
145146
panel_1.add(sp, gbc_serialPortList);
146147
serialPortList.addListSelectionListener(new ListSelectionListener() {
148+
@Override
147149
public void valueChanged(ListSelectionEvent e) {
148-
boolean enabled = (serialPortList.getSelectedIndex() != -1);
149150
SelectBoardModule();
150151
}
151152
});
152153

153154
JButton refreshListButton = new JButton("Refresh list");
154155
refreshListButton.addActionListener(new ActionListener() {
156+
@Override
155157
public void actionPerformed(ActionEvent e) {
156158
refreshSerialPortList();
157159
}
@@ -165,6 +167,7 @@ public void actionPerformed(ActionEvent e) {
165167

166168
testConnectionButton = new JButton("Test connection");
167169
testConnectionButton.addActionListener(new ActionListener() {
170+
@Override
168171
public void actionPerformed(ActionEvent e) {
169172
testConnection();
170173
}
@@ -178,6 +181,7 @@ public void actionPerformed(ActionEvent e) {
178181

179182
openFirmwareUpdaterSketchButton = new JButton("Open Updater sketch");
180183
openFirmwareUpdaterSketchButton.addActionListener(new ActionListener() {
184+
@Override
181185
public void actionPerformed(ActionEvent e) {
182186
openFirmwareUpdaterSketch();
183187
}
@@ -215,7 +219,7 @@ public void actionPerformed(ActionEvent e) {
215219
gbc_textSelectTheFirmware.gridy = 1;
216220
panel.add(textSelectTheFirmware, gbc_textSelectTheFirmware);
217221

218-
firmwareSelector = new JComboBox<Flasher>();
222+
firmwareSelector = new JComboBox<>();
219223
GridBagConstraints gbc_firmwareSelector = new GridBagConstraints();
220224
gbc_firmwareSelector.insets = new Insets(5, 5, 5, 0);
221225
gbc_firmwareSelector.fill = GridBagConstraints.HORIZONTAL;
@@ -224,13 +228,15 @@ public void actionPerformed(ActionEvent e) {
224228
panel.add(firmwareSelector, gbc_firmwareSelector);
225229

226230
firmwareSelector.addActionListener(new ActionListener() {
231+
@Override
227232
public void actionPerformed(ActionEvent e) {
228233
updateCertSection();
229234
}
230235
});
231236

232237
updateFirmwareButton = new JButton("Update Firmware");
233238
updateFirmwareButton.addActionListener(new ActionListener() {
239+
@Override
234240
public void actionPerformed(ActionEvent e) {
235241
updateFirmware();
236242
}
@@ -283,8 +289,9 @@ public void actionPerformed(ActionEvent e) {
283289

284290
certSelector = new JList<>();
285291
certSelector.addListSelectionListener(new ListSelectionListener() {
292+
@Override
286293
public void valueChanged(ListSelectionEvent e) {
287-
boolean enabled = (certSelector.getSelectedIndex() != -1);
294+
boolean enabled = (getCertSelector().getSelectedIndex() != -1);
288295
getRemoveCertificateButton().setEnabled(enabled);
289296
}
290297
});
@@ -299,6 +306,7 @@ public void valueChanged(ListSelectionEvent e) {
299306

300307
addCertificateButton = new JButton("Add domain");
301308
addCertificateButton.addActionListener(new ActionListener() {
309+
@Override
302310
public void actionPerformed(ActionEvent e) {
303311
addCertificate();
304312
}
@@ -313,6 +321,7 @@ public void actionPerformed(ActionEvent e) {
313321
removeCertificateButton = new JButton("Remove domain");
314322
removeCertificateButton.setEnabled(false);
315323
removeCertificateButton.addActionListener(new ActionListener() {
324+
@Override
316325
public void actionPerformed(ActionEvent e) {
317326
removeCertificate();
318327
}
@@ -326,6 +335,7 @@ public void actionPerformed(ActionEvent e) {
326335

327336
uploadCertificatesButton = new JButton("Upload Certificates to WiFi module");
328337
uploadCertificatesButton.addActionListener(new ActionListener() {
338+
@Override
329339
public void actionPerformed(ActionEvent e) {
330340
uploadCertificates();
331341
}

‎src/cc/arduino/plugins/wifi101/WiFi101.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@ public class WiFi101 implements Tool {
3535

3636
UpdaterImpl updater;
3737

38-
public void init(Editor editor) {
39-
this.editor = editor;
38+
@Override
39+
public void init(Editor _editor) {
40+
this.editor = _editor;
4041
}
4142

43+
@Override
4244
public String getMenuTitle() {
4345
return "WiFi101 / WiFiNINA Firmware Updater";
4446
}
4547

48+
@Override
4649
public synchronized void run() {
4750
if (updater == null)
4851
try {

‎src/cc/arduino/plugins/wifi101/certs/WiFi101Certificate.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ private static byte[] encodeTimestampV1(Date timestamp) throws IOException {
153153

154154
private static byte[] getSubjectValueHash(X509Certificate x509) throws NoSuchAlgorithmException, IOException {
155155
MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
156-
ASN1InputStream ais = new ASN1InputStream(x509.getSubjectX500Principal().getEncoded());
157-
while (ais.available() > 0) {
158-
ASN1Primitive obj = ais.readObject();
159-
sha1.update(extractPrintableString(obj));
156+
try (ASN1InputStream ais = new ASN1InputStream(x509.getSubjectX500Principal().getEncoded())) {
157+
while (ais.available() > 0) {
158+
ASN1Primitive obj = ais.readObject();
159+
sha1.update(extractPrintableString(obj));
160+
}
160161
}
161-
ais.close();
162162
return sha1.digest();
163163
}
164164

0 commit comments

Comments
 (0)