jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gui): allow html for empty package name (#1961)

Browse Source
This commit is contained in:
Skylot
2023-07-26 20:55:19 +01:00
parent 8d5130a329
commit 8f635076ea
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
+9
View File
@@ -132,6 +132,15 @@ public class JPackage extends JNode {
return name;
}
@Override
public boolean disableHtml() {
if (name.isEmpty()) {
// show PACKAGE_DEFAULT_HTML_STR for empty package
return false;
}
return true;
}
@Override
public String makeLongString() {
return pkg.getFullName();
jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
+5
View File
@@ -40,6 +40,7 @@ import jadx.gui.jobs.TaskStatus;
import jadx.gui.settings.JadxProject;
import jadx.gui.treemodel.JClass;
import jadx.gui.treemodel.JNode;
import jadx.gui.treemodel.JPackage;
import jadx.gui.treemodel.JRenameNode;
import jadx.gui.ui.MainWindow;
import jadx.gui.ui.TabbedPane;
@@ -51,6 +52,7 @@ import jadx.gui.utils.JNodeCache;
import jadx.gui.utils.NLS;
import jadx.gui.utils.TextStandardActions;
import jadx.gui.utils.UiUtils;
import jadx.gui.utils.pkgs.JRenamePackage;
import jadx.gui.utils.ui.DocumentUpdateListener;
import jadx.gui.utils.ui.NodeLabel;
@@ -250,6 +252,9 @@ public class RenameDialog extends JDialog {
nodeLabel.setIcon(node.getIcon());
if (node instanceof JNode) {
nodeLabel.disableHtml(((JNode) node).disableHtml());
} else if (node instanceof JRenamePackage) {
// TODO: get from JRenameNode directly
nodeLabel.disableHtml(!node.getTitle().equals(JPackage.PACKAGE_DEFAULT_HTML_STR));
}
lbl.setLabelFor(nodeLabel);