Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
03da35b2
J
jadx
项目概览
2301_76393173
/
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,发现更多精彩内容 >>
提交
03da35b2
编写于
3月 09, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix wildcard signature processing
上级
3ccab60f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
4 deletion
+47
-4
jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
...rc/main/java/jadx/core/dex/instructions/args/ArgType.java
+4
-3
jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
...main/java/jadx/core/dex/nodes/parser/SignatureParser.java
+1
-1
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
+1
-0
jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java
...test/java/jadx/tests/internal/generics/TestGenerics3.java
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
浏览文件 @
03da35b2
...
...
@@ -174,7 +174,7 @@ public abstract class ArgType {
private
final
int
bounds
;
public
WildcardType
(
ArgType
obj
,
int
bound
)
{
super
(
obj
.
getObject
());
super
(
ArgType
.
OBJECT
.
getObject
());
this
.
type
=
obj
;
this
.
bounds
=
bound
;
}
...
...
@@ -205,7 +205,8 @@ public abstract class ArgType {
@Override
boolean
internalEquals
(
Object
obj
)
{
return
super
.
internalEquals
(
obj
)
&&
bounds
==
((
WildcardType
)
obj
).
bounds
;
&&
bounds
==
((
WildcardType
)
obj
).
bounds
&&
type
.
equals
(((
WildcardType
)
obj
).
type
);
}
@Override
...
...
@@ -213,7 +214,7 @@ public abstract class ArgType {
if
(
bounds
==
0
)
{
return
"?"
;
}
return
"? "
+
(
bounds
==
-
1
?
"super"
:
"extends"
)
+
" "
+
super
.
toString
();
return
"? "
+
(
bounds
==
-
1
?
"super"
:
"extends"
)
+
" "
+
type
.
toString
();
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
浏览文件 @
03da35b2
...
...
@@ -23,9 +23,9 @@ public class SignatureParser {
public
SignatureParser
(
String
signature
)
{
sign
=
signature
;
end
=
sign
.
length
();
pos
=
-
1
;
mark
=
0
;
end
=
sign
.
length
();
}
@SuppressWarnings
(
"unchecked"
)
...
...
jadx-core/src/test/java/jadx/api/InternalJadxTest.java
浏览文件 @
03da35b2
...
...
@@ -71,6 +71,7 @@ public abstract class InternalJadxTest {
assertFalse
(
cls
.
getAttributes
().
contains
(
AttributeFlag
.
INCONSISTENT_CODE
));
return
cls
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
fail
(
e
.
getMessage
());
return
null
;
}
...
...
jadx-core/src/test/java/jadx/tests/internal/generics/TestGenerics3.java
0 → 100644
浏览文件 @
03da35b2
package
jadx.tests.internal.generics
;
import
jadx.api.InternalJadxTest
;
import
jadx.core.dex.nodes.ClassNode
;
import
java.util.List
;
import
org.junit.Test
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestGenerics3
extends
InternalJadxTest
{
public
static
class
TestCls
{
public
static
void
mthExtendsArray
(
List
<?
extends
byte
[]>
list
)
{
}
public
static
void
mthSuperArray
(
List
<?
super
int
[]>
list
)
{
}
public
static
void
mthSuperInteger
(
List
<?
super
Integer
>
list
)
{
}
public
static
void
mthExtendsString
(
List
<?
super
String
>
list
)
{
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
System
.
out
.
println
(
code
);
assertThat
(
code
,
containsString
(
"mthExtendsArray(List<? extends byte[]> list)"
));
assertThat
(
code
,
containsString
(
"mthSuperArray(List<? super int[]> list)"
));
assertThat
(
code
,
containsString
(
"mthSuperInteger(List<? super Integer> list)"
));
assertThat
(
code
,
containsString
(
"mthExtendsString(List<? super String> list)"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录