X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FBasicTableParser.java;h=74dd567d39018d25c9c54b0151f5d7c2f72917c5;hb=72c535142a5e6b0da9c7edb2f605eb835b43e6fb;hp=59e5cd28fb0fcd27930451bb56b9f44476fe1d93;hpb=0cbfc79c69ccbfca7ac42a1381d62d449bf1adf6;p=jalview.git diff --git a/forester/java/src/org/forester/util/BasicTableParser.java b/forester/java/src/org/forester/util/BasicTableParser.java index 59e5cd2..74dd567 100644 --- a/forester/java/src/org/forester/util/BasicTableParser.java +++ b/forester/java/src/org/forester/util/BasicTableParser.java @@ -67,18 +67,12 @@ public class BasicTableParser { final boolean use_start_of_comment_line = !( ForesterUtil.isEmpty( start_of_comment_line ) ); while ( ( line = reader.readLine() ) != null ) { line = line.trim(); - if ( !ForesterUtil.isEmpty( line) && - - - (( line.charAt( 0 ) == '"' && line.charAt( line.length() -1 ) == '"' && ForesterUtil.countChars( line, '"' ) == 2 ) - - || - - - ( line.charAt( 0 ) == '\'' && line.charAt( line.length() -1 ) == '\'' && ForesterUtil.countChars( line, '\'' ) == 2 ) ) ) { - line = line.substring( 1, line.length() -1 ).trim(); + if ( !ForesterUtil.isEmpty( line ) + && ( ( ( line.charAt( 0 ) == '"' ) && ( line.charAt( line.length() - 1 ) == '"' ) && ( ForesterUtil + .countChars( line, '"' ) == 2 ) ) || ( ( line.charAt( 0 ) == '\'' ) + && ( line.charAt( line.length() - 1 ) == '\'' ) && ( ForesterUtil.countChars( line, '\'' ) == 2 ) ) ) ) { + line = line.substring( 1, line.length() - 1 ).trim(); } - if ( saw_first_table && ( ForesterUtil.isEmpty( line ) || ( tables_separated_by_single_string_line && ( line .indexOf( column_delimiter ) < 0 ) ) ) ) {