From 74edc74c2c7b3236f00bf92499bb884837673b7d Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 20:13:13 +1000 Subject: Reformatting code --- src/main/java/cuchaz/enigma/bytecode/InfoType.java | 5 +---- src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java | 2 +- src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/cuchaz/enigma/bytecode') diff --git a/src/main/java/cuchaz/enigma/bytecode/InfoType.java b/src/main/java/cuchaz/enigma/bytecode/InfoType.java index 86e57ab..bd9e7d1 100644 --- a/src/main/java/cuchaz/enigma/bytecode/InfoType.java +++ b/src/main/java/cuchaz/enigma/bytecode/InfoType.java @@ -253,10 +253,7 @@ public enum InfoType { public boolean selfIndexIsValid(ConstInfoAccessor entry, ConstPoolEditor pool) { ConstInfoAccessor entryCheck = pool.getItem(entry.getIndex()); - if (entryCheck == null) { - return false; - } - return entryCheck.getItem().equals(entry.getItem()); + return entryCheck != null && entryCheck.getItem().equals(entry.getItem()); } public static InfoType getByTag(int tag) { diff --git a/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java b/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java index 17ecbbe..28ad04a 100644 --- a/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java +++ b/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java @@ -54,7 +54,7 @@ public class MethodParameterWriter { } // get the list of argument names - List names = new ArrayList(numParams); + List names = new ArrayList<>(numParams); for (int i = 0; i < numParams; i++) { names.add(this.translator.translate(new ArgumentEntry(behaviorEntry, i, ""))); } diff --git a/src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java b/src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java index ee7ed87..bace3a0 100644 --- a/src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java +++ b/src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java @@ -30,7 +30,7 @@ public class MethodParametersAttribute extends AttributeInfo { // add the names to the class const pool ConstPool constPool = info.getConstPool(); - List parameterNameIndices = new ArrayList(); + List parameterNameIndices = new ArrayList<>(); for (String name : names) { if (name != null) { parameterNameIndices.add(constPool.addUtf8Info(name)); -- cgit v1.2.3