Skip to content

Commit 2b9b5af

Browse files
Minot, findbugs related, cleanups.
1 parent 9d45825 commit 2b9b5af

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

src/main/java/org/harctoolbox/guicomponents/GirsClientBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public GirsClientBean(GuiUtils guiUtils, boolean verbose, int timeout, String in
6969
DefaultComboBoxModel<String> model;
7070
try {
7171
portNames = LocalSerialPort.getSerialPortNames(true);
72-
model = new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
72+
model = new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
7373
} catch (IOException | LinkageError ex) {
7474
portNames = new ArrayList<>(0);
7575
model = new DefaultComboBoxModel<>(new String[]{ initialPort != null ? initialPort : NOT_INITIALIZED });
@@ -241,7 +241,7 @@ private void setupPortComboBox(boolean useCached) throws IOException {
241241

242242
portNames = LocalSerialPort.getSerialPortNames(useCached);
243243
portNames.add(0, "");
244-
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
244+
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
245245
portComboBox.setModel(model);
246246
}
247247

src/main/java/org/harctoolbox/guicomponents/GlobalCacheManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ public boolean removeManualGlobalCache(InetAddress inetAddress) {
121121
}
122122

123123
public InetAddress[] getManual() {
124-
return manualGlobalCaches.toArray(new InetAddress[manualGlobalCaches.size()]);
124+
return manualGlobalCaches.toArray(new InetAddress[0]);
125125
}
126126

127127
public InetAddress[] getAutomatic() {
128-
return automaticGlobalCaches.toArray(new InetAddress[automaticGlobalCaches.size()]);
128+
return automaticGlobalCaches.toArray(new InetAddress[0]);
129129
}
130130

131131
public String[] getAllNames() {

src/main/java/org/harctoolbox/guicomponents/IrpRenderBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private String[] irpMasterProtocols() {
144144
if (irpDatabase == null)
145145
return new String[]{"--"};
146146

147-
String[] protocolList = irpDatabase.getNames().toArray(new String[irpDatabase.getNames().size()]);
147+
String[] protocolList = irpDatabase.getNames().toArray(new String[0]);
148148
java.util.Arrays.sort(protocolList, String.CASE_INSENSITIVE_ORDER);
149149
return protocolList;
150150
}

src/main/java/org/harctoolbox/guicomponents/SerialHardwareBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected static DefaultComboBoxModel<String> createModel(boolean useCached) {
4141
portNames.add("");
4242
}
4343
//portNames.add(0, "");
44-
return new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
44+
return new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
4545
}
4646

4747
protected String portName;

src/main/java/org/harctoolbox/guicomponents/SerialPortBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void setupPortComboBox(boolean useCached) throws IOException {
216216

217217
List<String> portNames = LocalSerialPort.getSerialPortNames(useCached);
218218
portNames.add(0, null);
219-
DefaultComboBoxModel model = new DefaultComboBoxModel(portNames.toArray(new String[portNames.size()]));
219+
DefaultComboBoxModel model = new DefaultComboBoxModel(portNames.toArray(new String[0]));
220220
portComboBox.setModel(model);
221221
}
222222

src/main/java/org/harctoolbox/irscrutinizer/GuiMain.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
import java.util.Locale;
4949
import java.util.Map;
5050
import java.util.function.Function;
51-
import java.util.logging.Level;
52-
import java.util.logging.Logger;
5351
import javax.comm.DriverGenUnix;
5452
import javax.swing.DefaultComboBoxModel;
5553
import javax.swing.ImageIcon;
@@ -1022,7 +1020,7 @@ private Command.CommandTextFormat[] setupExtraTextFormats() {
10221020
formats.add(new BroadlinkHexFormatter());
10231021
if (properties.getExportGenerateBroadlinkBase64())
10241022
formats.add(new BroadlinkBase64Formatter());
1025-
return formats.toArray(new Command.CommandTextFormat[formats.size()]);
1023+
return formats.toArray(new Command.CommandTextFormat[0]);
10261024
}
10271025

10281026
private GirrExporter newGirrExporter() {
@@ -8738,7 +8736,7 @@ private void controlTowerManufacturerComboBoxActionPerformed(java.awt.event.Acti
87388736
if (controlTowerIrDatabase == null) {
87398737
controlTowerIrDatabase = new ControlTowerIrDatabase(properties.getVerbose());
87408738
Collection<String> manufacturers = controlTowerIrDatabase.getManufacturers();
8741-
String[] arr = manufacturers.toArray(new String[manufacturers.size()]);
8739+
String[] arr = manufacturers.toArray(new String[0]);
87428740
//resetCursor(oldCursor);
87438741
Arrays.sort(arr, String.CASE_INSENSITIVE_ORDER);
87448742
DefaultComboBoxModel dcbm = new DefaultComboBoxModel(arr);
@@ -8747,7 +8745,7 @@ private void controlTowerManufacturerComboBoxActionPerformed(java.awt.event.Acti
87478745
} else {
87488746
String manufacturer = (String) controlTowerManufacturerComboBox.getSelectedItem();
87498747
Collection<String> devTypes = controlTowerIrDatabase.getDeviceTypes(manufacturer);
8750-
String[] arr = devTypes.toArray(new String[devTypes.size()]);
8748+
String[] arr = devTypes.toArray(new String[0]);
87518749
Arrays.sort(arr, String.CASE_INSENSITIVE_ORDER);
87528750
DefaultComboBoxModel dcbm = new DefaultComboBoxModel(arr);
87538751
controlTowerDeviceTypeComboBox.setModel(dcbm);

src/main/java/org/harctoolbox/irscrutinizer/exporter/ExportFormatManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public Set<String> getNames() {
137137
public String[] toArray() {
138138
ArrayList<String> list = new ArrayList<>(exportFormats.keySet());
139139
Collections.sort(list, String.CASE_INSENSITIVE_ORDER);
140-
return list.toArray(new String[list.size()]);
140+
return list.toArray(new String[0]);
141141
}
142142

143143
@SuppressWarnings("PublicInnerClass")

src/main/java/org/harctoolbox/irscrutinizer/exporter/Exporter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ protected static DocumentFragment parseToDocumentFragment(String str) {
152152
protected Exporter() {
153153
}
154154

155+
@SuppressWarnings("NoopMethodInAbstractClass")
155156
protected void possiblyMakeExecutable(File file) {
156157
}
157158

src/main/java/org/harctoolbox/irscrutinizer/importer/CsvImporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected static String[] gobbleString(String[] chunks, int column, boolean name
9292
}
9393
arrayList.add(chunk);
9494
}
95-
return arrayList.toArray(new String[arrayList.size()]);
95+
return arrayList.toArray(new String[0]);
9696
}
9797
protected static String join(String[] arr) {
9898
if (arr == null)

src/main/java/org/harctoolbox/irscrutinizer/importer/CsvRawImporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private String[] csvSplit(String line, String separator) {
132132
}
133133
chunks.add(chunk.trim());
134134
}
135-
return chunks.toArray(new String[chunks.size()]);
135+
return chunks.toArray(new String[0]);
136136
}
137137

138138
@Override

src/main/java/org/harctoolbox/irscrutinizer/importer/IrTransImporter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ private String parseName(LineNumberReader reader) throws IOException, ParseExcep
9595
String line = reader.readLine();
9696
if (line == null)
9797
throw new ParseException("[NAME] not found.", reader.getLineNumber());
98+
@SuppressWarnings("SingleCharRegex")
9899
String[] arr = line.trim().split("]");
99100
if (!arr[0].equals("[NAME"))
100101
throw new ParseException("[NAME] not found.", reader.getLineNumber());

src/main/java/org/harctoolbox/irscrutinizer/importer/RemoteLocatorImporter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void clear() {
7676
public String[] getManufacturers() throws IOException, SAXException {
7777
assertDatabase();
7878
List<String> manufacturer = remoteDatabase.getManufacturers();
79-
return manufacturer.toArray(new String[manufacturer.size()]);
79+
return manufacturer.toArray(new String[0]);
8080
}
8181

8282
@Override
@@ -100,12 +100,12 @@ public Remote.MetaData getMetaData() {
100100

101101
public String[] getDeviceClasses(String manufacturer) throws NotFoundException {
102102
List<String> deviceClasses = remoteDatabase.getDeviceTypes(manufacturer);
103-
return deviceClasses.toArray(new String[deviceClasses.size()]);
103+
return deviceClasses.toArray(new String[0]);
104104
}
105105

106106
public String[] getRemotes(String manufacturer, String deviceType) throws NotFoundException {
107107
List<String> remotes = remoteDatabase.getRemotes(manufacturer, deviceType);
108-
return remotes.toArray(new String[remotes.size()]);
108+
return remotes.toArray(new String[0]);
109109
}
110110

111111
public void load(String manufacturer, String deviceType, String remoteName) throws NotFoundException {

0 commit comments

Comments
 (0)