Chore: Code refactoring

Author: SeeSharpSoft

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

@@ -3,6 +3,7 @@
 import com.intellij.util.xmlb.Converter;
 import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -13,20 +14,13 @@ public class CsvEscapeCharacter extends CsvCustomizableElement {
     public static CsvEscapeCharacter BACKSLASH = new CsvEscapeCharacter("\\", "Backslash (\\)", "\\\\", "BACKSLASH");
 
     public static CsvEscapeCharacter[] values() {
-        return new CsvEscapeCharacter[]{QUOTE, BACKSLASH};
+        return new CsvEscapeCharacter[]{ QUOTE, BACKSLASH };
     }
 
-    public static CsvEscapeCharacter getDefaultEscapeCharacter(String character) {
-        if (character != null) {
-            switch (character) {
-                case "QUOTE":
-                case "\"":
-                    return QUOTE;
-                case "BACKSLASH":
-                case "\\":
-                    return BACKSLASH;
-                default:
-                    break;
+    private static @Nullable CsvEscapeCharacter getDefaultEscapeCharacter(@NotNull String character) {
+        for (CsvEscapeCharacter defaultEC : values()) {
+            if (defaultEC.getCharacter().equals(character) || defaultEC.getName().equals(character)) {
+                return defaultEC;
             }
         }
         return null;

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

@@ -3,6 +3,7 @@
 import com.intellij.util.xmlb.Converter;
 import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -16,29 +17,14 @@ public class CsvValueSeparator extends CsvCustomizableElement {
     public static final CsvValueSeparator COLON = new CsvValueSeparator(":", "Colon (:)", "COLON");
     public static final CsvValueSeparator RS = new CsvValueSeparator("\u001E", "Record Separator ([RS])", "RS", true);
 
-    public static CsvValueSeparator getDefaultValueSeparator(String character) {
-        if (character != null) {
-            switch (character) {
-                case "COMMA":
-                case ",":
-                    return COMMA;
-                case "SEMICOLON":
-                case ";":
-                    return SEMICOLON;
-                case "PIPE":
-                case "|":
-                    return PIPE;
-                case "TAB":
-                case "\t":
-                    return TAB;
-                case "COLON":
-                case ":":
-                    return COLON;
-                case "RS":
-                case "\u001E":
-                    return RS;
-                default:
-                    break;
+    public static CsvValueSeparator @NotNull [] values() {
+        return new CsvValueSeparator[]{ COMMA, SEMICOLON, PIPE, TAB, COLON, RS };
+    }
+
+    private static @Nullable CsvValueSeparator getDefaultValueSeparator(@NotNull String character) {
+        for (CsvValueSeparator defaultVS : values()) {
+            if (defaultVS.getCharacter().equals(character) || defaultVS.getName().equals(character)) {
+                return defaultVS;
             }
         }
         return null;
@@ -52,10 +38,6 @@ public static CsvValueSeparator create(String character) {
         return defaultValueSeparator == null ? new CsvValueSeparator(character) : defaultValueSeparator;
     }
 
-    public static CsvValueSeparator[] values() {
-        return new CsvValueSeparator[]{COMMA, SEMICOLON, PIPE, TAB, COLON, RS};
-    }
-
     public static class CsvValueSeparatorConverter extends Converter<CsvValueSeparator> {
         public CsvValueSeparator fromString(@NotNull String value) {
             return CsvValueSeparator.create(XmlStringUtil.unescapeIllegalXmlChars(value));