From 73dd55eac2d76c205fbc2ec5b9d27796c0f94d50 Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 3 Nov 2014 15:11:48 +0300 Subject: [PATCH] core: fix code style issues --- jadx-core/src/main/java/jadx/core/ProcessClass.java | 2 +- jadx-core/src/main/java/jadx/core/clsp/ClsSet.java | 4 ++-- .../main/java/jadx/core/clsp/ConvertToClsSet.java | 4 ++-- .../main/java/jadx/core/codegen/AnnotationGen.java | 4 ++-- .../src/main/java/jadx/core/codegen/InsnGen.java | 4 ++-- .../src/main/java/jadx/core/codegen/RegionGen.java | 2 +- .../core/dex/instructions/args/TypeImmutableArg.java | 1 + .../src/main/java/jadx/core/dex/nodes/ClassNode.java | 6 +++--- .../main/java/jadx/core/dex/nodes/MethodNode.java | 5 ++--- .../java/jadx/core/dex/nodes/parser/LocalVar.java | 2 +- .../java/jadx/core/dex/visitors/SimplifyVisitor.java | 2 +- .../dex/visitors/regions/ProcessTryCatchRegions.java | 2 +- .../jadx/core/dex/visitors/regions/RegionMaker.java | 12 ++++++++---- .../src/main/java/jadx/core/utils/ErrorsCounter.java | 4 ++-- .../java/jadx/core/utils/InstructionRemover.java | 4 ---- .../main/java/jadx/core/utils/files/InputFile.java | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/ProcessClass.java b/jadx-core/src/main/java/jadx/core/ProcessClass.java index f23255294..2a47a87ef 100644 --- a/jadx-core/src/main/java/jadx/core/ProcessClass.java +++ b/jadx-core/src/main/java/jadx/core/ProcessClass.java @@ -22,7 +22,7 @@ public final class ProcessClass { DepthTraversal.visit(visitor, cls); } } catch (Exception e) { - LOG.error("Class process exception: " + cls, e); + LOG.error("Class process exception: {}", cls, e); } finally { cls.unload(); } diff --git a/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java b/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java index ff17fab07..ffb284352 100644 --- a/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java +++ b/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java @@ -96,7 +96,7 @@ public class ClsSet { private static NClass getCls(String fullName, Map names) { NClass id = names.get(fullName); if (id == null && !names.containsKey(fullName)) { - LOG.warn("Class not found: " + fullName); + LOG.warn("Class not found: {}", fullName); } return id; } @@ -132,7 +132,7 @@ public class ClsSet { out.writeBytes(JADX_CLS_SET_HEADER); out.writeByte(VERSION); - LOG.info("Classes count: " + classes.length); + LOG.info("Classes count: {}", classes.length); out.writeInt(classes.length); for (NClass cls : classes) { writeString(out, cls.getName()); diff --git a/jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java b/jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java index 020f69a95..43574e282 100644 --- a/jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java +++ b/jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java @@ -39,7 +39,7 @@ public class ConvertToClsSet { } } for (InputFile inputFile : inputFiles) { - LOG.info("Loaded: " + inputFile.getFile()); + LOG.info("Loaded: {}", inputFile.getFile()); } RootNode root = new RootNode(); @@ -48,7 +48,7 @@ public class ConvertToClsSet { ClsSet set = new ClsSet(); set.load(root); set.save(output); - LOG.info("Output: " + output); + LOG.info("Output: {}", output); LOG.info("done"); } diff --git a/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java b/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java index 977728ac6..ad148adce 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java @@ -150,9 +150,9 @@ public class AnnotationGen { // must be a static field FieldInfo field = (FieldInfo) val; InsnGen.makeStaticFieldAccess(code, field, classGen); - } else if (val instanceof List) { + } else if (val instanceof Iterable) { code.add('{'); - Iterator it = ((List) val).iterator(); + Iterator it = ((Iterable) val).iterator(); while (it.hasNext()) { Object obj = it.next(); encodeValue(code, obj); diff --git a/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java b/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java index da08e8eb8..d9b71adc6 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java @@ -25,7 +25,7 @@ import jadx.core.dex.instructions.args.FieldArg; import jadx.core.dex.instructions.args.InsnArg; import jadx.core.dex.instructions.args.InsnWrapArg; import jadx.core.dex.instructions.args.LiteralArg; -import jadx.core.dex.instructions.args.NamedArg; +import jadx.core.dex.instructions.args.Named; import jadx.core.dex.instructions.args.RegisterArg; import jadx.core.dex.instructions.mods.ConstructorInsn; import jadx.core.dex.instructions.mods.TernaryInsn; @@ -98,7 +98,7 @@ public class InsnGen { Flags flag = wrap ? Flags.BODY_ONLY : Flags.BODY_ONLY_NOWRAP; makeInsn(((InsnWrapArg) arg).getWrapInsn(), code, flag); } else if (arg.isNamed()) { - code.add(((NamedArg) arg).getName()); + code.add(((Named) arg).getName()); } else if (arg.isField()) { FieldArg f = (FieldArg) arg; if (f.isStatic()) { diff --git a/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java b/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java index 409fa3ae9..b3dba91a8 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java @@ -292,7 +292,7 @@ public class RegionGen extends InsnGen { makeCatchBlock(code, handler); } else { if (allHandler != null) { - LOG.warn("Several 'all' handlers in try/catch block in " + mth); + LOG.warn("Several 'all' handlers in try/catch block in {}", mth); } allHandler = handler; } diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypeImmutableArg.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypeImmutableArg.java index 850aa61d8..43f21c1a1 100644 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypeImmutableArg.java +++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypeImmutableArg.java @@ -15,6 +15,7 @@ public class TypeImmutableArg extends RegisterArg { @Override public void setType(ArgType type) { + // not allowed } public void markAsThis() { diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java index f9beb11ca..1712a3ee8 100644 --- a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java +++ b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java @@ -132,7 +132,7 @@ public class ClassNode extends LineAttrNode implements ILoadable { try { new AnnotationsParser(this).parse(offset); } catch (DecodeException e) { - LOG.error("Error parsing annotations in " + this, e); + LOG.error("Error parsing annotations in {}", this, e); } } } @@ -184,7 +184,7 @@ public class ClassNode extends LineAttrNode implements ILoadable { } } } catch (JadxRuntimeException e) { - LOG.error("Class signature parse error: " + this, e); + LOG.error("Class signature parse error: {}", this, e); } } @@ -198,7 +198,7 @@ public class ClassNode extends LineAttrNode implements ILoadable { field.setType(gType); } } catch (JadxRuntimeException e) { - LOG.error("Field signature parse error: " + field, e); + LOG.error("Field signature parse error: {}", field, e); } } } diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java index 3ac3aa825..661bbb635 100644 --- a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java +++ b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java @@ -147,8 +147,7 @@ public class MethodNode extends LineAttrNode implements ILoadable { return false; } if (!mthInfo.isConstructor()) { - LOG.warn("Wrong signature parse result: " + sp + " -> " + argsTypes - + ", not generic version: " + mthArgs); + LOG.warn("Wrong signature parse result: {} -> {}, not generic version: {}", sp, argsTypes, mthArgs); return false; } else if (getParentClass().getAccessFlags().isEnum()) { // TODO: @@ -164,7 +163,7 @@ public class MethodNode extends LineAttrNode implements ILoadable { } initArguments(argsTypes); } catch (JadxRuntimeException e) { - LOG.error("Method signature parse error: " + this, e); + LOG.error("Method signature parse error: {}", this, e); return false; } return true; diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java index d9be53818..370287c5b 100644 --- a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java +++ b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java @@ -41,7 +41,7 @@ final class LocalVar { type = gType; } } catch (Exception e) { - LOG.error("Can't parse signature for local variable: " + sign, e); + LOG.error("Can't parse signature for local variable: {}", sign, e); } } this.name = name; diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java index 54eb00eec..2607accaa 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java @@ -104,7 +104,7 @@ public class SimplifyVisitor extends AbstractVisitor { && ((LiteralArg) insn.getArg(1)).getLiteral() == 0) { insn.changeCondition(insn.getOp(), wi.getArg(0), wi.getArg(1)); } else { - LOG.warn("TODO: cmp" + insn); + LOG.warn("TODO: cmp {}", insn); } } } diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java index 71e36106f..a19a54e89 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java @@ -100,7 +100,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor { TryCatchBlock prevTB = tryBlocksMap.put(domBlock, tb); if (prevTB != null) { - LOG.info("!!! TODO: merge try blocks in " + mth); + LOG.info("!!! TODO: merge try blocks in {}", mth); } } } diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java index a1e5d9571..2c52b3ce2 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java @@ -70,7 +70,7 @@ public class RegionMaker { if (Consts.DEBUG) { int id = startBlock.getId(); if (processedBlocks.get(id)) { - LOG.debug(" Block already processed: " + startBlock + ", mth: " + mth); + LOG.debug(" Block already processed: {}, mth: {}", startBlock, mth); } else { processedBlocks.set(id); } @@ -502,9 +502,13 @@ public class RegionMaker { // invert simple condition (compiler often do it) currentIf = IfInfo.invert(currentIf); } - currentIf = IfMakerHelper.restructureIf(mth, block, currentIf); - if (currentIf == null) { - // invalid merged if, check simple one again + IfInfo modifiedIf = IfMakerHelper.restructureIf(mth, block, currentIf); + if (modifiedIf != null) { + currentIf = modifiedIf; + } else { + if (currentIf.getMergedBlocks().size() <= 1) { + return null; + } currentIf = makeIfInfo(block); currentIf = IfMakerHelper.restructureIf(mth, block, currentIf); if (currentIf == null) { diff --git a/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java b/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java index e4c2d3c52..b33ac654f 100644 --- a/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java +++ b/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java @@ -73,7 +73,7 @@ public class ErrorsCounter { public void printReport() { if (getErrorCount() > 0) { - LOG.error(getErrorCount() + " errors occurred in following nodes:"); + LOG.error("{} errors occurred in following nodes:", getErrorCount()); List nodes = new ArrayList(errorNodes); Collections.sort(nodes, new Comparator() { @Override @@ -83,7 +83,7 @@ public class ErrorsCounter { }); for (Object node : nodes) { String nodeName = node.getClass().getSimpleName().replace("Node", ""); - LOG.error(" " + nodeName + ": " + node); + LOG.error(" {}: {}", nodeName, node); } } } diff --git a/jadx-core/src/main/java/jadx/core/utils/InstructionRemover.java b/jadx-core/src/main/java/jadx/core/utils/InstructionRemover.java index 447d13201..ecd8d1e41 100644 --- a/jadx-core/src/main/java/jadx/core/utils/InstructionRemover.java +++ b/jadx-core/src/main/java/jadx/core/utils/InstructionRemover.java @@ -1,6 +1,5 @@ package jadx.core.utils; -import jadx.core.Consts; import jadx.core.dex.attributes.AFlag; import jadx.core.dex.instructions.args.InsnArg; import jadx.core.dex.instructions.args.InsnWrapArg; @@ -66,9 +65,6 @@ public class InstructionRemover { public static void unbindInsn(MethodNode mth, InsnNode insn) { RegisterArg r = insn.getResult(); if (r != null && r.getSVar() != null) { - if (Consts.DEBUG && r.getSVar().getUseCount() != 0) { - LOG.debug("Unbind insn with result: {}", insn); - } mth.removeSVar(r.getSVar()); } for (InsnArg arg : insn.getArguments()) { diff --git a/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java b/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java index 6421e2364..dd45b4dbf 100644 --- a/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java +++ b/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java @@ -66,7 +66,7 @@ public class InputFile { if (ba.length == 0) { throw new JadxException(j2d.isError() ? j2d.getDxErrors() : "Empty dx output"); } else if (j2d.isError()) { - LOG.warn("dx message: " + j2d.getDxErrors()); + LOG.warn("dx message: {}", j2d.getDxErrors()); } return new Dex(ba); } catch (Throwable e) {