summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/mapping
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping')
-rw-r--r--src/main/java/cuchaz/enigma/mapping/EntryPair.java22
-rw-r--r--src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java1
-rw-r--r--src/main/java/cuchaz/enigma/mapping/NameValidator.java13
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 @@
1/*******************************************************************************
2 * Copyright (c) 2015 Jeff Martin.
3 * All rights reserved. This program and the accompanying materials
4 * are made available under the terms of the GNU Lesser General Public
5 * License v3.0 which accompanies this distribution, and is available at
6 * http://www.gnu.org/licenses/lgpl.html
7 * <p>
8 * Contributors:
9 * Jeff Martin - initial API and implementation
10 ******************************************************************************/
11package cuchaz.enigma.mapping;
12
13public class EntryPair<T extends Entry> {
14
15 public T obf;
16 public T deobf;
17
18 public EntryPair(T obf, T deobf) {
19 this.obf = obf;
20 this.deobf = deobf;
21 }
22}
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;
13import java.io.IOException; 13import java.io.IOException;
14import java.io.ObjectOutputStream; 14import java.io.ObjectOutputStream;
15import java.io.OutputStream; 15import java.io.OutputStream;
16import java.io.Serializable;
16import java.util.List; 17import java.util.List;
17import java.util.Set; 18import java.util.Set;
18import java.util.zip.GZIPOutputStream; 19import 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 {
30 ); 30 );
31 31
32 static { 32 static {
33
34 // java allows all kinds of weird characters...
35 StringBuilder startChars = new StringBuilder();
36 StringBuilder partChars = new StringBuilder();
37 for (int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++) {
38 if (Character.isJavaIdentifierStart(i)) {
39 startChars.appendCodePoint(i);
40 }
41 if (Character.isJavaIdentifierPart(i)) {
42 partChars.appendCodePoint(i);
43 }
44 }
45
46 String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*"; 33 String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*";
47 IdentifierPattern = Pattern.compile(identifierRegex); 34 IdentifierPattern = Pattern.compile(identifierRegex);
48 ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex)); 35 ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));