Chore: Code cleanup

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvColumnInfo.java

@@ -108,7 +108,7 @@ public class RowInfo {
             this(element, row, -1, -1);
         }
 
-        RowInfo(@NotNull T element, @NotNull int row, int startIndex, int endIndex) {
+        RowInfo(@NotNull T element, int row, int startIndex, int endIndex) {
             this.myElement = element;
             this.myRow = row;
             if (startIndex <= endIndex && startIndex >= 0) {
@@ -140,7 +140,7 @@ public boolean equals(Object other) {
             if (!(other instanceof CsvColumnInfo.RowInfo)) {
                 return false;
             }
-            return this.myElement.equals(((RowInfo) other).myElement);
+            return this.myElement.equals(((CsvColumnInfo<?>.RowInfo) other).myElement);
         }
     }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvCustomSeparatorAction.java

@@ -41,7 +41,7 @@ public void setSelected(@NotNull AnActionEvent anActionEvent, boolean selected)
         if (customValueSeparator == null) {
             return;
         }
-        if (customValueSeparator.length() == 0 || customValueSeparator.contains(" ")) {
+        if (customValueSeparator.isEmpty() || customValueSeparator.contains(" ")) {
             JOptionPane.showMessageDialog(fileEditor == null ? null : fileEditor.getComponent(), "Value separator must have at least one character and no spaces!");
             return;
         }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProvider.java

@@ -18,7 +18,7 @@ public class CsvTableEditorProvider implements AsyncFileEditorProvider, DumbAwar
     public static final String EDITOR_TYPE_ID = "csv-table-editor";
 
     @Override
-    public String getEditorTypeId() {
+    public @NotNull String getEditorTypeId() {
         return EDITOR_TYPE_ID;
     }
 
@@ -48,16 +48,15 @@ public FileEditor createEditor(@NotNull Project project, @NotNull VirtualFile vi
     }
 
     @Override
-    public FileEditorState readState(@NotNull Element sourceElement, @NotNull Project project, @NotNull VirtualFile file) {
+    public @NotNull FileEditorState readState(@NotNull Element sourceElement, @NotNull Project project, @NotNull VirtualFile file) {
         return CsvTableEditorState.create(sourceElement, project, file);
     }
 
     @Override
     public void writeState(@NotNull FileEditorState state, @NotNull Project project, @NotNull Element targetElement) {
-        if (!(state instanceof CsvTableEditorState)) {
+        if (!(state instanceof CsvTableEditorState csvTableEditorState)) {
             return;
         }
-        CsvTableEditorState csvTableEditorState = (CsvTableEditorState) state;
         csvTableEditorState.write(project, targetElement);
     }
 
@@ -66,7 +65,7 @@ public void writeState(@NotNull FileEditorState state, @NotNull Project project,
     public Builder createEditorAsync(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         return new Builder() {
             @Override
-            public FileEditor build() {
+            public @NotNull FileEditor build() {
                 return new CsvTableEditorSwing(project, virtualFile);
             }
         };

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvMultiLineCellRenderer.java

@@ -5,12 +5,12 @@
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.ui.components.JBScrollPane;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvColorSettings;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
@@ -21,7 +21,6 @@
 import java.awt.event.KeyEvent;
 import java.awt.geom.Rectangle2D;
 import java.util.EventObject;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -80,7 +79,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
                 myTextArea.setBackground(UIManager.getColor(editorColorsScheme.getDefaultBackground()));
             }
         } else {
-            myTextArea.setBorder(new EmptyBorder(1, 2, 1, 2));
+            myTextArea.setBorder(JBUI.Borders.empty(1, 2));
         }
 
         this.setFont(table.getFont());
@@ -153,19 +152,17 @@ public void cancelCellEditing() {
     protected void fireStopCellEditing() {
         ChangeEvent changeEvent = new ChangeEvent(this);
         synchronized (cellEditorListenerSet) {
-            Iterator<CellEditorListener> it = cellEditorListenerSet.iterator();
-            while (it.hasNext()) {
-                it.next().editingStopped(changeEvent);
+            for (CellEditorListener cellEditorListener : cellEditorListenerSet) {
+                cellEditorListener.editingStopped(changeEvent);
             }
         }
     }
 
     protected void fireCancelCellEditing() {
         ChangeEvent changeEvent = new ChangeEvent(this);
         synchronized (cellEditorListenerSet) {
-            Iterator<CellEditorListener> it = cellEditorListenerSet.iterator();
-            while (it.hasNext()) {
-                it.next().editingCanceled(changeEvent);
+            for (CellEditorListener cellEditorListener : cellEditorListenerSet) {
+                cellEditorListener.editingCanceled(changeEvent);
             }
         }
     }