Minot, findbugs related, cleanups.

bengtmartensson · Mar 12, 2024 · 2b9b5af · 2b9b5af
1 parent 9d45825
commit 2b9b5af
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/org/harctoolbox/guicomponents/GirsClientBean.java b/src/main/java/org/harctoolbox/guicomponents/GirsClientBean.java
@@ -69,7 +69,7 @@ public GirsClientBean(GuiUtils guiUtils, boolean verbose, int timeout, String in
         DefaultComboBoxModel<String> model;
         try {
             portNames = LocalSerialPort.getSerialPortNames(true);
-            model = new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
+            model = new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
         } catch (IOException | LinkageError ex) {
             portNames = new ArrayList<>(0);
             model =  new DefaultComboBoxModel<>(new String[]{ initialPort != null ? initialPort : NOT_INITIALIZED });
@@ -241,7 +241,7 @@ private void setupPortComboBox(boolean useCached) throws IOException {
 
         portNames = LocalSerialPort.getSerialPortNames(useCached);
         portNames.add(0, "");
-        DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
+        DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
         portComboBox.setModel(model);
     }
 

diff --git a/src/main/java/org/harctoolbox/guicomponents/GlobalCacheManager.java b/src/main/java/org/harctoolbox/guicomponents/GlobalCacheManager.java
@@ -121,11 +121,11 @@ public boolean removeManualGlobalCache(InetAddress inetAddress) {
     }
 
     public InetAddress[] getManual() {
-        return manualGlobalCaches.toArray(new InetAddress[manualGlobalCaches.size()]);
+        return manualGlobalCaches.toArray(new InetAddress[0]);
     }
 
     public InetAddress[] getAutomatic() {
-        return automaticGlobalCaches.toArray(new InetAddress[automaticGlobalCaches.size()]);
+        return automaticGlobalCaches.toArray(new InetAddress[0]);
     }
 
     public String[] getAllNames() {

diff --git a/src/main/java/org/harctoolbox/guicomponents/IrpRenderBean.java b/src/main/java/org/harctoolbox/guicomponents/IrpRenderBean.java
@@ -144,7 +144,7 @@ private String[] irpMasterProtocols() {
         if (irpDatabase == null)
             return new String[]{"--"};
 
-        String[] protocolList = irpDatabase.getNames().toArray(new String[irpDatabase.getNames().size()]);
+        String[] protocolList = irpDatabase.getNames().toArray(new String[0]);
         java.util.Arrays.sort(protocolList, String.CASE_INSENSITIVE_ORDER);
         return protocolList;
     }

diff --git a/src/main/java/org/harctoolbox/guicomponents/SerialHardwareBean.java b/src/main/java/org/harctoolbox/guicomponents/SerialHardwareBean.java
@@ -41,7 +41,7 @@ protected static DefaultComboBoxModel<String> createModel(boolean useCached) {
             portNames.add("");
         }
         //portNames.add(0, "");
-        return new DefaultComboBoxModel<>(portNames.toArray(new String[portNames.size()]));
+        return new DefaultComboBoxModel<>(portNames.toArray(new String[0]));
     }
 
     protected String portName;

diff --git a/src/main/java/org/harctoolbox/guicomponents/SerialPortBean.java b/src/main/java/org/harctoolbox/guicomponents/SerialPortBean.java
@@ -216,7 +216,7 @@ public void setupPortComboBox(boolean useCached) throws IOException {
 
         List<String> portNames = LocalSerialPort.getSerialPortNames(useCached);
         portNames.add(0, null);
-        DefaultComboBoxModel model = new DefaultComboBoxModel(portNames.toArray(new String[portNames.size()]));
+        DefaultComboBoxModel model = new DefaultComboBoxModel(portNames.toArray(new String[0]));
         portComboBox.setModel(model);
     }
 

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/GuiMain.java b/src/main/java/org/harctoolbox/irscrutinizer/GuiMain.java
@@ -48,8 +48,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.comm.DriverGenUnix;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.ImageIcon;
@@ -1022,7 +1020,7 @@ private Command.CommandTextFormat[] setupExtraTextFormats() {
             formats.add(new BroadlinkHexFormatter());
         if (properties.getExportGenerateBroadlinkBase64())
             formats.add(new BroadlinkBase64Formatter());
-        return formats.toArray(new Command.CommandTextFormat[formats.size()]);
+        return formats.toArray(new Command.CommandTextFormat[0]);
     }
 
     private GirrExporter newGirrExporter() {
@@ -8738,7 +8736,7 @@ private void controlTowerManufacturerComboBoxActionPerformed(java.awt.event.Acti
             if (controlTowerIrDatabase == null) {
                 controlTowerIrDatabase = new ControlTowerIrDatabase(properties.getVerbose());
                 Collection<String> manufacturers = controlTowerIrDatabase.getManufacturers();
-                String[] arr = manufacturers.toArray(new String[manufacturers.size()]);
+                String[] arr = manufacturers.toArray(new String[0]);
                 //resetCursor(oldCursor);
                 Arrays.sort(arr, String.CASE_INSENSITIVE_ORDER);
                 DefaultComboBoxModel dcbm = new DefaultComboBoxModel(arr);
@@ -8747,7 +8745,7 @@ private void controlTowerManufacturerComboBoxActionPerformed(java.awt.event.Acti
             } else {
                 String manufacturer = (String) controlTowerManufacturerComboBox.getSelectedItem();
                 Collection<String> devTypes = controlTowerIrDatabase.getDeviceTypes(manufacturer);
-                String[] arr = devTypes.toArray(new String[devTypes.size()]);
+                String[] arr = devTypes.toArray(new String[0]);
                 Arrays.sort(arr, String.CASE_INSENSITIVE_ORDER);
                 DefaultComboBoxModel dcbm = new DefaultComboBoxModel(arr);
                 controlTowerDeviceTypeComboBox.setModel(dcbm);

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/exporter/ExportFormatManager.java b/src/main/java/org/harctoolbox/irscrutinizer/exporter/ExportFormatManager.java
@@ -137,7 +137,7 @@ public Set<String> getNames() {
     public String[] toArray() {
         ArrayList<String> list = new ArrayList<>(exportFormats.keySet());
         Collections.sort(list, String.CASE_INSENSITIVE_ORDER);
-        return list.toArray(new String[list.size()]);
+        return list.toArray(new String[0]);
     }
 
     @SuppressWarnings("PublicInnerClass")

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/exporter/Exporter.java b/src/main/java/org/harctoolbox/irscrutinizer/exporter/Exporter.java
@@ -152,6 +152,7 @@ protected static DocumentFragment parseToDocumentFragment(String str) {
     protected Exporter() {
     }
 
+    @SuppressWarnings("NoopMethodInAbstractClass")
     protected void possiblyMakeExecutable(File file) {
     }
 

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/importer/CsvImporter.java b/src/main/java/org/harctoolbox/irscrutinizer/importer/CsvImporter.java
@@ -92,7 +92,7 @@ protected static String[] gobbleString(String[] chunks, int column, boolean name
             }
             arrayList.add(chunk);
         }
-        return arrayList.toArray(new String[arrayList.size()]);
+        return arrayList.toArray(new String[0]);
     }
     protected static String join(String[] arr) {
         if (arr == null)

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/importer/CsvRawImporter.java b/src/main/java/org/harctoolbox/irscrutinizer/importer/CsvRawImporter.java
@@ -132,7 +132,7 @@ private String[] csvSplit(String line, String separator) {
             }
             chunks.add(chunk.trim());
         }
-        return chunks.toArray(new String[chunks.size()]);
+        return chunks.toArray(new String[0]);
     }
 
     @Override

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/importer/IrTransImporter.java b/src/main/java/org/harctoolbox/irscrutinizer/importer/IrTransImporter.java
@@ -95,6 +95,7 @@ private String parseName(LineNumberReader reader) throws IOException, ParseExcep
         String line = reader.readLine();
         if (line == null)
             throw new ParseException("[NAME] not found.", reader.getLineNumber());
+        @SuppressWarnings("SingleCharRegex")
         String[] arr = line.trim().split("]");
         if (!arr[0].equals("[NAME"))
             throw new ParseException("[NAME] not found.", reader.getLineNumber());

diff --git a/src/main/java/org/harctoolbox/irscrutinizer/importer/RemoteLocatorImporter.java b/src/main/java/org/harctoolbox/irscrutinizer/importer/RemoteLocatorImporter.java
@@ -76,7 +76,7 @@ public void clear() {
     public String[] getManufacturers() throws IOException, SAXException {
         assertDatabase();
         List<String> manufacturer = remoteDatabase.getManufacturers();
-        return manufacturer.toArray(new String[manufacturer.size()]);
+        return manufacturer.toArray(new String[0]);
     }
 
     @Override
@@ -100,12 +100,12 @@ public Remote.MetaData getMetaData() {
 
     public String[] getDeviceClasses(String manufacturer) throws NotFoundException {
         List<String> deviceClasses = remoteDatabase.getDeviceTypes(manufacturer);
-        return deviceClasses.toArray(new String[deviceClasses.size()]);
+        return deviceClasses.toArray(new String[0]);
     }
 
     public String[] getRemotes(String manufacturer, String deviceType) throws NotFoundException {
         List<String> remotes = remoteDatabase.getRemotes(manufacturer, deviceType);
-        return remotes.toArray(new String[remotes.size()]);
+        return remotes.toArray(new String[0]);
     }
 
     public void load(String manufacturer, String deviceType, String remoteName) throws NotFoundException {
-Original file line number
+Diff line change
@@ Expand Up @@
         protected Exporter() {
         }
+        @SuppressWarnings("NoopMethodInAbstractClass")
         protected void possiblyMakeExecutable(File file) {
         }
@@ Expand Down @@