From 486152b09706d9b64e83c18b508e960ad809f0e0 Mon Sep 17 00:00:00 2001
From: jeff
Date: Sat, 23 Aug 2014 23:47:18 -0400
Subject: MappingsReader will convert old classnames in the default package to
 the "default" package

---
 src/cuchaz/enigma/mapping/MappingsReader.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/cuchaz/enigma/mapping/MappingsReader.java')

diff --git a/src/cuchaz/enigma/mapping/MappingsReader.java b/src/cuchaz/enigma/mapping/MappingsReader.java
index 4cebb3a..d64bcaa 100644
--- a/src/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/cuchaz/enigma/mapping/MappingsReader.java
@@ -150,9 +150,22 @@ public class MappingsReader
 
 	private ClassMapping readClass( Scanner scanner )
 	{
-		return new ClassMapping( scanner.next(), scanner.next() );
+		return new ClassMapping(
+			moveOutOfDefaultPackage( scanner.next(), "default" ),
+			moveOutOfDefaultPackage( scanner.next(), "default" )
+		);
 	}
 	
+	private String moveOutOfDefaultPackage( String className, String newPackageName )
+	{
+		ClassEntry classEntry = new ClassEntry( className );
+		if( classEntry.isInDefaultPackage() )
+		{
+			return newPackageName + "/" + classEntry.getName();
+		}
+		return className;
+	}
+
 	private FieldMapping readField( Scanner scanner )
 	{
 		return new FieldMapping( scanner.next(), scanner.next() );
-- 
cgit v1.2.3