diff options
| author | 2015-02-09 22:23:45 -0500 | |
|---|---|---|
| committer | 2015-02-09 22:23:45 -0500 | |
| commit | af1041731c8c0ce1846ff7e7b6052ed7327a5dbc (patch) | |
| tree | e781b93f526a6c1ba7b6f5e14c319450199aa1df /src/cuchaz/enigma/analysis/TranslationIndex.java | |
| parent | Don't automatically move mappings around. We're more interested in stability ... (diff) | |
| download | enigma-fork-af1041731c8c0ce1846ff7e7b6052ed7327a5dbc.tar.gz enigma-fork-af1041731c8c0ce1846ff7e7b6052ed7327a5dbc.tar.xz enigma-fork-af1041731c8c0ce1846ff7e7b6052ed7327a5dbc.zip | |
fix translation issues, particularly with fields
Diffstat (limited to '')
| -rw-r--r-- | src/cuchaz/enigma/analysis/TranslationIndex.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cuchaz/enigma/analysis/TranslationIndex.java b/src/cuchaz/enigma/analysis/TranslationIndex.java index 7597c3a..8651ebd 100644 --- a/src/cuchaz/enigma/analysis/TranslationIndex.java +++ b/src/cuchaz/enigma/analysis/TranslationIndex.java | |||
| @@ -37,7 +37,7 @@ import cuchaz.enigma.mapping.BehaviorEntry; | |||
| 37 | import cuchaz.enigma.mapping.ClassEntry; | 37 | import cuchaz.enigma.mapping.ClassEntry; |
| 38 | import cuchaz.enigma.mapping.Entry; | 38 | import cuchaz.enigma.mapping.Entry; |
| 39 | import cuchaz.enigma.mapping.FieldEntry; | 39 | import cuchaz.enigma.mapping.FieldEntry; |
| 40 | import cuchaz.enigma.mapping.JavassistUtil; | 40 | import cuchaz.enigma.mapping.EntryFactory; |
| 41 | import cuchaz.enigma.mapping.Translator; | 41 | import cuchaz.enigma.mapping.Translator; |
| 42 | 42 | ||
| 43 | public class TranslationIndex implements Serializable { | 43 | public class TranslationIndex implements Serializable { |
| @@ -85,23 +85,23 @@ public class TranslationIndex implements Serializable { | |||
| 85 | 85 | ||
| 86 | public void indexClass(CtClass c) { | 86 | public void indexClass(CtClass c) { |
| 87 | 87 | ||
| 88 | ClassEntry classEntry = JavassistUtil.getClassEntry(c); | 88 | ClassEntry classEntry = EntryFactory.getClassEntry(c); |
| 89 | 89 | ||
| 90 | // add the superclass | 90 | // add the superclass |
| 91 | ClassEntry superclassEntry = JavassistUtil.getSuperclassEntry(c); | 91 | ClassEntry superclassEntry = EntryFactory.getSuperclassEntry(c); |
| 92 | if (!isJre(classEntry) && superclassEntry != null && !isJre(superclassEntry)) { | 92 | if (!isJre(classEntry) && superclassEntry != null && !isJre(superclassEntry)) { |
| 93 | m_superclasses.put(classEntry, superclassEntry); | 93 | m_superclasses.put(classEntry, superclassEntry); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | // add fields | 96 | // add fields |
| 97 | for (CtField field : c.getDeclaredFields()) { | 97 | for (CtField field : c.getDeclaredFields()) { |
| 98 | FieldEntry fieldEntry = JavassistUtil.getFieldEntry(field); | 98 | FieldEntry fieldEntry = EntryFactory.getFieldEntry(field); |
| 99 | m_fieldEntries.put(fieldEntry.getClassEntry(), fieldEntry); | 99 | m_fieldEntries.put(fieldEntry.getClassEntry(), fieldEntry); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | // add behaviors | 102 | // add behaviors |
| 103 | for (CtBehavior behavior : c.getDeclaredBehaviors()) { | 103 | for (CtBehavior behavior : c.getDeclaredBehaviors()) { |
| 104 | BehaviorEntry behaviorEntry = JavassistUtil.getBehaviorEntry(behavior); | 104 | BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(behavior); |
| 105 | m_behaviorEntries.put(behaviorEntry.getClassEntry(), behaviorEntry); | 105 | m_behaviorEntries.put(behaviorEntry.getClassEntry(), behaviorEntry); |
| 106 | } | 106 | } |
| 107 | } | 107 | } |