[FIX] code cleanup / build fixes

Author: SeeSharpSoft

…plugins/csv/annotation/CsvAnnotator.java …lij/plugins/csv/editor/CsvAnnotator.javasrc/main/java/net/seesharpsoft/intellij/plugins/csv/annotation/CsvAnnotator.java renamed to src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java src/main/java/net/seesharpsoft/intellij/plugins/csv/annotation/CsvAnnotator.java renamed to src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java

@@ -1,4 +1,4 @@
-package net.seesharpsoft.intellij.plugins.csv.annotation;
+package net.seesharpsoft.intellij.plugins.csv.editor;
 
 import com.intellij.lang.annotation.*;
 import com.intellij.openapi.editor.colors.ColorKey;
@@ -13,7 +13,6 @@
 import com.intellij.xml.util.XmlStringUtil;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfo;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsPanel.java

@@ -16,7 +16,6 @@ public class CsvEditorSettingsPanel implements SearchableConfigurable {
     private JPanel myMainPanel;
     private JCheckBox cbUseSoftWraps;
     private JCheckBox cbColumnHighlighting;
-    private JPanel panelHighlighting;
     private CheckBoxWithColorChooser cbTabHighlightColor;
 
     @NotNull
@@ -37,6 +36,12 @@ public JComponent createComponent() {
         return myMainPanel;
     }
 
+    // ensure downward compatibility
+    @Override
+    public boolean isModified(@NotNull JToggleButton toggleButton, boolean value) {
+        return toggleButton.isSelected() != value;
+    }
+
     @Override
     public boolean isModified() {
         CsvEditorSettingsExternalizable csvEditorSettingsExternalizable = CsvEditorSettingsExternalizable.getInstance();

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

@@ -7,7 +7,7 @@
 import com.intellij.openapi.options.colors.ColorSettingsPage;
 import net.seesharpsoft.intellij.plugins.csv.CsvIconProvider;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
-import net.seesharpsoft.intellij.plugins.csv.annotation.CsvAnnotator;
+import net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator;
 import net.seesharpsoft.intellij.plugins.csv.highlighter.CsvSyntaxHighlighter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/resources/META-INF/plugin.xml

@@ -74,7 +74,7 @@
         <editorOptionsProvider instance="net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsProvider" />
         <fileEditorProvider implementation="net.seesharpsoft.intellij.plugins.csv.editor.CsvFileEditorProvider" />
 
-        <annotator language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.annotation.CsvAnnotator"/>
+        <annotator language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator"/>
 
         <spellchecker.support language="csv"
                               implementationClass="net.seesharpsoft.intellij.plugins.csv.spellchecker.CsvSpellCheckingStrategy" />

src/test/java/net/seesharpsoft/intellij/plugins/csv/annotation/CsvAnnotatorTest.java

@@ -21,7 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import static net.seesharpsoft.intellij.plugins.csv.annotation.CsvAnnotator.CSV_COLUMN_INFO_SEVERITY;
+import static net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator.CSV_COLUMN_INFO_SEVERITY;
 
 public class CsvAnnotatorTest extends LightCodeInsightFixtureTestCase {