From: iga Date: Tue, 1 Apr 2014 12:29:26 +0000 (+0900) Subject: save X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e3b9c29237aa725a501db83ddc9ac98063575c70;p=jcfa%2Fjcfa.git save --- diff --git a/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java b/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java index 1ae2884..3409906 100644 --- a/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java +++ b/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java @@ -159,8 +159,9 @@ public class JavaClassFileAnalyzer { for (Type type : method.getArgumentTypes()) { jcfaMethod.getComment().getCommentList().add(type.toString()); + jcfaMethod.getArugumentTypeList().add(type.toString()); } - jcfaMethod.setType(method.getReturnType().getSignature()); + jcfaMethod.setType(method.getReturnType().toString()); final Code code = method.getCode(); if (code == null) { diff --git a/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java b/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java index 0917c22..b765466 100644 --- a/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java +++ b/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java @@ -97,12 +97,24 @@ public class JcfaWriteUtil { writeToBuffer(jcfaMethod.getComment(), result); if (jcfaMethod.getName().equals("")) { - result.append("public " + jcfaClass.getLocalName() + "() {"); + result.append("public " + jcfaClass.getLocalName() + "("); } else { result.append("public " + jcfaMethod.getType() + " " - + jcfaMethod.getName() + "() {"); + + jcfaMethod.getName() + "("); } + int argNo = 0; + for (String argumentType : jcfaMethod.getArugumentTypeList()) { + if (argNo != 0) { + result.append(", "); + } + result.append(argumentType); + result.append(" arg" + argNo); + } + + result.append(")"); + + result.append("{"); result.append("}"); } diff --git a/jcfa/src/jp/igapyon/jcfa/vo/JcfaMethod.java b/jcfa/src/jp/igapyon/jcfa/vo/JcfaMethod.java index 8e6b3e0..4b79bbe 100644 --- a/jcfa/src/jp/igapyon/jcfa/vo/JcfaMethod.java +++ b/jcfa/src/jp/igapyon/jcfa/vo/JcfaMethod.java @@ -1,16 +1,25 @@ package jp.igapyon.jcfa.vo; +import java.util.ArrayList; +import java.util.List; + public class JcfaMethod extends JcfaNode { protected String name; protected String type; + protected final List arugumentTypeList = new ArrayList();; + protected String access; public String getAccess() { return access; } + public List getArugumentTypeList() { + return arugumentTypeList; + } + public String getName() { return name; } diff --git a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa index c8fd808..58017e9 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa @@ -9,6 +9,6 @@ public class TestJavaClass001 { /** * Method. java.lang.String[] */ - public V main() { + public void main(java.lang.String[] arg0) { } } \ No newline at end of file