diff options
Diffstat (limited to 'src/org/jetbrains/java/decompiler/struct')
6 files changed, 13 insertions, 10 deletions
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java index 08101d2..e3de510 100644 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java @@ -216,8 +216,11 @@ public class StructMethod implements CodeConstants { } } - private void readAttribute(DataInputFullStream in, ConstantPool pool, VBStyleCollection<StructGeneralAttribute, String> lstAttribute, - int attr_nameindex, String attrname) throws IOException { + private static void readAttribute(DataInputFullStream in, + ConstantPool pool, + VBStyleCollection<StructGeneralAttribute, String> lstAttribute, + int attr_nameindex, + String attrname) throws IOException { StructGeneralAttribute attribute = StructGeneralAttribute.getMatchingAttributeInstance(attr_nameindex, attrname); diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java index a352213..1b21828 100644 --- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java +++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java @@ -252,7 +252,7 @@ public class ConstantPool { buffer.append("["); } - buffer.append("L" + newname + ";"); + buffer.append("L").append(newname).append(";"); } else { buffer.append(newname); diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java index 1b6ff99..a58898a 100644 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java @@ -306,7 +306,7 @@ public class VarType { // TODO: optimize switch } } - private int getType(char c) { + private static int getType(char c) { switch (c) { case 'B': return CodeConstants.TYPE_BYTE; @@ -343,7 +343,7 @@ public class VarType { // TODO: optimize switch } } - private String getChar(int type) { + private static String getChar(int type) { switch (type) { case CodeConstants.TYPE_BYTE: return "B"; diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java index 6a4f52e..a2df8f5 100644 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java @@ -221,7 +221,7 @@ public class GenericMain { String res = name.replace('/', '.'); - if (res.indexOf("$") >= 0) { + if (res.contains("$")) { StructClass cl = DecompilerContext.getStructcontext().getClass(name); if (cl == null || !cl.isOwn()) { res = res.replace('$', '.'); diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java index 61d07a0..160a0ac 100644 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java @@ -105,7 +105,7 @@ public class GenericType { } } - private String getNextClassSignature(String value) { + private static String getNextClassSignature(String value) { int counter = 0; int index = 0; @@ -131,7 +131,7 @@ public class GenericType { return value.substring(0, index); } - private void parseArgumentsList(String value, GenericType type) { + private static void parseArgumentsList(String value, GenericType type) { if (value == null) { return; @@ -214,7 +214,7 @@ public class GenericType { return value.substring(0, index + 1); } - private int getType(char c) { + private static int getType(char c) { switch (c) { case 'B': return CodeConstants.TYPE_BYTE; diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java index ad87235..8673c21 100644 --- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java +++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java @@ -158,7 +158,7 @@ public class LazyLoader { return link == null ? null : getClassStream(link.externPath, link.internPath); } - private void skipAttributes(DataInputFullStream in) throws IOException { + private static void skipAttributes(DataInputFullStream in) throws IOException { int length = in.readUnsignedShort(); for (int i = 0; i < length; i++) { |