Make sure to use UTF-8 in any case for I/O, change "Mark as deobfuscated" key and clean up

3 files changed, 1 insertions, 35 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/EntryPair.java b/src/main/java/cuchaz/enigma/mapping/EntryPair.java
deleted file mode 100644
index 1c93d53..0000000
--- a/src/main/java/cuchaz/enigma/mapping/EntryPair.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-package cuchaz.enigma.mapping;
-
-public class EntryPair<T extends Entry> {
-
-    public T obf;
-    public T deobf;
-
-    public EntryPair(T obf, T deobf) {
-        this.obf = obf;
-        this.deobf = deobf;
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
index 7c6c831..e35ef3e 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -13,6 +13,7 @@ package cuchaz.enigma.mapping;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
diff --git a/src/main/java/cuchaz/enigma/mapping/NameValidator.java b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
index 7be83c7..6925b72 100644
--- a/src/main/java/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
@@ -30,19 +30,6 @@ public class NameValidator {
     );
 
     static {
-
-        // java allows all kinds of weird characters...
-        StringBuilder startChars = new StringBuilder();
-        StringBuilder partChars = new StringBuilder();
-        for (int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++) {
-            if (Character.isJavaIdentifierStart(i)) {
-                startChars.appendCodePoint(i);
-            }
-            if (Character.isJavaIdentifierPart(i)) {
-                partChars.appendCodePoint(i);
-            }
-        }
-
         String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*";
         IdentifierPattern = Pattern.compile(identifierRegex);
         ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));