From 8a34d973ff30384ab6a12c6aeb90574759be6dce Mon Sep 17 00:00:00 2001 From: nitram84 <58364572+nitram84@users.noreply.github.com> Date: Tue, 22 Oct 2024 18:24:57 +0200 Subject: [PATCH] build: use jadx-gui as a library in plugins (PR #2310) * fix(gui): fix javadoc issues * feat(gui): export jadx-gui as a library * fix(gui): fix javadoc issues * fix(gui): remove invalid characters for javadoc * add jadx-library also for jadx-cli and jadx-script-ide modules --------- Co-authored-by: Skylot <118523+skylot@users.noreply.github.com> --- jadx-cli/build.gradle.kts | 1 + jadx-gui/build.gradle.kts | 1 + .../src/main/java/jadx/gui/cache/manager/CacheManager.java | 4 ++-- .../main/java/jadx/gui/device/debugger/SmaliDebugger.java | 2 +- .../src/main/java/jadx/gui/device/protocol/ADBDevice.java | 6 +++--- jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java | 2 +- .../src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java | 6 +++--- jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts | 1 + 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts index 25a116073..e5de4380d 100644 --- a/jadx-cli/build.gradle.kts +++ b/jadx-cli/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("jadx-java") + id("jadx-library") id("application") // use shadow only for application scripts, jar will be copied from jadx-gui diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index 801ec65a9..eaeaa05df 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("jadx-kotlin") id("application") + id("jadx-library") id("edu.sc.seis.launch4j") version "3.0.6" id("com.gradleup.shadow") version "8.3.3" id("org.beryx.runtime") version "1.13.1" diff --git a/jadx-gui/src/main/java/jadx/gui/cache/manager/CacheManager.java b/jadx-gui/src/main/java/jadx/gui/cache/manager/CacheManager.java index 533d3ab38..7ff1a399a 100644 --- a/jadx-gui/src/main/java/jadx/gui/cache/manager/CacheManager.java +++ b/jadx-gui/src/main/java/jadx/gui/cache/manager/CacheManager.java @@ -47,8 +47,8 @@ public class CacheManager { } /** - * If project cache is set -> check if cache entry exists for this project. - * If not -> calculate new and add entry. + * If project cache is set -> check if cache entry exists for this project. + * If not -> calculate new and add entry. */ public Path getCacheDir(JadxProject project, @Nullable String cacheDirStr) { if (cacheDirStr == null) { diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java index ab10e794e..22ca7dca9 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java @@ -533,7 +533,7 @@ public class SmaliDebugger { /** * @param startIndex less than 0 means 0 * @param len less than or equals 0 means the maximum value 99 or the rest of the elements. - * @return An entry, The key is the total length of this array when len is <= 0, otherwise 0, + * @return An entry, The key is the total length of this array when len is <= 0, otherwise 0, * the value, if this array is an object array then it's object ids. */ public Entry> readArray(RuntimeValue reg, int startIndex, int len) throws SmaliDebuggerException { diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java index 55fa7df54..52472602c 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java +++ b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java @@ -123,7 +123,7 @@ public class ADBDevice { } /** - * @Return binary output of logcat + * @return binary output of logcat */ public byte[] getBinaryLogcat() throws IOException { @@ -133,7 +133,7 @@ public class ADBDevice { } /** - * @Return binary output of logcat after provided timestamp + * @return binary output of logcat after provided timestamp * Timestamp is in the format 09-08 02:18:03.131 */ public byte[] getBinaryLogcat(String timestamp) throws IOException { @@ -147,7 +147,7 @@ public class ADBDevice { } /** - * @Return binary output of logcat -c + * Binary output of logcat -c */ public void clearLogcat() throws IOException { Socket socket = ADB.connect(info.getAdbHost(), info.getAdbPort()); diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java index ce4ff7eb5..a99d48a20 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java @@ -39,7 +39,7 @@ import jadx.gui.utils.UiUtils; import jadx.gui.utils.ui.MousePressedHandler; /** - * A panel combining a {@link SearchBar and a scollable {@link CodeArea} + * A panel combining a {@link SearchBar} and a scollable {@link CodeArea} */ public class CodePanel extends JPanel { private static final long serialVersionUID = 1117721869391885865L; diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java index a082039a4..3618627a6 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java @@ -9,7 +9,7 @@ import javax.swing.text.Segment; import org.fife.ui.rsyntaxtextarea.*; /** - * 用于Smali代码高亮 + * SmaliTokenMaker * MartinKay@qq.com */ @@ -1280,7 +1280,7 @@ public class SmaliTokenMaker extends AbstractJFlexCTokenMaker { * * All internal variables are reset, the old input stream * cannot be reused (internal buffer is discarded and lost). - * Lexical state is set to YY_INITIAL. + * Lexical state is set to YY_INITIAL * * @param reader the new input stream */ @@ -1371,7 +1371,7 @@ public class SmaliTokenMaker extends AbstractJFlexCTokenMaker { } /** - * Returns the character at position pos from the + * Returns the character at positionpos from the * matched text. * * It is equivalent to yytext().charAt(pos), but faster diff --git a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts index 830607a0a..ad5d542b9 100644 --- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("jadx-kotlin") + id("jadx-library") } dependencies {