X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FBasicTableParser.java;h=4e5f4b35b6d87beb139ca24c053acb53078a43e7;hb=a4f2896c53c804220bbd53429780592a86c9e4b6;hp=aaa5781159d875af09cb89146c75b52b30d14c52;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git diff --git a/forester/java/src/org/forester/util/BasicTableParser.java b/forester/java/src/org/forester/util/BasicTableParser.java index aaa5781..4e5f4b3 100644 --- a/forester/java/src/org/forester/util/BasicTableParser.java +++ b/forester/java/src/org/forester/util/BasicTableParser.java @@ -38,13 +38,13 @@ public class BasicTableParser { private BasicTableParser() { } - public static BasicTable parse( final Object source, final String column_delimiter ) throws IOException { + public static BasicTable parse( final Object source, final char column_delimiter ) throws IOException { return BasicTableParser.parse( source, column_delimiter, false, false, START_OF_COMMENT_LINE_DEFAULT, false ) .get( 0 ); } public static BasicTable parse( final Object source, - final String column_delimiter, + final char column_delimiter, final boolean use_first_separator_only, final boolean use_last_separator_only ) throws IOException { return BasicTableParser.parse( source, @@ -56,7 +56,7 @@ public class BasicTableParser { } public static List> parse( final Object source, - final String column_delimiter, + final char column_delimiter, final boolean use_first_separator_only, final boolean use_last_separator_only, final String start_of_comment_line, @@ -93,7 +93,7 @@ public class BasicTableParser { && ( !use_start_of_comment_line || !line.startsWith( start_of_comment_line ) ) ) { saw_first_table = true; if ( use_last_separator_only ) { - final String e[] = line.split( column_delimiter ); + final String e[] = line.split( column_delimiter + "" ); final StringBuffer rest = new StringBuffer(); for( int i = 0; i < ( e.length - 1 ); ++i ) { rest.append( e[ i ].trim() ); @@ -102,7 +102,7 @@ public class BasicTableParser { table.setValue( 1, row, e[ e.length - 1 ] ); } else { - final StringTokenizer st = new StringTokenizer( line, column_delimiter ); + final StringTokenizer st = new StringTokenizer( line, column_delimiter + "" ); int col = 0; if ( st.hasMoreTokens() ) { table.setValue( col++, row, st.nextToken().trim() );