Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
f8039733
J
jadx
项目概览
ql04210214
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f8039733
编写于
4月 20, 2019
作者:
A
Ahmed Ashour
提交者:
skylot
4月 20, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(gui): save tree expansions in project (PR #605)
上级
87ca14af
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
91 addition
and
3 deletion
+91
-3
jadx-core/src/main/java/jadx/api/JavaClass.java
jadx-core/src/main/java/jadx/api/JavaClass.java
+1
-1
jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
+22
-0
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+68
-2
未找到文件。
jadx-core/src/main/java/jadx/api/JavaClass.java
浏览文件 @
f8039733
...
...
@@ -68,7 +68,7 @@ public final class JavaClass implements JavaNode {
cls
.
unload
();
}
ClassNode
getClassNode
()
{
public
ClassNode
getClassNode
()
{
return
cls
;
}
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
浏览文件 @
f8039733
...
...
@@ -3,7 +3,9 @@ package jadx.gui.settings;
import
java.io.BufferedWriter
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Iterator
;
import
java.util.List
;
import
org.slf4j.Logger
;
...
...
@@ -29,6 +31,8 @@ public class JadxProject {
private
transient
String
name
=
"New Project"
;
private
transient
Path
projectPath
;
private
List
<
Path
>
filesPath
;
private
List
<
String
[]>
treeExpansions
=
new
ArrayList
<>();
private
transient
boolean
saved
;
private
transient
boolean
initial
=
true
;
...
...
@@ -63,6 +67,24 @@ public class JadxProject {
}
}
public
List
<
String
[]>
getTreeExpansions
()
{
return
treeExpansions
;
}
public
void
addTreeExpansion
(
String
[]
expansion
)
{
treeExpansions
.
add
(
expansion
);
changed
();
}
public
void
removeTreeExpansion
(
String
[]
expansion
)
{
for
(
Iterator
<
String
[]>
it
=
treeExpansions
.
iterator
();
it
.
hasNext
();
)
{
if
(
Arrays
.
equals
(
it
.
next
(),
expansion
))
{
it
.
remove
();
}
}
changed
();
}
private
void
changed
()
{
if
(
settings
.
isAutoSaveProject
())
{
save
();
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
浏览文件 @
f8039733
...
...
@@ -23,7 +23,9 @@ import java.io.FileInputStream;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Timer
;
import
java.util.TimerTask
;
...
...
@@ -130,6 +132,7 @@ public class MainWindow extends JFrame {
private
JRoot
treeRoot
;
private
TabbedPane
tabbedPane
;
private
HeapUsageBar
heapUsageBar
;
private
transient
boolean
treeReloading
;
private
boolean
isFlattenPackage
;
private
JToggleButton
flatPkgButton
;
...
...
@@ -431,10 +434,36 @@ public class MainWindow extends JFrame {
}
private
void
reloadTree
()
{
treeReloading
=
true
;
treeModel
.
reload
();
List
<
String
[]>
treeExpansions
=
project
.
getTreeExpansions
();
if
(!
treeExpansions
.
isEmpty
())
{
expand
(
treeRoot
,
treeExpansions
);
}
else
{
tree
.
expandRow
(
1
);
}
treeReloading
=
false
;
}
private
void
expand
(
TreeNode
node
,
List
<
String
[]>
treeExpansions
)
{
TreeNode
[]
pathNodes
=
treeModel
.
getPathToRoot
(
node
);
if
(
pathNodes
==
null
)
{
return
;
}
TreePath
path
=
new
TreePath
(
pathNodes
);
for
(
String
[]
expansion
:
treeExpansions
)
{
if
(
Arrays
.
equals
(
expansion
,
getPathExpansion
(
path
)))
{
tree
.
expandPath
(
path
);
break
;
}
}
for
(
int
i
=
node
.
getChildCount
()
-
1
;
i
>=
0
;
i
--)
{
expand
(
node
.
getChildAt
(
i
),
treeExpansions
);
}
}
private
void
toggleFlattenPackage
()
{
setFlattenPackage
(!
isFlattenPackage
);
}
...
...
@@ -824,11 +853,18 @@ public class MainWindow extends JFrame {
if
(
node
instanceof
JLoadableNode
)
{
((
JLoadableNode
)
node
).
loadNode
();
}
if
(!
treeReloading
)
{
project
.
addTreeExpansion
(
getPathExpansion
(
event
.
getPath
()));
update
();
}
}
@Override
public
void
treeWillCollapse
(
TreeExpansionEvent
event
)
{
// ignore
if
(!
treeReloading
)
{
project
.
removeTreeExpansion
(
getPathExpansion
(
event
.
getPath
()));
update
();
}
}
});
...
...
@@ -851,6 +887,36 @@ public class MainWindow extends JFrame {
setTitle
(
DEFAULT_TITLE
);
}
private
static
String
[]
getPathExpansion
(
TreePath
path
)
{
List
<
String
>
pathList
=
new
ArrayList
<>();
while
(
path
!=
null
)
{
Object
node
=
path
.
getLastPathComponent
();
String
name
;
if
(
node
instanceof
JClass
)
{
name
=
((
JClass
)
node
).
getCls
().
getClassNode
().
getClassInfo
().
getFullName
();
}
else
{
name
=
node
.
toString
();
}
pathList
.
add
(
name
);
path
=
path
.
getParentPath
();
}
return
pathList
.
toArray
(
new
String
[
pathList
.
size
()]);
}
public
static
void
getExpandedPaths
(
JTree
tree
,
TreePath
path
,
List
<
TreePath
>
list
)
{
if
(
tree
.
isExpanded
(
path
))
{
list
.
add
(
path
);
TreeNode
node
=
(
TreeNode
)
path
.
getLastPathComponent
();
for
(
int
i
=
node
.
getChildCount
()
-
1
;
i
>=
0
;
i
--)
{
TreeNode
n
=
node
.
getChildAt
(
i
);
TreePath
child
=
path
.
pathByAddingChild
(
n
);
getExpandedPaths
(
tree
,
child
,
list
);
}
}
}
public
void
setLocationAndPosition
()
{
if
(
this
.
settings
.
loadWindowPos
(
this
))
{
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录