summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java
index 76f0923e..b5ede394 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java
@@ -1,6 +1,5 @@
1package cuchaz.enigma.translation.mapping.serde; 1package cuchaz.enigma.translation.mapping.serde;
2 2
3import com.google.common.base.Charsets;
4import cuchaz.enigma.ProgressListener; 3import cuchaz.enigma.ProgressListener;
5import cuchaz.enigma.command.MappingCommandsUtil; 4import cuchaz.enigma.command.MappingCommandsUtil;
6import cuchaz.enigma.throwables.MappingParseException; 5import cuchaz.enigma.throwables.MappingParseException;
@@ -15,6 +14,7 @@ import cuchaz.enigma.translation.representation.entry.FieldEntry;
15import cuchaz.enigma.translation.representation.entry.MethodEntry; 14import cuchaz.enigma.translation.representation.entry.MethodEntry;
16 15
17import java.io.IOException; 16import java.io.IOException;
17import java.nio.charset.StandardCharsets;
18import java.nio.file.Files; 18import java.nio.file.Files;
19import java.nio.file.Path; 19import java.nio.file.Path;
20import java.util.regex.Matcher; 20import java.util.regex.Matcher;
@@ -31,14 +31,13 @@ public class ProguardMappingsReader implements MappingsReader {
31 31
32 public ProguardMappingsReader() {} 32 public ProguardMappingsReader() {}
33 33
34
35 @Override 34 @Override
36 public EntryTree<EntryMapping> read(Path path, ProgressListener progress, MappingSaveParameters saveParameters) throws MappingParseException, IOException { 35 public EntryTree<EntryMapping> read(Path path, ProgressListener progress, MappingSaveParameters saveParameters) throws MappingParseException, IOException {
37 EntryTree<EntryMapping> mappings = new HashEntryTree<>(); 36 EntryTree<EntryMapping> mappings = new HashEntryTree<>();
38 37
39 int lineNumber = 0; 38 int lineNumber = 0;
40 ClassEntry currentClass = null; 39 ClassEntry currentClass = null;
41 for (String line : Files.readAllLines(path, Charsets.UTF_8)) { 40 for (String line : Files.readAllLines(path, StandardCharsets.UTF_8)) {
42 lineNumber++; 41 lineNumber++;
43 42
44 if (line.startsWith("#") || line.isEmpty()) { 43 if (line.startsWith("#") || line.isEmpty()) {