diff options
| author | 2017-03-07 21:24:39 +0100 | |
|---|---|---|
| committer | 2017-03-07 21:30:02 +0100 | |
| commit | b4aaff683d78ab92b83f3a7257c33b8e27d1affa (patch) | |
| tree | f23c9bb0927d83cc7302881266b7df8fd37959c7 /src/main/java/cuchaz/enigma/mapping/FieldMapping.java | |
| parent | Avoid crash of the matcher when the obf name is invalid (set a deob it using ... (diff) | |
| download | enigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.tar.gz enigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.tar.xz enigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.zip | |
Drop unix case style and implement hashCode when equals is overrided
Also update Guava to version 21
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/FieldMapping.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/mapping/FieldMapping.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java index 83e2277..22ba307 100644 --- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java +++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java | |||
| @@ -92,14 +92,12 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie | |||
| 92 | 92 | ||
| 93 | public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) { | 93 | public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) { |
| 94 | // rename obf classes in the type | 94 | // rename obf classes in the type |
| 95 | Type newType = new Type(this.obfType, new ClassNameReplacer() { | 95 | Type newType = new Type(this.obfType, className -> |
| 96 | @Override | 96 | { |
| 97 | public String replace(String className) { | 97 | if (className.equals(oldObfClassName)) { |
| 98 | if (className.equals(oldObfClassName)) { | 98 | return newObfClassName; |
| 99 | return newObfClassName; | ||
| 100 | } | ||
| 101 | return null; | ||
| 102 | } | 99 | } |
| 100 | return null; | ||
| 103 | }); | 101 | }); |
| 104 | 102 | ||
| 105 | if (!newType.equals(this.obfType)) { | 103 | if (!newType.equals(this.obfType)) { |