From 97e8426698d404fd64fa832cbb63524bb6a17afb Mon Sep 17 00:00:00 2001
From: Thog
Date: Mon, 31 Oct 2016 14:29:28 +0100
Subject: Fix matcher (blame @asiekierka) + add a dirty hack for inner class
 inside another inner class

---
 src/main/java/cuchaz/enigma/convert/ClassIdentity.java     | 2 +-
 src/main/java/cuchaz/enigma/convert/MappingsConverter.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/convert')

diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
index 4d1b3ca..7360011 100644
--- a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
@@ -58,7 +58,7 @@ public class ClassIdentity {
 
             // classes not in the none package can be passed through
             ClassEntry classEntry = new ClassEntry(className);
-            if (!classEntry.getClassName().contains("/")) {
+            if (classEntry.getPackageName() != null) {
                 return className;
             }
 
diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
index 01de9a5..9b06a51 100644
--- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
@@ -235,7 +235,7 @@ public class MappingsConverter {
 
         // non obfuscated classes can be migrated
         ClassEntry classEntry = oldObfType.getClassEntry();
-        if (!classEntry.getClassName().contains("/")) {
+        if (classEntry.getPackageName() != null) {
             return true;
         }
 
-- 
cgit v1.2.3