diff options
| author | 2019-09-05 07:03:04 -0400 | |
|---|---|---|
| committer | 2019-09-05 07:03:04 -0400 | |
| commit | e4f5bc8af7c524f7b8d880afd90a1c4d011ddb41 (patch) | |
| tree | b545912704355c4f1f9ca5bdbe2172d88339fe99 /src/main | |
| parent | Add Proguard format (diff) | |
| download | enigma-e4f5bc8af7c524f7b8d880afd90a1c4d011ddb41.tar.gz enigma-e4f5bc8af7c524f7b8d880afd90a1c4d011ddb41.tar.xz enigma-e4f5bc8af7c524f7b8d880afd90a1c4d011ddb41.zip | |
Update ProguardMappingsReader.java
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java | 5 |
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 @@ | |||
| 1 | package cuchaz.enigma.translation.mapping.serde; | 1 | package cuchaz.enigma.translation.mapping.serde; |
| 2 | 2 | ||
| 3 | import com.google.common.base.Charsets; | ||
| 4 | import cuchaz.enigma.ProgressListener; | 3 | import cuchaz.enigma.ProgressListener; |
| 5 | import cuchaz.enigma.command.MappingCommandsUtil; | 4 | import cuchaz.enigma.command.MappingCommandsUtil; |
| 6 | import cuchaz.enigma.throwables.MappingParseException; | 5 | import cuchaz.enigma.throwables.MappingParseException; |
| @@ -15,6 +14,7 @@ import cuchaz.enigma.translation.representation.entry.FieldEntry; | |||
| 15 | import cuchaz.enigma.translation.representation.entry.MethodEntry; | 14 | import cuchaz.enigma.translation.representation.entry.MethodEntry; |
| 16 | 15 | ||
| 17 | import java.io.IOException; | 16 | import java.io.IOException; |
| 17 | import java.nio.charset.StandardCharsets; | ||
| 18 | import java.nio.file.Files; | 18 | import java.nio.file.Files; |
| 19 | import java.nio.file.Path; | 19 | import java.nio.file.Path; |
| 20 | import java.util.regex.Matcher; | 20 | import 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()) { |