Merge pull request #1 from skylot/new-jadx-api

Use new jadx API for icons and usage dialog

Author: andyjsmith

build.gradle.kts

@@ -11,23 +11,13 @@ plugins {
 }
 
 dependencies {
-	val jadxVersion = "1.5.1"
+	val jadxVersion = "1.5.2-SNAPSHOT"
 	val isJadxSnapshot = jadxVersion.endsWith("-SNAPSHOT")
 
 	// use compile only scope to exclude jadx-core and its dependencies from result jar
 	compileOnly("io.github.skylot:jadx-core:$jadxVersion") {
 		isChanging = isJadxSnapshot
 	}
-	compileOnly("io.github.skylot:jadx-gui:$jadxVersion") {
-		isChanging = isJadxSnapshot
-	}
-	// don't know why I need this, but tests fail otherwise
-	testRuntimeOnly("io.github.skylot:jadx-gui:$jadxVersion") {
-		isChanging = isJadxSnapshot
-	}
-	compileOnly("io.github.skylot:jadx-cli:$jadxVersion") {
-		isChanging = isJadxSnapshot
-	}
 
 	testImplementation("io.github.skylot:jadx-smali-input:$jadxVersion") {
 		isChanging = isJadxSnapshot

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/NativeLibrariesPlugin.java

@@ -20,6 +20,7 @@ public JadxPluginInfo getPluginInfo() {
 				.name("Native Library Info")
 				.description(DESCRIPTION)
 				.homepage("https://github.com/andyjsmith/jadx-native-libraries-plugin")
+				.requiredJadxVersion("1.5.2, r2372")
 				.build();
 	}
 

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/PluginDialog.java

@@ -2,9 +2,6 @@
 
 import jadx.api.JavaMethod;
 import jadx.api.plugins.JadxPluginContext;
-import jadx.gui.treemodel.JNode;
-import jadx.gui.ui.MainWindow;
-import jadx.gui.ui.dialog.UsageDialog;
 import org.ajsmith.jadx.plugins.nativelibraries.components.NativeMethod;
 import org.ajsmith.jadx.plugins.nativelibraries.components.NativeRoot;
 import org.jetbrains.annotations.Nullable;
@@ -65,7 +62,6 @@ public PluginDialog(JFrame parent, JadxPluginContext context, PluginOptions opti
 		findUsageBtn.setEnabled(false);
 		findUsageBtn.addActionListener(e -> {
 			if (context.getGuiContext() == null) return;
-			MainWindow mw = (MainWindow) context.getGuiContext().getMainFrame();
 
 			TreeNode treeNode = (TreeNode) tree.getLastSelectedPathComponent();
 			if (!(treeNode instanceof NativeMethod)) return;
@@ -76,10 +72,7 @@ public PluginDialog(JFrame parent, JadxPluginContext context, PluginOptions opti
 				showMethodNotFoundDialog(treeNode);
 				return;
 			}
-
-			JNode node = mw.getCacheObject().getNodeCache().makeFrom(javaMethod);
-			if (node == null) return;
-			new UsageDialog(mw, node).setVisible(true);
+			context.getGuiContext().openUsageDialog(javaMethod.getCodeNodeRef());
 		});
 
 		JButton closeBtn = new JButton("Close");

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/PluginOptions.java

@@ -2,8 +2,6 @@
 
 import jadx.api.plugins.JadxPluginContext;
 import jadx.api.plugins.options.impl.BasePluginOptionsBuilder;
-import jadx.gui.settings.JadxSettings;
-import jadx.gui.ui.MainWindow;
 
 public class PluginOptions extends BasePluginOptionsBuilder {
 	private final JadxPluginContext context;
@@ -16,11 +14,4 @@ public PluginOptions(JadxPluginContext context) {
 	@Override
 	public void registerOptions() {
 	}
-
-	private void save() {
-		if (context.getGuiContext() == null) return;
-		JadxSettings settings = ((MainWindow) context.getGuiContext().getMainFrame()).getSettings();
-		// save settings here
-		settings.sync();
-	}
 }

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeClass.java

@@ -1,6 +1,5 @@
 package org.ajsmith.jadx.plugins.nativelibraries.components;
 
-import jadx.gui.utils.Icons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -61,7 +60,7 @@ public String toString() {
 
 	@Override
 	public @NotNull ImageIcon getIcon() {
-		return Icons.CLASS;
+		return getGuiContext().getSVGIcon("nodes/class");
 	}
 
 	@Override

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeLibrary.java

@@ -3,7 +3,6 @@
 import jadx.api.ResourceFile;
 import jadx.api.ResourcesLoader;
 import jadx.core.utils.exceptions.JadxException;
-import jadx.gui.utils.UiUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,7 +16,6 @@
 import java.util.List;
 
 public class NativeLibrary extends NativeObject {
-	private static final ImageIcon SO_ICON = UiUtils.openSvgIcon("nodes/binaryFile");
 	private final String libraryName;
 	private final NativeRoot root;
 	private final List<NativePackage> packages = new ArrayList<>();
@@ -144,7 +142,7 @@ public String toString() {
 
 	@Override
 	public @NotNull ImageIcon getIcon() {
-		return SO_ICON;
+		return root.getGuiContext().getSVGIcon("nodes/binaryFile");
 	}
 
 	@Override

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeMethod.java

@@ -4,7 +4,6 @@
 import jadx.api.JavaMethod;
 import jadx.api.JavaPackage;
 import jadx.core.utils.exceptions.DecodeException;
-import jadx.gui.utils.Icons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -275,7 +274,7 @@ public String toString() {
 
 	@Override
 	public @Nullable ImageIcon getIcon() {
-		return Icons.METHOD;
+		return getGuiContext().getSVGIcon("nodes/method");
 	}
 
 	@Override

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeObject.java

@@ -1,11 +1,13 @@
 package org.ajsmith.jadx.plugins.nativelibraries.components;
 
 import jadx.api.plugins.JadxPluginContext;
+import jadx.api.plugins.gui.JadxGuiContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.ImageIcon;
 import javax.swing.tree.TreeNode;
+import java.util.Objects;
 
 public abstract class NativeObject implements TreeNode {
 	protected static final String JAVA_PREFIX = "Java_";
@@ -55,4 +57,8 @@ public boolean getAllowsChildren() {
 		if (getParent() == null) return null;
 		return getParent().getContext();
 	}
+
+	public @NotNull JadxGuiContext getGuiContext() {
+		return getContext().getGuiContext();
+	}
 }

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativePackage.java

@@ -1,6 +1,5 @@
 package org.ajsmith.jadx.plugins.nativelibraries.components;
 
-import jadx.gui.utils.Icons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -115,7 +114,7 @@ public String getNameCompacted() {
 
 	@Override
 	public @NotNull ImageIcon getIcon() {
-		return Icons.PACKAGE;
+		return getGuiContext().getSVGIcon("nodes/package");
 	}
 
 	@Override

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeRoot.java

@@ -3,6 +3,7 @@
 import jadx.api.ResourceFile;
 import jadx.api.ResourceType;
 import jadx.api.plugins.JadxPluginContext;
+import jadx.api.plugins.gui.JadxGuiContext;
 import net.fornwall.jelf.ElfFile;
 import net.fornwall.jelf.ElfSymbol;
 import org.jetbrains.annotations.NotNull;
@@ -18,6 +19,7 @@
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Objects;
 
 public class NativeRoot extends NativeObject {
 	private static final Logger LOG = LoggerFactory.getLogger(NativeRoot.class);
@@ -77,6 +79,11 @@ public JadxPluginContext getContext() {
 		return context;
 	}
 
+	@Override
+	public @NotNull JadxGuiContext getGuiContext() {
+		return Objects.requireNonNull(context.getGuiContext());
+	}
+
 	@Override
 	@Nullable
 	public ImageIcon getIcon() {