cleanup warnings

vsch · Apr 20, 2023 · dfc8aff · dfc8aff
1 parent dcb0aa8
commit dfc8aff
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 38 deletions.
diff --git a/src/com/vladsch/clionarduinoplugin/serial/SerialProjectComponent.java b/src/com/vladsch/clionarduinoplugin/serial/SerialProjectComponent.java
@@ -13,6 +13,9 @@
 import com.vladsch.plugins.simpleserialconnectorservice.JsscSerialService;
 import com.vladsch.plugins.simpleserialconnectorservice.SerialMonitorException;
 import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile;
+import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile.NewLine;
+import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile.Parity;
+import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile.StopBits;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,6 +28,7 @@
 
 public class SerialProjectComponent implements BuildListener, Disposable, ProjectSettingsListener {
     final Project myProject;
+    @SuppressWarnings("unused") 
     private ArduinoApplicationComponent myApplicationComponent;
     final @NotNull ArduinoProjectSettings myProjectSettings;
     boolean myIsBuilding = false;
@@ -261,19 +265,19 @@ private void connect(String portName, int baudRate) {
             SerialPortProfile settings = new SerialPortProfile();
             settings.bits = 8;
             settings.baudRate = baudRate;
-            settings.stopBits = SerialPortProfile.StopBits.BITS_1;
-            settings.parity = SerialPortProfile.Parity.NONE;
+            settings.stopBits = StopBits.BITS_1;
+            settings.parity = Parity.NONE;
             switch (myProjectSettings.getSerialEndOfLineType()) {
                 case LF:
-                    settings.newLine = SerialPortProfile.NewLine.LF;
+                    settings.newLine = NewLine.LF;
                     break;
                 case CR_LF:
-                    settings.newLine = SerialPortProfile.NewLine.CRLF;
+                    settings.newLine = NewLine.CRLF;
                     break;
                 default:
                 case NONE:
                 case CR:
-                    settings.newLine = SerialPortProfile.NewLine.CR;
+                    settings.newLine = NewLine.CR;
                     break;
             }
             settings.portName = portName;

diff --git a/src/com/vladsch/clionarduinoplugin/settings/SerialBaudRates.java b/src/com/vladsch/clionarduinoplugin/settings/SerialBaudRates.java
@@ -4,28 +4,28 @@
 import com.vladsch.plugin.util.ui.ComboBoxAdaptable;
 import com.vladsch.plugin.util.ui.ComboBoxAdapter;
 import com.vladsch.plugin.util.ui.ComboBoxAdapterImpl;
-import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile;
+import com.vladsch.plugins.simpleserialconnectorservice.SerialPortProfile.BaudRate;
 import org.jetbrains.annotations.NotNull;
 
 public enum SerialBaudRates implements ComboBoxAdaptable<SerialBaudRates> {
     DEFAULT(0, ArduinoSupportBundle.message("new-project.baud-rate.default")),
-    BAUDRATE_110(SerialPortProfile.BaudRate.BAUDRATE_110.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_110.intValue)),
-    BAUDRATE_300(SerialPortProfile.BaudRate.BAUDRATE_300.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_300.intValue)),
-    BAUDRATE_600(SerialPortProfile.BaudRate.BAUDRATE_600.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_600.intValue)),
-    BAUDRATE_1200(SerialPortProfile.BaudRate.BAUDRATE_1200.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_1200.intValue)),
-    BAUDRATE_2400(SerialPortProfile.BaudRate.BAUDRATE_2400.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_2400.intValue)),
-    BAUDRATE_4800(SerialPortProfile.BaudRate.BAUDRATE_4800.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_4800.intValue)),
-    BAUDRATE_9600(SerialPortProfile.BaudRate.BAUDRATE_9600.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_9600.intValue)),
-    BAUDRATE_14400(SerialPortProfile.BaudRate.BAUDRATE_14400.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_14400.intValue)),
-    BAUDRATE_19200(SerialPortProfile.BaudRate.BAUDRATE_19200.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_19200.intValue)),
-    BAUDRATE_38400(SerialPortProfile.BaudRate.BAUDRATE_38400.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_38400.intValue)),
-    BAUDRATE_57600(SerialPortProfile.BaudRate.BAUDRATE_57600.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_57600.intValue)),
-    BAUDRATE_115200(SerialPortProfile.BaudRate.BAUDRATE_115200.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_115200.intValue)),
-    BAUDRATE_128000(SerialPortProfile.BaudRate.BAUDRATE_128000.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_128000.intValue)),
-    BAUDRATE_230400(SerialPortProfile.BaudRate.BAUDRATE_230400.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_230400.intValue)),
-    BAUDRATE_256000(SerialPortProfile.BaudRate.BAUDRATE_256000.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_256000.intValue)),
-    BAUDRATE_460800(SerialPortProfile.BaudRate.BAUDRATE_460800.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_460800.intValue)),
-    BAUDRATE_512000(SerialPortProfile.BaudRate.BAUDRATE_512000.intValue, Integer.toString(SerialPortProfile.BaudRate.BAUDRATE_512000.intValue)),
+    BAUDRATE_110(BaudRate.BAUDRATE_110.intValue, Integer.toString(BaudRate.BAUDRATE_110.intValue)),
+    BAUDRATE_300(BaudRate.BAUDRATE_300.intValue, Integer.toString(BaudRate.BAUDRATE_300.intValue)),
+    BAUDRATE_600(BaudRate.BAUDRATE_600.intValue, Integer.toString(BaudRate.BAUDRATE_600.intValue)),
+    BAUDRATE_1200(BaudRate.BAUDRATE_1200.intValue, Integer.toString(BaudRate.BAUDRATE_1200.intValue)),
+    BAUDRATE_2400(BaudRate.BAUDRATE_2400.intValue, Integer.toString(BaudRate.BAUDRATE_2400.intValue)),
+    BAUDRATE_4800(BaudRate.BAUDRATE_4800.intValue, Integer.toString(BaudRate.BAUDRATE_4800.intValue)),
+    BAUDRATE_9600(BaudRate.BAUDRATE_9600.intValue, Integer.toString(BaudRate.BAUDRATE_9600.intValue)),
+    BAUDRATE_14400(BaudRate.BAUDRATE_14400.intValue, Integer.toString(BaudRate.BAUDRATE_14400.intValue)),
+    BAUDRATE_19200(BaudRate.BAUDRATE_19200.intValue, Integer.toString(BaudRate.BAUDRATE_19200.intValue)),
+    BAUDRATE_38400(BaudRate.BAUDRATE_38400.intValue, Integer.toString(BaudRate.BAUDRATE_38400.intValue)),
+    BAUDRATE_57600(BaudRate.BAUDRATE_57600.intValue, Integer.toString(BaudRate.BAUDRATE_57600.intValue)),
+    BAUDRATE_115200(BaudRate.BAUDRATE_115200.intValue, Integer.toString(BaudRate.BAUDRATE_115200.intValue)),
+    BAUDRATE_128000(BaudRate.BAUDRATE_128000.intValue, Integer.toString(BaudRate.BAUDRATE_128000.intValue)),
+    BAUDRATE_230400(BaudRate.BAUDRATE_230400.intValue, Integer.toString(BaudRate.BAUDRATE_230400.intValue)),
+    BAUDRATE_256000(BaudRate.BAUDRATE_256000.intValue, Integer.toString(BaudRate.BAUDRATE_256000.intValue)),
+    BAUDRATE_460800(BaudRate.BAUDRATE_460800.intValue, Integer.toString(BaudRate.BAUDRATE_460800.intValue)),
+    BAUDRATE_512000(BaudRate.BAUDRATE_512000.intValue, Integer.toString(BaudRate.BAUDRATE_512000.intValue)),
     CUSTOM(-1, ArduinoSupportBundle.message("new-project.baud-rate.custom")),
     ;
 

diff --git a/src/com/vladsch/clionarduinoplugin/settings/SerialMonitorSettingsForm.java b/src/com/vladsch/clionarduinoplugin/settings/SerialMonitorSettingsForm.java
@@ -2,7 +2,6 @@
 package com.vladsch.clionarduinoplugin.settings;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.TextFieldWithHistory;
 import com.intellij.ui.components.JBCheckBox;
@@ -17,14 +16,11 @@
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import java.awt.Component;
 import java.awt.event.ActionListener;
 
 public class SerialMonitorSettingsForm extends FormParams<Boolean> implements Disposable, RegExSettingsHolder {
-    private static final Logger logger = Logger.getInstance("com.vladsch.clionarduinoplugin.settings");
-
     JPanel myMainPanel;
     JComboBox<String> myPort;
     JComboBox<String> myBaudRate;
@@ -38,11 +34,10 @@ public class SerialMonitorSettingsForm extends FormParams<Boolean> implements Di
     JBCheckBox myAfterSuccessfulBuild;
     JBCheckBox myLogConnectDisconnect;
     JBCheckBox myActivateOnConnect;
-    private JPanel myBuildControlPanel;
-    private SendSettingsForm mySendSettings;
-    JBCheckBox myReloadOnFileChange;
 
-    private @NotNull String myRegexSampleText;
+    JPanel myBuildControlPanel;
+    SendSettingsForm mySendSettings;
+    @NotNull String myRegexSampleText;
 
     public JComponent getComponent() {
         return myMainPanel;
@@ -53,10 +48,10 @@ public JComponent getComponent() {
     public SerialMonitorSettingsForm(ArduinoProjectSettings settings, boolean allowPortEdit) {
         super(allowPortEdit);
 
-        //noinspection unchecked
-        components = new SettingsComponents<ArduinoProjectSettings>(settings) {
+        //noinspection unchecked,rawtypes
+        components = new SettingsComponents<>(settings) {
             @Override
-            protected Settable[] createComponents(ArduinoProjectSettings i) {
+            protected Settable[] createComponents(@NotNull ArduinoProjectSettings i) {
                 return new Settable[] {
                         componentString(SerialPortNames.ADAPTER, myPort, i::getPort, i::setPort),
                         //component(SerialBaudRates.ADAPTER, myBaudRate, i::getBaudRate, i::setBaudRate),
@@ -101,9 +96,7 @@ protected Settable[] createComponents(ArduinoProjectSettings i) {
         myBaudRate.addActionListener(actionListener);
 
         myEditRegExButton.addActionListener(e -> {
-            boolean valid = RegExTestDialog.showDialog(myMainPanel, this);
-            //myRemovePrefixOnPaste.setSelected(valid);
-            //myAddPrefixOnPaste.setSelected(valid);
+            RegExTestDialog.showDialog(myMainPanel, this);
         });
 
         Project project = settings.getProject();
@@ -133,7 +126,7 @@ void updateOptions() {
         myBuildConfigurationNames.setEnabled(enablePrefixes);
         myEditRegExButton.setVisible(regexPrefixes);
         myCustomBaudRate.setEnabled(SerialBaudRates.ADAPTER.get(myBaudRate).isCustom());
-        
+
         SerialBaudRates baudRates = SerialBaudRates.ADAPTER.get(myBaudRate);
         if (!baudRates.isCustom()) {
             myCustomBaudRate.setText(baudRates.displayName);
@@ -167,6 +160,7 @@ private void createUIComponents() {
 
         if (mySettings) {
             // allow edit
+            //noinspection unchecked
             myPort = new TextFieldWithHistory();
         } else {
             myPort = SerialPortNames.ADAPTER.createComboBox();

diff --git a/src/com/vladsch/clionarduinoplugin/settings/SerialPortNames.java b/src/com/vladsch/clionarduinoplugin/settings/SerialPortNames.java
@@ -16,6 +16,7 @@ public SerialPortNames(final int intValue, @NotNull final String displayName) {
     }
 
     final public static SerialPortNames EMPTY = new SerialPortNames(0, "");
+    @SuppressWarnings("rawtypes") 
     public static DynamicListAdaptable[] values = new DynamicListAdaptable[0];
     final public static Static<DynamicListAdaptable<SerialPortNames>> ADAPTER = new Static<>(new ComboBoxAdapterImpl<>(EMPTY));