added multi-line data output support to SilkWriter

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3506 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

diff --git a/src/main/java/org/xerial/silk/SilkWriter.java b/src/main/java/org/xerial/silk/SilkWriter.java
index d5c6365..f9094f6 100644 (file)
--- a/src/main/java/org/xerial/silk/SilkWriter.java
+++ b/src/main/java/org/xerial/silk/SilkWriter.java
@@ -246,17 +246,16 @@ public class SilkWriter {
 
     private void attributeParenCloseCheck(boolean insertNewline) {
         if (numAttribute > 0) {
-
             closeParen();
 
-            switch (nodeValueSyntaxType) {
-            case SEQUENCE:
-                out.print(">");
-                break;
-            case TAB:
+            if (nodeValueSyntaxType == SyntaxType.TAB)
                 out.print("|");
-                break;
-            }
+        }
+
+        switch (nodeValueSyntaxType) {
+        case SEQUENCE:
+            out.print(">");
+            break;
         }
 
         if (insertNewline)

diff --git a/src/test/java/org/xerial/silk/SilkWriterTest.java b/src/test/java/org/xerial/silk/SilkWriterTest.java
index 5964d7c..3f420c4 100644 (file)
--- a/src/test/java/org/xerial/silk/SilkWriterTest.java
+++ b/src/test/java/org/xerial/silk/SilkWriterTest.java
@@ -69,6 +69,10 @@ public class SilkWriterTest {
         t.dataLine("g1\t10\t20000");\r
         t.dataLine("g2\t1000\t30000");\r
 \r
+        SilkWriter g = w.node("gene").attribute("id", "g1");\r
+        g.multilineData("sequence");\r
+        g.dataLine("ACCGGCCGCCC");\r
+        g.dataLine("CCGCAGGGAAA");\r
         w.endDocument();\r
 \r
         String s = buf.toString();\r

diff --git a/src/test/java/org/xerial/silk/writer-result.silk b/src/test/java/org/xerial/silk/writer-result.silk
index 023de15..3c9db26 100644 (file)
--- a/src/test/java/org/xerial/silk/writer-result.silk
+++ b/src/test/java/org/xerial/silk/writer-result.silk
@@ -9,3 +9,7 @@
 -gene(id, start, end)|\r
 g1     10      20000\r
 g2     1000    30000\r
+-gene(id:g1)\r
+ -sequence>\r
+ACCGGCCGCCC\r
+CCGCAGGGAAA
\ No newline at end of file