From 6032f55ede3c1b550cfd83b2f768926c992d9a98 Mon Sep 17 00:00:00 2001
From: Thog
Date: Fri, 12 Aug 2016 19:59:54 +0200
Subject: Remoe JSON directory format support and clean up others things

---
 src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java    | 10 ++--------
 src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java |  2 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
index 944e486..4a77eec 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
@@ -241,10 +241,7 @@ public class ClassRenamer {
     private static String renameClassSignature(String signature, ReplacerClassMap map) {
         try {
             ClassSignature type = renameType(SignatureAttribute.toClassSignature(signature), map);
-            if (type != null) {
-                return type.encode();
-            }
-            return null;
+            return type.encode();
         } catch (BadBytecode ex) {
             throw new Error("Can't parse field signature: " + signature);
         }
@@ -265,10 +262,7 @@ public class ClassRenamer {
     private static String renameMethodSignature(String signature, ReplacerClassMap map) {
         try {
             MethodSignature type = renameType(SignatureAttribute.toMethodSignature(signature), map);
-            if (type != null) {
-                return type.encode();
-            }
-            return null;
+            return type.encode();
         } catch (BadBytecode ex) {
             throw new Error("Can't parse method signature: " + signature);
         }
diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java b/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
index 8fdd851..6c05b83 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -68,6 +68,8 @@ public class ClassTranslator {
                     }
                 }
                 break;
+                default:
+                    break;
             }
         }
 
-- 
cgit v1.2.3