From e0e3141619cecd54c087d964654e6c35511c48f9 Mon Sep 17 00:00:00 2001
From: Thog
Date: Tue, 6 Sep 2016 12:11:50 +0200
Subject: A little bit of clean up

---
 .../java/cuchaz/enigma/convert/MappingsConverter.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
index abb1bea..a80d9ce 100644
--- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
@@ -11,10 +11,6 @@
 package cuchaz.enigma.convert;
 
 import com.google.common.collect.*;
-
-import java.util.*;
-import java.util.jar.JarFile;
-
 import cuchaz.enigma.Constants;
 import cuchaz.enigma.Deobfuscator;
 import cuchaz.enigma.analysis.JarIndex;
@@ -22,6 +18,9 @@ import cuchaz.enigma.convert.ClassNamer.SidedClassNamer;
 import cuchaz.enigma.mapping.*;
 import cuchaz.enigma.throwables.MappingConflict;
 
+import java.util.*;
+import java.util.jar.JarFile;
+
 public class MappingsConverter {
 
     public static ClassMatches computeClassMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) {
@@ -365,14 +364,12 @@ public class MappingsConverter {
             public Set<BehaviorEntry> filterEntries(Collection<BehaviorEntry> obfDestFields, BehaviorEntry obfSourceField, ClassMatches classMatches) {
                 Set<BehaviorEntry> out = Sets.newHashSet();
                 for (BehaviorEntry obfDestField : obfDestFields) {
-                    Signature translatedDestSignature = translate(obfDestField.getSignature(), classMatches.getUniqueMatches().inverse());
-                    if (translatedDestSignature == null && obfSourceField.getSignature() == null) {
+                    Signature translatedDestSignature = translate(obfDestField.getSignature(),
+                            classMatches.getUniqueMatches().inverse());
+                    if ((translatedDestSignature == null && obfSourceField.getSignature() == null)
+                            || translatedDestSignature != null && obfSourceField.getSignature() != null
+                            && translatedDestSignature.equals(obfSourceField.getSignature()))
                         out.add(obfDestField);
-                    } else if (translatedDestSignature == null || obfSourceField.getSignature() == null) {
-                        // skip it
-                    } else if (translatedDestSignature.equals(obfSourceField.getSignature())) {
-                        out.add(obfDestField);
-                    }
                 }
                 return out;
             }
-- 
cgit v1.2.3