diff --git a/jadx-core/src/main/java/jadx/core/ProcessClass.java b/jadx-core/src/main/java/jadx/core/ProcessClass.java index a456d30283cd844aab009c125e553b35bbb3b578..af42dc5a0afacb41d7c8b580273eb7dcfb973b0a 100644 --- a/jadx-core/src/main/java/jadx/core/ProcessClass.java +++ b/jadx-core/src/main/java/jadx/core/ProcessClass.java @@ -1,7 +1,7 @@ package jadx.core; import jadx.core.dex.nodes.ClassNode; -import jadx.core.dex.visitors.DepthTraverser; +import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; import jadx.core.utils.exceptions.DecodeException; @@ -20,7 +20,7 @@ public final class ProcessClass { try { cls.load(); for (IDexTreeVisitor visitor : passes) { - DepthTraverser.visit(visitor, cls); + DepthTraversal.visit(visitor, cls); } } catch (DecodeException e) { LOG.error("Decode exception: " + cls, e); diff --git a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java index 6e098d303731b46f50a8869ec545800b6babb5f0..65bfc294284ee1e1f180da7924d9a4dfd7ef305b 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java @@ -14,7 +14,7 @@ import jadx.core.dex.nodes.InsnNode; import jadx.core.dex.nodes.MethodNode; import jadx.core.dex.regions.Region; import jadx.core.dex.trycatch.CatchAttr; -import jadx.core.dex.visitors.DepthTraverser; +import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.FallbackModeVisitor; import jadx.core.utils.ErrorsCounter; import jadx.core.utils.InsnUtils; @@ -274,7 +274,7 @@ public class MethodGen { // load original instructions try { mth.load(); - DepthTraverser.visit(new FallbackModeVisitor(), mth); + DepthTraversal.visit(new FallbackModeVisitor(), mth); } catch (DecodeException e) { LOG.error("Error reload instructions in fallback mode:", e); code.startLine("// Can't loadFile method instructions: " + e.getMessage()); diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraverser.java b/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java similarity index 96% rename from jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraverser.java rename to jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java index 8c4496a92474622d1a63b2690aa78af0c8418a42..ac5964bc047dd5ab0b6da284b1a1c4e085440118 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraverser.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java @@ -4,7 +4,7 @@ import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.MethodNode; import jadx.core.utils.ErrorsCounter; -public class DepthTraverser { +public class DepthTraversal { public static void visit(IDexTreeVisitor visitor, ClassNode cls) { try { diff --git a/jadx-core/src/test/java/jadx/api/InternalJadxTest.java b/jadx-core/src/test/java/jadx/api/InternalJadxTest.java index 8eb0d568c549129d08df574cc8693cad50d48758..2cf323947275b993a552f3b74b4555453c2c57a3 100644 --- a/jadx-core/src/test/java/jadx/api/InternalJadxTest.java +++ b/jadx-core/src/test/java/jadx/api/InternalJadxTest.java @@ -3,7 +3,7 @@ package jadx.api; import jadx.core.Jadx; import jadx.core.dex.nodes.ClassNode; import jadx.core.dex.nodes.MethodNode; -import jadx.core.dex.visitors.DepthTraverser; +import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; import java.io.BufferedInputStream; @@ -66,7 +66,7 @@ public abstract class InternalJadxTest extends TestUtils { } }, new File(outDir)); for (IDexTreeVisitor visitor : passes) { - DepthTraverser.visit(visitor, cls); + DepthTraversal.visit(visitor, cls); } assertThat(cls.getCode().toString(), not(containsString("inconsistent"))); return cls; diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java b/jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java index b1cdfad8eca8a03f25cd1e0cdd224922630b2a2c..7c0ef473185af6a2734c683505f7b1e07d6af83d 100644 --- a/jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java +++ b/jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java @@ -2,7 +2,7 @@ package jadx.tests.internal; import jadx.api.InternalJadxTest; import jadx.core.dex.nodes.ClassNode; -import jadx.core.dex.visitors.DepthTraverser; +import jadx.core.dex.visitors.DepthTraversal; import jadx.core.dex.visitors.IDexTreeVisitor; import jadx.core.utils.exceptions.DecodeException; @@ -28,7 +28,7 @@ public class TestVariablesDefinitions extends InternalJadxTest { cls.load(); Iterator iterator = passes.iterator(); while (iterator.hasNext()) { - DepthTraverser.visit(iterator.next(), cls); + DepthTraversal.visit(iterator.next(), cls); } } catch (DecodeException e) { LOG.error("Decode exception: " + cls, e);