code cleanup

Author: SeeSharpSoft

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

@@ -7,10 +7,10 @@
 
 public class CsvColumnInfo<T> {
 
-    private int myColumnIndex;
+    private final int myColumnIndex;
     private int myMaxLength;
     private int myMaxLengthRowIndex;
-    private Map<T, RowInfo> myElementInfos;
+    private final Map<T, RowInfo> myElementInfos;
     private T myHeaderElement;
     private int mySize;
 

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

@@ -102,7 +102,7 @@ public boolean equals(Object obj) {
         if (obj == null || !(obj instanceof CsvEscapeCharacter)) {
             return false;
         }
-        CsvEscapeCharacter otherObj = (CsvEscapeCharacter)obj;
+        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/CsvHelper.java

@@ -6,22 +6,31 @@
 import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.TokenType;
 import com.intellij.psi.impl.source.DummyHolder;
 import com.intellij.psi.impl.source.DummyHolderFactory;
 import com.intellij.psi.impl.source.tree.FileElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import net.seesharpsoft.intellij.lang.FileParserDefinition;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
-import net.seesharpsoft.intellij.plugins.csv.psi.*;
+import net.seesharpsoft.intellij.plugins.csv.psi.CsvField;
+import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
+import net.seesharpsoft.intellij.plugins.csv.psi.CsvRecord;
+import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import net.seesharpsoft.intellij.plugins.psv.PsvFileType;
 import net.seesharpsoft.intellij.plugins.tsv.TsvFileType;
 import net.seesharpsoft.intellij.psi.PsiHelper;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50,7 +59,7 @@ public static boolean isCsvFile(String extension) {
             return false;
         }
         // simple check to always in include the defaults even if association was removed
-        switch(extension.toLowerCase()) {
+        switch (extension.toLowerCase()) {
             case "csv":
             case "tsv":
             case "tab":
@@ -114,7 +123,7 @@ public static CsvField getParentFieldElement(final PsiElement element) {
                 elementType = PsiHelper.getElementType(currentElement);
             }
         }
-        return CsvField.class.cast(currentElement);
+        return (CsvField) currentElement;
     }
 
     public static int getFieldIndex(@NotNull final PsiElement element) {

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

@@ -5,7 +5,6 @@
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.ui.IdeUiService;
 import com.intellij.notification.*;
-import com.intellij.notification.impl.NotificationGroupManagerImpl;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -18,11 +17,6 @@
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettingsProvider;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.event.HyperlinkEvent;
-import java.awt.*;
-import java.io.IOException;
-import java.net.URI;
-
 public class CsvPlugin implements StartupActivity, StartupActivity.DumbAware, StartupActivity.Background {
 
     protected static IdeaPluginDescriptor getPluginDescriptor() {

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

@@ -18,6 +18,7 @@ public class CsvSharpLexer extends LexerBase implements CsvSeparatorHolder {
     private final List<Tokenizer.Token<TokenType>> initialNextStateTokens;
     private final List<Tokenizer.Token<TokenType>> unquotedNextStateTokens;
     private final List<Tokenizer.Token<TokenType>> quotedNextStateTokens;
+    private final CsvValueSeparator myValueSeparator;
 
     private CharSequence buffer;
     private int bufferEnd;
@@ -102,8 +103,6 @@ public Configuration(String valueSeparator, String recordSeparator, String escap
         }
     }
 
-    private final CsvValueSeparator myValueSeparator;
-
     public CsvSharpLexer() {
         this(Configuration.DEFAULT);
     }
@@ -124,12 +123,12 @@ public CsvSharpLexer(Configuration configuration) {
         } else {
             tokenizer.add(TokenType.TEXT,
                     String.format("((?!%s)[^%s%s%s])+|%s%s",
-                    configuration.valueSeparator,
-                    configuration.escapeCharacter,
-                    configuration.quoteCharacter,
-                    configuration.recordSeparator,
-                    configuration.escapeCharacter,
-                    configuration.escapeCharacter));
+                            configuration.valueSeparator,
+                            configuration.escapeCharacter,
+                            configuration.quoteCharacter,
+                            configuration.recordSeparator,
+                            configuration.escapeCharacter,
+                            configuration.escapeCharacter));
             tokenizer.add(TokenType.BACKSLASH, String.format("%s", configuration.escapeCharacter));
         }
         if (!configuration.commentCharacter.isEmpty()) {
@@ -213,7 +212,7 @@ protected void raiseFailure() {
     }
 
     protected Collection<Tokenizer.Token<TokenType>> getCurrentTokenCollection() {
-        switch(this.currentState) {
+        switch (this.currentState) {
             case Initial:
                 return initialNextStateTokens;
             case Unquoted:
@@ -254,9 +253,9 @@ protected synchronized void locateToken() {
             this.currentState = currentState.getNextState(tokenInfo.token());
             this.tokenEnd = tokenInfo.textRange().end();
 
-            switch(tokenInfo.token()) {
+            switch (tokenInfo.token()) {
                 case OPENING_QUOTE:
-                case CLOSING_QUOTE:_QUOTE:
+                case CLOSING_QUOTE:
                     currentTokenType = CsvTypes.QUOTE;
                     break;
                 case ESCAPED_QUOTE:

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

@@ -127,7 +127,7 @@ public boolean equals(Object obj) {
         if (obj == null || !(obj instanceof CsvValueSeparator)) {
             return false;
         }
-        CsvValueSeparator otherObj = (CsvValueSeparator)obj;
+        CsvValueSeparator otherObj = (CsvValueSeparator) obj;
         return Objects.equals(otherObj.getCharacter(), this.getCharacter()) && Objects.equals(otherObj.isCustom(), this.isCustom());
     }
 

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

@@ -13,7 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class CsvChangeEscapeCharacterAction extends ToggleAction {
-    private CsvEscapeCharacter myEscapeCharacter;
+    private final CsvEscapeCharacter myEscapeCharacter;
 
     CsvChangeEscapeCharacterAction(CsvEscapeCharacter escapeCharacter) {
         super(escapeCharacter.getDisplay());

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

@@ -1,6 +1,5 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
-import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -16,7 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class CsvChangeSeparatorAction extends ToggleAction {
-    private CsvValueSeparator mySeparator;
+    private final CsvValueSeparator mySeparator;
 
     CsvChangeSeparatorAction(CsvValueSeparator separator) {
         super(separator.getDisplay());

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

@@ -4,8 +4,8 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.fileEditor.FileEditor;
-import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableEditor;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableActions;
+import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableEditor;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class CsvTableEditorActions extends AnAction {

src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java

@@ -178,7 +178,7 @@ public CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualF
         }
         FileType fileType = virtualFile.getFileType();
         if (fileType instanceof CsvSeparatorHolder) {
-            return ((CsvSeparatorHolder)fileType).getSeparator();
+            return ((CsvSeparatorHolder) fileType).getSeparator();
         }
         Attribute attribute = getFileAttribute(project, virtualFile);
         return attribute == null || attribute.separator == null || attribute.separator.getCharacter().isEmpty() ?
@@ -218,7 +218,7 @@ public CsvEscapeCharacter getEscapeCharacter(Project project, VirtualFile virtua
         }
         FileType fileType = virtualFile.getFileType();
         if (fileType instanceof CsvEscapeCharacterHolder) {
-            return ((CsvEscapeCharacterHolder)fileType).getEscapeCharacter();
+            return ((CsvEscapeCharacterHolder) fileType).getEscapeCharacter();
         }
         Attribute attribute = getFileAttribute(project, virtualFile);
         return attribute == null || attribute.escapeCharacter == null ?