From 7f63baab37acec7e6c9946365943e2a1c70b2dc3 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 27 Sep 2017 16:02:42 +0700 Subject: [PATCH] Collections.addAll applied; some more warnings fixed --- .../modules/decompiler/FinallyProcessor.java | 3 +- .../modules/decompiler/SequenceHelper.java | 4 +-- .../decompiler/SimplifyExprentsHelper.java | 34 +++++-------------- .../deobfuscator/ExceptionDeobfuscator.java | 3 +- .../decompiler/exps/FunctionExprent.java | 3 +- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java index 0123691..cbd42a7 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java @@ -898,8 +898,7 @@ public class FinallyProcessor { newblock.setSeq(seq); newblock.getInstrOldOffsets().addAll(oldOffsets); - List lstTemp = new ArrayList<>(); - lstTemp.addAll(sample.getSuccs()); + List lstTemp = new ArrayList<>(sample.getSuccs()); // move successors for (BasicBlock suc : lstTemp) { diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java index 05c7bd5..b96d3a5 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java @@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.modules.decompiler; import org.jetbrains.java.decompiler.code.cfg.BasicBlock; import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.main.collectors.CounterContainer; -import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; @@ -39,8 +38,7 @@ public class SequenceHelper { if (stat.type == Statement.TYPE_SEQUENCE) { - List lst = new ArrayList<>(); - lst.addAll(stat.getStats()); + List lst = new ArrayList<>(stat.getStats()); boolean unfolded = false; diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java index 0be7d59..0e7e139 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java @@ -15,30 +15,12 @@ */ package org.jetbrains.java.decompiler.modules.decompiler; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; import org.jetbrains.java.decompiler.main.rels.ClassWrapper; -import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; -import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.*; import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx; import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; @@ -49,6 +31,9 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine; import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; import org.jetbrains.java.decompiler.util.InterpreterUtil; +import java.util.*; +import java.util.Map.Entry; + public class SimplifyExprentsHelper { static final MatchEngine class14Builder = new MatchEngine(); @@ -813,8 +798,7 @@ public class SimplifyExprentsHelper { } if (found) { - List data = new ArrayList<>(); - data.addAll(stif.getFirst().getExprents()); + List data = new ArrayList<>(stif.getFirst().getExprents()); data.add(new AssignmentExprent(ifvar, new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList( @@ -859,8 +843,7 @@ public class SimplifyExprentsHelper { return false; } - List data = new ArrayList<>(); - data.addAll(stif.getFirst().getExprents()); + List data = new ArrayList<>(stif.getFirst().getExprents()); data.add(new ExitExprent(ifex.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList( @@ -926,9 +909,8 @@ public class SimplifyExprentsHelper { FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$"); assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null)); - - List data = new ArrayList<>(); - data.addAll(stat.getFirst().getExprents()); + + List data = new ArrayList<>(stat.getFirst().getExprents()); stat.setExprents(data); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java index 0826e8b..9e46ce3 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java @@ -172,9 +172,8 @@ public class ExceptionDeobfuscator { BasicBlock emptyblock = new BasicBlock(++graph.last_id); graph.getBlocks().addWithKey(emptyblock, emptyblock.id); - List lstTemp = new ArrayList<>(); // only exception predecessors considered - lstTemp.addAll(handler.getPredExceptions()); + List lstTemp = new ArrayList<>(handler.getPredExceptions()); // replace predecessors for (BasicBlock pred : lstTemp) { diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java index 0cc0025..02e6371 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java @@ -413,8 +413,7 @@ public class FunctionExprent extends Exprent { @Override public List getAllExprents() { - List lst = new ArrayList<>(); - lst.addAll(lstOperands); + List lst = new ArrayList<>(lstOperands); return lst; }