diff options
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/FieldMapping.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/mapping/FieldMapping.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java index 1b59660..e75485c 100644 --- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java +++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java | |||
| @@ -15,16 +15,19 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie | |||
| 15 | private String obfName; | 15 | private String obfName; |
| 16 | private String deobfName; | 16 | private String deobfName; |
| 17 | private Type obfType; | 17 | private Type obfType; |
| 18 | private Mappings.EntryModifier modifier; | ||
| 18 | 19 | ||
| 19 | public FieldMapping(String obfName, Type obfType, String deobfName) { | 20 | public FieldMapping(String obfName, Type obfType, String deobfName, Mappings.EntryModifier modifier) { |
| 20 | this.obfName = obfName; | 21 | this.obfName = obfName; |
| 21 | this.deobfName = NameValidator.validateFieldName(deobfName); | 22 | this.deobfName = NameValidator.validateFieldName(deobfName); |
| 22 | this.obfType = obfType; | 23 | this.obfType = obfType; |
| 24 | this.modifier = modifier; | ||
| 23 | } | 25 | } |
| 24 | 26 | ||
| 25 | public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) { | 27 | public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) { |
| 26 | this.obfName = other.obfName; | 28 | this.obfName = other.obfName; |
| 27 | this.deobfName = other.deobfName; | 29 | this.deobfName = other.deobfName; |
| 30 | this.modifier = other.modifier; | ||
| 28 | this.obfType = new Type(other.obfType, obfClassNameReplacer); | 31 | this.obfType = new Type(other.obfType, obfClassNameReplacer); |
| 29 | } | 32 | } |
| 30 | 33 | ||
| @@ -58,6 +61,16 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie | |||
| 58 | this.obfType = val; | 61 | this.obfType = val; |
| 59 | } | 62 | } |
| 60 | 63 | ||
| 64 | public void setModifier(Mappings.EntryModifier modifier) | ||
| 65 | { | ||
| 66 | this.modifier = modifier; | ||
| 67 | } | ||
| 68 | |||
| 69 | public Mappings.EntryModifier getModifier() | ||
| 70 | { | ||
| 71 | return modifier; | ||
| 72 | } | ||
| 73 | |||
| 61 | @Override | 74 | @Override |
| 62 | public int compareTo(FieldMapping other) { | 75 | public int compareTo(FieldMapping other) { |
| 63 | return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType); | 76 | return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType); |