From 623e0cec1e04c5374a4fba2d425ae65973b362a6 Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Tue, 18 Sep 2012 01:41:12 +0000 Subject: [PATCH] in progress --- forester/java/src/org/forester/util/BasicTableParser.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/forester/java/src/org/forester/util/BasicTableParser.java b/forester/java/src/org/forester/util/BasicTableParser.java index bc369bf..6592f17 100644 --- a/forester/java/src/org/forester/util/BasicTableParser.java +++ b/forester/java/src/org/forester/util/BasicTableParser.java @@ -62,6 +62,9 @@ public class BasicTableParser { final String start_of_comment_line, final boolean tables_separated_by_single_string_line ) throws IOException { + if ( use_first_separator_only && use_last_separator_only ) { + throw new IllegalArgumentException(); + } final BufferedReader reader = ForesterUtil.obtainReader( source ); final List> tables = new ArrayList>(); BasicTable table = new BasicTable(); @@ -95,8 +98,8 @@ public class BasicTableParser { for( int i = 0; i < e.length - 1; ++i ) { rest.append( e[ i ].trim() ); } - table.setValue( 0, row, e[ e.length - 1 ] ); - table.setValue( 1, row, rest.toString() ); + table.setValue( 0, row, rest.toString() ); + table.setValue( 1, row, e[ e.length - 1 ] ); } else { final StringTokenizer st = new StringTokenizer( line, column_delimiter ); @@ -117,8 +120,8 @@ public class BasicTableParser { } } } + ++row; } - ++row; } if ( !table.isEmpty() ) { tables.add( table ); -- 1.7.10.2