summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/bytecode
diff options
context:
space:
mode:
authorGravatar lclc982016-07-02 20:13:13 +1000
committerGravatar lclc982016-07-02 20:13:13 +1000
commit74edc74c2c7b3236f00bf92499bb884837673b7d (patch)
tree155556b4d6e390574f16082583f2853e35e3c716 /src/main/java/cuchaz/enigma/bytecode
parentRenamed Fields (diff)
downloadenigma-fork-74edc74c2c7b3236f00bf92499bb884837673b7d.tar.gz
enigma-fork-74edc74c2c7b3236f00bf92499bb884837673b7d.tar.xz
enigma-fork-74edc74c2c7b3236f00bf92499bb884837673b7d.zip
Reformatting code
Diffstat (limited to 'src/main/java/cuchaz/enigma/bytecode')
-rw-r--r--src/main/java/cuchaz/enigma/bytecode/InfoType.java5
-rw-r--r--src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java2
-rw-r--r--src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java2
3 files changed, 3 insertions, 6 deletions
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 {
253 253
254 public boolean selfIndexIsValid(ConstInfoAccessor entry, ConstPoolEditor pool) { 254 public boolean selfIndexIsValid(ConstInfoAccessor entry, ConstPoolEditor pool) {
255 ConstInfoAccessor entryCheck = pool.getItem(entry.getIndex()); 255 ConstInfoAccessor entryCheck = pool.getItem(entry.getIndex());
256 if (entryCheck == null) { 256 return entryCheck != null && entryCheck.getItem().equals(entry.getItem());
257 return false;
258 }
259 return entryCheck.getItem().equals(entry.getItem());
260 } 257 }
261 258
262 public static InfoType getByTag(int tag) { 259 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 {
54 } 54 }
55 55
56 // get the list of argument names 56 // get the list of argument names
57 List<String> names = new ArrayList<String>(numParams); 57 List<String> names = new ArrayList<>(numParams);
58 for (int i = 0; i < numParams; i++) { 58 for (int i = 0; i < numParams; i++) {
59 names.add(this.translator.translate(new ArgumentEntry(behaviorEntry, i, ""))); 59 names.add(this.translator.translate(new ArgumentEntry(behaviorEntry, i, "")));
60 } 60 }
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 {
30 30
31 // add the names to the class const pool 31 // add the names to the class const pool
32 ConstPool constPool = info.getConstPool(); 32 ConstPool constPool = info.getConstPool();
33 List<Integer> parameterNameIndices = new ArrayList<Integer>(); 33 List<Integer> parameterNameIndices = new ArrayList<>();
34 for (String name : names) { 34 for (String name : names) {
35 if (name != null) { 35 if (name != null) {
36 parameterNameIndices.add(constPool.addUtf8Info(name)); 36 parameterNameIndices.add(constPool.addUtf8Info(name));