diff options
Diffstat (limited to 'src/cuchaz')
| -rw-r--r-- | src/cuchaz/enigma/mapping/MappingsReader.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/cuchaz/enigma/mapping/MappingsReader.java b/src/cuchaz/enigma/mapping/MappingsReader.java index 4cebb3a4..d64bcaae 100644 --- a/src/cuchaz/enigma/mapping/MappingsReader.java +++ b/src/cuchaz/enigma/mapping/MappingsReader.java | |||
| @@ -150,9 +150,22 @@ public class MappingsReader | |||
| 150 | 150 | ||
| 151 | private ClassMapping readClass( Scanner scanner ) | 151 | private ClassMapping readClass( Scanner scanner ) |
| 152 | { | 152 | { |
| 153 | return new ClassMapping( scanner.next(), scanner.next() ); | 153 | return new ClassMapping( |
| 154 | moveOutOfDefaultPackage( scanner.next(), "default" ), | ||
| 155 | moveOutOfDefaultPackage( scanner.next(), "default" ) | ||
| 156 | ); | ||
| 154 | } | 157 | } |
| 155 | 158 | ||
| 159 | private String moveOutOfDefaultPackage( String className, String newPackageName ) | ||
| 160 | { | ||
| 161 | ClassEntry classEntry = new ClassEntry( className ); | ||
| 162 | if( classEntry.isInDefaultPackage() ) | ||
| 163 | { | ||
| 164 | return newPackageName + "/" + classEntry.getName(); | ||
| 165 | } | ||
| 166 | return className; | ||
| 167 | } | ||
| 168 | |||
| 156 | private FieldMapping readField( Scanner scanner ) | 169 | private FieldMapping readField( Scanner scanner ) |
| 157 | { | 170 | { |
| 158 | return new FieldMapping( scanner.next(), scanner.next() ); | 171 | return new FieldMapping( scanner.next(), scanner.next() ); |