From c24e1c7ae5b8ba53fb175b5c93912dc4946b109d Mon Sep 17 00:00:00 2001 From: iga Date: Tue, 1 Apr 2014 20:42:38 +0900 Subject: [PATCH] adding method support. --- jcfa/src/jp/igapyon/jcfa/util/JcfaEclipseUtil.java | 2 +- jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java | 13 ++++++++++--- jcfa/testJavaClass/output/test/TestJavaClass001.jcfa | 4 ++++ jcfa/testJavaClass/output/test/TestJavaClass002.jcfa | 3 +++ jcfa/testJavaClass/output/test/TestJavaClass003.jcfa | 3 +++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/jcfa/src/jp/igapyon/jcfa/util/JcfaEclipseUtil.java b/jcfa/src/jp/igapyon/jcfa/util/JcfaEclipseUtil.java index 3e30e40..510c900 100644 --- a/jcfa/src/jp/igapyon/jcfa/util/JcfaEclipseUtil.java +++ b/jcfa/src/jp/igapyon/jcfa/util/JcfaEclipseUtil.java @@ -21,7 +21,7 @@ public class JcfaEclipseUtil { * @return Formatted source. */ public static String formatSource(final String source) { - if (false) + if (true) System.out.println("TRACE: " + source); final Map options = DefaultCodeFormatterConstants diff --git a/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java b/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java index 3c236a9..d24d4a0 100644 --- a/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java +++ b/jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java @@ -59,7 +59,7 @@ public class JcfaWriteUtil { } for (JcfaMethod jcfaMethod : jcfaClass.getMethodList()) { - writeToBuffer(jcfaMethod, result); + writeToBuffer(jcfaClass, jcfaMethod, result); } result.append("}"); @@ -84,11 +84,18 @@ public class JcfaWriteUtil { result.append(";"); } - public static void writeToBuffer(final JcfaMethod jcfaMethod, - final StringBuffer result) { + public static void writeToBuffer(final JcfaClass jcfaClass, + final JcfaMethod jcfaMethod, final StringBuffer result) { writeToBuffer(jcfaMethod.getComment(), result); + if (jcfaMethod.getName().equals("")) { + result.append("public " + jcfaClass.getLocalName() + "() {"); + } else { + result.append("public void " + jcfaMethod.getName() + "() {"); + } + + result.append("}"); } public static void writeToBuffer(final JcfaComment jcfaComment, diff --git a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa index 5e6fe11..6bb0cae 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa @@ -3,6 +3,10 @@ package test; /* TODO import func. is missing. */ public class TestJavaClass001 { /* */ + public TestJavaClass001() { + } /* */ + public void main() { + } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa index c646f47..e22953a 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa @@ -8,5 +8,8 @@ public class TestJavaClass002 { protected static java.lang.String test002; /* */ private int test003; + /* */ + public TestJavaClass002() { + } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa index e1a72bd..4c8bb60 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa @@ -16,5 +16,8 @@ public class TestJavaClass003 { private int test006; /* */ private int test007; + /* */ + public TestJavaClass003() { + } } \ No newline at end of file -- 2.11.0