From 659bbbf4fb976dfd011285a217dae1100908792a Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 20 Dec 2021 16:48:50 +0000 Subject: [PATCH] fix: correct usage of `Path.getParent()` --- jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java | 2 +- jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java | 2 +- jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java b/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java index f68c0ef8..928774f9 100644 --- a/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java +++ b/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java @@ -58,7 +58,7 @@ public class DeobfPresets { if (inputFiles.isEmpty()) { return null; } - Path inputFilePath = inputFiles.get(0).getAbsoluteFile().toPath(); + Path inputFilePath = inputFiles.get(0).toPath().toAbsolutePath(); String baseName = FileUtils.getPathBaseName(inputFilePath); return inputFilePath.getParent().resolve(baseName + ".jobf"); } diff --git a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java b/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java index 1f38f47b..267708c1 100644 --- a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java +++ b/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java @@ -75,7 +75,7 @@ public class FileUtils { public static void makeDirsForFile(Path path) { if (path != null) { - makeDirs(path.getParent().toFile()); + makeDirs(path.toAbsolutePath().getParent().toFile()); } } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java index dd5e2e23..041d1761 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java @@ -451,7 +451,7 @@ public class MainWindow extends JFrame { update(); restoreOpenTabs(); runInitialBackgroundJobs(); - BreakpointManager.init(paths.get(0).getParent()); + BreakpointManager.init(paths.get(0).toAbsolutePath().getParent()); } private void addTreeCustomNodes() { @@ -517,7 +517,7 @@ public class MainWindow extends JFrame { if (projectPath == null) { pathString = ""; } else { - pathString = " [" + projectPath.getParent().toAbsolutePath() + ']'; + pathString = " [" + projectPath.toAbsolutePath().getParent() + ']'; } setTitle((project.isSaved() ? "" : '*') + project.getName() + pathString + " - " + DEFAULT_TITLE); -- GitLab