Chore: Text first, Settings update, code cleanup

Author: SeeSharpSoft

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

@@ -2,6 +2,7 @@
 
 import com.intellij.util.xmlb.Converter;
 import com.intellij.xml.util.XmlStringUtil;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -48,7 +49,7 @@ public static CsvEscapeCharacter create(String character) {
     }
 
     public static class CsvEscapeCharacterConverter extends Converter<CsvEscapeCharacter> {
-        public CsvEscapeCharacter fromString(String value) {
+        public CsvEscapeCharacter fromString(@NotNull String value) {
             return CsvEscapeCharacter.create(XmlStringUtil.unescapeIllegalXmlChars(value));
         }
 
@@ -100,10 +101,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof CsvEscapeCharacter)) {
+        if (!(obj instanceof CsvEscapeCharacter otherObj)) {
             return false;
         }
-        CsvEscapeCharacter otherObj = (CsvEscapeCharacter) obj;
         return Objects.equals(otherObj.getCharacter(), this.getCharacter()) && Objects.equals(otherObj.isCustom(), this.isCustom());
     }
 

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

@@ -6,7 +6,6 @@
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.notification.*;
 import com.intellij.openapi.extensions.PluginId;
-import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -17,7 +16,7 @@
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettingsProvider;
 import org.jetbrains.annotations.NotNull;
 
-public class CsvPlugin implements StartupActivity, StartupActivity.DumbAware, StartupActivity.Background {
+public class CsvPlugin implements StartupActivity, StartupActivity.DumbAware {
 
     protected static IdeaPluginDescriptor getPluginDescriptor() {
         return PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
@@ -35,7 +34,7 @@ private static void openLink(Project project, String link) {
         if (project.isDisposed()) return;
 
         if (link.startsWith("#")) {
-            ((ShowSettingsUtilImpl) ShowSettingsUtil.getInstance()).showSettingsDialog(project, link.substring(1), null);
+            ShowSettingsUtilImpl.showSettingsDialog(project, link.substring(1), null);
         } else {
             BrowserUtil.browse(link, project);
         }
@@ -61,7 +60,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                 }
                 // finished
                 progressIndicator.setFraction(1.0);
-                progressIndicator.setText("finished");
+                progressIndicator.setText("Finished");
             }
         });
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettings.java

@@ -39,9 +39,19 @@ public class CsvEditorSettings implements PersistentStateComponent<CsvEditorSett
     private static final CsvEditorSettings STATIC_TEST_INSTANCE = new CsvEditorSettings();
 
     public enum EditorPrio {
-        TEXT_FIRST,
-        TABLE_FIRST,
-        TEXT_ONLY
+        TEXT_FIRST("Text editor first"),
+        TABLE_FIRST("Table editor first"),
+        TEXT_ONLY("Text editor only");
+
+        private final String label;
+        
+        private EditorPrio(String label) {
+            this.label = label;
+        }
+
+        public String getDisplay() {
+            return label;
+        }
     }
 
     public enum ValueColoring {
@@ -67,7 +77,7 @@ public static final class OptionSet {
         public boolean HIGHTLIGHT_TAB_SEPARATOR = true;
         public boolean SHOW_INFO_BALLOON = true;
         public String TAB_HIGHLIGHT_COLOR = "-7984";
-        public EditorPrio EDITOR_PRIO = EditorPrio.TABLE_FIRST;
+        public EditorPrio EDITOR_PRIO = EditorPrio.TEXT_FIRST;
         public int TABLE_EDITOR_ROW_HEIGHT = TABLE_EDITOR_ROW_HEIGHT_DEFAULT;
         public int TABLE_AUTO_MAX_COLUMN_WIDTH = TABLE_AUTO_MAX_COLUMN_WIDTH_DEFAULT;
         public int TABLE_DEFAULT_COLUMN_WIDTH = TABLE_DEFAULT_COLUMN_WIDTH_DEFAULT;

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form

@@ -239,17 +239,11 @@
                   <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
               </hspacer>
-              <component id="a6cd2" class="javax.swing.JComboBox" binding="cbEditorUsage">
+              <component id="a6cd2" class="javax.swing.JComboBox" binding="cbEditorUsage" custom-create="true">
                 <constraints>
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
-                <properties>
-                  <model>
-                    <item value="Text editor first"/>
-                    <item value="Table editor first"/>
-                    <item value="Text editor only"/>
-                  </model>
-                </properties>
+                <properties/>
               </component>
             </children>
           </grid>

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.java

@@ -2,11 +2,12 @@
 
 import com.intellij.application.options.editor.EditorOptionsProvider;
 import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.ComboBox;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.CheckBoxWithColorChooser;
+import com.intellij.ui.JBColor;
 import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
@@ -16,7 +17,6 @@
 
 import javax.swing.*;
 import javax.swing.text.NumberFormatter;
-import java.awt.*;
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.Objects;
@@ -34,17 +34,17 @@ public class CsvEditorSettingsProvider implements EditorOptionsProvider {
     private JCheckBox cbUseSoftWraps;
     private CheckBoxWithColorChooser cbTabHighlightColor;
     private JCheckBox cbShowInfoBalloonCheckBox;
-    private JComboBox cbEditorUsage;
+    private JComboBox<CsvEditorSettings.EditorPrio> cbEditorUsage;
     private JCheckBox cbQuotingEnforced;
     private JCheckBox cbZeroBasedColumnNumbering;
     private JCheckBox cbFileEndLineBreak;
     private JFormattedTextField tfMaxColumnWidth;
     private JFormattedTextField tfDefaultColumnWidth;
-    private JComboBox comboEscapeCharacter;
-    private JComboBox comboValueSeparator;
+    private JComboBox<CsvEscapeCharacter> comboEscapeCharacter;
+    private JComboBox<CsvValueSeparator> comboValueSeparator;
     private JCheckBox cbKeepTrailingWhitespaces;
     private JTextField tfCommentIndicator;
-    private JComboBox comboValueColoring;
+    private JComboBox<CsvEditorSettings.ValueColoring> comboValueColoring;
     private JCheckBox cbAutoDetectSeparator;
     private JFormattedTextField tfDefaultRowHeight;
 
@@ -70,37 +70,27 @@ public JComponent createComponent() {
         return myMainPanel;
     }
 
-    // ensure downward compatibility
-    public boolean isModified(@NotNull JToggleButton toggleButton, boolean value) {
-        return toggleButton.isSelected() != value;
-    }
-
-    public boolean isModified(@NotNull JTextField textField, @NotNull String value) {
-        return !StringUtil.equals(textField.getText().trim(), value);
-    }
-
     @Override
     public boolean isModified() {
         CsvEditorSettings csvEditorSettings = CsvEditorSettings.getInstance();
-        return isModified(cbCaretRowShown, csvEditorSettings.isCaretRowShown()) ||
-                isModified(cbUseSoftWraps, csvEditorSettings.isUseSoftWraps()) ||
-                isModified(cbShowInfoBalloonCheckBox, csvEditorSettings.isShowInfoBalloon()) ||
+        return Configurable.isCheckboxModified(cbCaretRowShown, csvEditorSettings.isCaretRowShown()) ||
+                Configurable.isCheckboxModified(cbUseSoftWraps, csvEditorSettings.isUseSoftWraps()) ||
+                Configurable.isCheckboxModified(cbShowInfoBalloonCheckBox, csvEditorSettings.isShowInfoBalloon()) ||
                 cbTabHighlightColor.isSelected() != csvEditorSettings.isHighlightTabSeparator() ||
                 !Objects.equals(cbTabHighlightColor.getColor(), csvEditorSettings.getTabHighlightColor()) ||
                 !tfDefaultRowHeight.getValue().equals(csvEditorSettings.getTableEditorRowHeight()) ||
-                !Objects.equals(cbEditorUsage.getSelectedIndex(), csvEditorSettings.getEditorPrio().ordinal()) ||
-                isModified(cbQuotingEnforced, csvEditorSettings.isQuotingEnforced()) ||
-                !Objects.equals(cbEditorUsage.getSelectedIndex(), csvEditorSettings.getEditorPrio().ordinal()) ||
-                isModified(cbZeroBasedColumnNumbering, csvEditorSettings.isZeroBasedColumnNumbering()) ||
-                isModified(cbFileEndLineBreak, csvEditorSettings.isFileEndLineBreak()) ||
+                Configurable.isCheckboxModified(cbQuotingEnforced, csvEditorSettings.isQuotingEnforced()) ||
+                !Objects.equals(cbEditorUsage.getSelectedItem(), csvEditorSettings.getEditorPrio()) ||
+                Configurable.isCheckboxModified(cbZeroBasedColumnNumbering, csvEditorSettings.isZeroBasedColumnNumbering()) ||
+                Configurable.isCheckboxModified(cbFileEndLineBreak, csvEditorSettings.isFileEndLineBreak()) ||
                 !tfMaxColumnWidth.getValue().equals(csvEditorSettings.getTableAutoMaxColumnWidth()) ||
                 !tfDefaultColumnWidth.getValue().equals(csvEditorSettings.getTableDefaultColumnWidth()) ||
                 !Objects.equals(comboEscapeCharacter.getSelectedItem(), csvEditorSettings.getDefaultEscapeCharacter()) ||
                 !Objects.equals(comboValueSeparator.getSelectedItem(), csvEditorSettings.getDefaultValueSeparator()) ||
-                isModified(cbKeepTrailingWhitespaces, csvEditorSettings.getKeepTrailingSpaces()) ||
-                isModified(tfCommentIndicator, csvEditorSettings.getCommentIndicator()) ||
+                Configurable.isCheckboxModified(cbKeepTrailingWhitespaces, csvEditorSettings.getKeepTrailingSpaces()) ||
+                Configurable.isFieldModified(tfCommentIndicator, csvEditorSettings.getCommentIndicator()) ||
                 !Objects.equals(comboValueColoring.getSelectedItem(), csvEditorSettings.getValueColoring()) ||
-                isModified(cbAutoDetectSeparator, csvEditorSettings.isAutoDetectValueSeparator());
+                Configurable.isCheckboxModified(cbAutoDetectSeparator, csvEditorSettings.isAutoDetectValueSeparator());
     }
 
     @Override
@@ -112,7 +102,7 @@ public void reset() {
         cbTabHighlightColor.setSelected(csvEditorSettings.isHighlightTabSeparator());
         cbTabHighlightColor.setColor(csvEditorSettings.getTabHighlightColor());
         tfDefaultRowHeight.setValue(csvEditorSettings.getTableEditorRowHeight());
-        cbEditorUsage.setSelectedIndex(csvEditorSettings.getEditorPrio().ordinal());
+        cbEditorUsage.setSelectedItem(csvEditorSettings.getEditorPrio());
         cbQuotingEnforced.setSelected(csvEditorSettings.isQuotingEnforced());
         cbZeroBasedColumnNumbering.setSelected(csvEditorSettings.isZeroBasedColumnNumbering());
         cbFileEndLineBreak.setSelected(csvEditorSettings.isFileEndLineBreak());
@@ -135,7 +125,7 @@ public void apply() throws ConfigurationException {
         csvEditorSettings.setHighlightTabSeparator(cbTabHighlightColor.isSelected());
         csvEditorSettings.setTabHighlightColor(cbTabHighlightColor.getColor());
         csvEditorSettings.setTableEditorRowHeight((int) tfDefaultRowHeight.getValue());
-        csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.values()[cbEditorUsage.getSelectedIndex()]);
+        csvEditorSettings.setEditorPrio((CsvEditorSettings.EditorPrio) cbEditorUsage.getSelectedItem());
         csvEditorSettings.setQuotingEnforced(cbQuotingEnforced.isSelected());
         csvEditorSettings.setZeroBasedColumnNumbering(cbZeroBasedColumnNumbering.isSelected());
         csvEditorSettings.setFileEndLineBreak(cbFileEndLineBreak.isSelected());
@@ -165,17 +155,20 @@ protected void refreshOpenEditors() {
     }
 
     protected void createUIComponents() {
-        comboEscapeCharacter = new ComboBox(CsvEscapeCharacter.values());
-        comboEscapeCharacter.setRenderer(new CustomDisplayListCellRenderer<CsvEscapeCharacter>(ec -> ec.getDisplay()));
+        cbEditorUsage = new ComboBox<>(CsvEditorSettings.EditorPrio.values());
+        cbEditorUsage.setRenderer(new CustomDisplayListCellRenderer<>(CsvEditorSettings.EditorPrio::getDisplay));
+        
+        comboEscapeCharacter = new ComboBox<>(CsvEscapeCharacter.values());
+        comboEscapeCharacter.setRenderer(new CustomDisplayListCellRenderer<>(CsvEscapeCharacter::getDisplay));
 
-        comboValueSeparator = new ComboBox(CsvValueSeparator.values());
-        comboValueSeparator.setRenderer(new CustomDisplayListCellRenderer<CsvValueSeparator>(ec -> ec.getDisplay()));
+        comboValueSeparator = new ComboBox<>(CsvValueSeparator.values());
+        comboValueSeparator.setRenderer(new CustomDisplayListCellRenderer<>(CsvValueSeparator::getDisplay));
 
-        comboValueColoring = new ComboBox(CsvEditorSettings.ValueColoring.values());
-        comboValueColoring.setRenderer(new CustomDisplayListCellRenderer<CsvEditorSettings.ValueColoring>(ec -> ec.getDisplay()));
+        comboValueColoring = new ComboBox<>(CsvEditorSettings.ValueColoring.values());
+        comboValueColoring.setRenderer(new CustomDisplayListCellRenderer<>(CsvEditorSettings.ValueColoring::getDisplay));
 
         cbTabHighlightColor = new CheckBoxWithColorChooser("Highlight tab separator   ");
-        cbTabHighlightColor.setColor(Color.CYAN);
+        cbTabHighlightColor.setColor(JBColor.CYAN);
 
         NumberFormat numberFormat = NumberFormat.getIntegerInstance();
         NumberFormatter numberFormatter = new NumberFormatter(numberFormat);