Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
43913d47
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,发现更多精彩内容 >>
提交
43913d47
编写于
12月 24, 2013
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix method definition
上级
9f51cabf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
44 addition
and
10 deletion
+44
-10
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+6
-5
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
+5
-5
jadx-core/src/test/java/jadx/tests/internal/TestAnnotations.java
...re/src/test/java/jadx/tests/internal/TestAnnotations.java
+3
-0
jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java
...e/src/test/java/jadx/tests/internal/TestStaticMethod.java
+30
-0
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
浏览文件 @
43913d47
...
...
@@ -110,6 +110,7 @@ public class ClassGen {
}
annotationGen
.
addForClass
(
clsCode
);
insertSourceFileInfo
(
clsCode
,
cls
);
clsCode
.
startLine
(
af
.
makeString
());
if
(
af
.
isInterface
())
{
if
(
af
.
isAnnotation
())
...
...
@@ -182,8 +183,6 @@ public class ClassGen {
public
void
makeClassBody
(
CodeWriter
clsCode
)
throws
CodegenException
{
clsCode
.
add
(
'{'
);
insertSourceFileInfo
(
clsCode
,
cls
);
CodeWriter
mthsCode
=
makeMethods
(
clsCode
,
cls
.
getMethods
());
CodeWriter
fieldsCode
=
makeFields
(
clsCode
,
cls
,
cls
.
getFields
());
clsCode
.
add
(
fieldsCode
);
...
...
@@ -242,7 +241,9 @@ public class ClassGen {
LOG
.
error
(
ErrorsCounter
.
formatErrorMsg
(
mth
,
" Inconsistent code"
));
mthGen
.
makeMethodDump
(
code
);
}
mthGen
.
addDefinition
(
code
);
if
(
mthGen
.
addDefinition
(
code
))
{
code
.
add
(
' '
);
}
code
.
add
(
'{'
);
insertSourceFileInfo
(
code
,
mth
);
code
.
add
(
mthGen
.
makeInstructions
(
code
.
getIndent
()));
...
...
@@ -250,7 +251,7 @@ public class ClassGen {
}
}
catch
(
Throwable
e
)
{
String
msg
=
ErrorsCounter
.
methodError
(
mth
,
"Method generation error"
,
e
);
code
.
startLine
(
"/* "
+
msg
+
CodeWriter
.
NL
+
Utils
.
getStackTrace
(
e
)
+
"*/"
);
code
.
startLine
(
"/* "
+
msg
+
CodeWriter
.
NL
+
Utils
.
getStackTrace
(
e
)
+
"
*/"
);
}
if
(
it
.
hasNext
())
...
...
@@ -424,7 +425,7 @@ public class ClassGen {
private
void
insertSourceFileInfo
(
CodeWriter
code
,
AttrNode
node
)
{
IAttribute
sourceFileAttr
=
node
.
getAttributes
().
get
(
AttributeType
.
SOURCE_FILE
);
if
(
sourceFileAttr
!=
null
)
{
code
.
startLine
(
1
,
"// compiled from: "
);
code
.
startLine
(
"// compiled from: "
);
code
.
add
(((
SourceFileAttr
)
sourceFileAttr
).
getFileName
());
}
}
...
...
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
浏览文件 @
43913d47
...
...
@@ -57,18 +57,17 @@ public class MethodGen {
return
classGen
;
}
public
void
addDefinition
(
CodeWriter
code
)
{
public
boolean
addDefinition
(
CodeWriter
code
)
{
if
(
mth
.
getMethodInfo
().
isClassInit
())
{
code
.
startLine
(
"static"
);
code
.
attachAnnotation
(
mth
);
return
;
return
true
;
}
if
(
mth
.
getAttributes
().
contains
(
AttributeFlag
.
ANONYMOUS_CONSTRUCTOR
))
{
// don't add method name and arguments
code
.
startLine
();
code
.
attachAnnotation
(
mth
);
return
;
return
false
;
}
annotationGen
.
addForMethod
(
code
,
mth
);
...
...
@@ -110,10 +109,11 @@ public class MethodGen {
}
}
code
.
add
(
makeArguments
(
args
));
code
.
add
(
")
"
);
code
.
add
(
")"
);
annotationGen
.
addThrows
(
mth
,
code
);
code
.
attachAnnotation
(
mth
);
return
true
;
}
public
CodeWriter
makeArguments
(
List
<
RegisterArg
>
args
)
{
...
...
jadx-core/src/test/java/jadx/tests/internal/TestAnnotations.java
浏览文件 @
43913d47
...
...
@@ -57,5 +57,8 @@ public class TestAnnotations extends InternalJadxTest {
assertThat
(
code
,
containsString
(
"@A(a = -11253)"
));
assertThat
(
code
,
containsString
(
"@V(false)"
));
assertThat
(
code
,
not
(
containsString
(
"@D()"
)));
assertThat
(
code
,
containsString
(
"int a();"
));
assertThat
(
code
,
containsString
(
"float value() default 1.1f;"
));
}
}
jadx-core/src/test/java/jadx/tests/internal/TestStaticMethod.java
0 → 100644
浏览文件 @
43913d47
package
jadx.tests.internal
;
import
jadx.api.InternalJadxTest
;
import
jadx.core.dex.nodes.ClassNode
;
import
org.junit.Test
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestStaticMethod
extends
InternalJadxTest
{
public
static
class
TestCls
{
static
{
f
();
}
private
static
void
f
()
{
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
"static {"
));
assertThat
(
code
,
containsString
(
"private static void f() {"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录