X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FBasicTable.java;h=2c7afc84022484a0c2272c2226544c5c275d66c6;hb=e9ca0dc1764303d53fc6b9b087f33cdee53726ea;hp=2469129b517ac3ec1556ac1bdce1d8cc08fcacab;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/util/BasicTable.java b/forester/java/src/org/forester/util/BasicTable.java index 2469129..2c7afc8 100644 --- a/forester/java/src/org/forester/util/BasicTable.java +++ b/forester/java/src/org/forester/util/BasicTable.java @@ -5,7 +5,7 @@ // Copyright (C) 2008-2009 Christian M. Zmasek // Copyright (C) 2008-2009 Burnham Institute for Medical Research // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -15,7 +15,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -107,7 +107,7 @@ public class BasicTable { } public E getValue( final int col, final int row ) throws IllegalArgumentException { - if ( ( row > getNumberOfRows() - 1 ) || ( row < 0 ) ) { + if ( ( row > ( getNumberOfRows() - 1 ) ) || ( row < 0 ) ) { throw new IllegalArgumentException( "value for row (" + row + ") is out of range [number of rows: " + getNumberOfRows() + "]" ); } @@ -151,10 +151,10 @@ public class BasicTable { if ( ( row < 0 ) || ( col < 0 ) ) { throw new IllegalArgumentException( "attempt to use negative values for row or column" ); } - if ( row > getNumberOfRows() - 1 ) { + if ( row > ( getNumberOfRows() - 1 ) ) { setMaxRow( row ); } - if ( col > getNumberOfColumns() - 1 ) { + if ( col > ( getNumberOfColumns() - 1 ) ) { setMaxCol( col ); } final String row_key = "" + row; @@ -175,11 +175,11 @@ public class BasicTable { for( int row = 0; row < getNumberOfRows(); ++row ) { for( int col = 0; col < getNumberOfColumns(); ++col ) { sb.append( getValue( col, row ) ); - if ( col < getNumberOfColumns() - 1 ) { + if ( col < ( getNumberOfColumns() - 1 ) ) { sb.append( " " ); } } - if ( row < getNumberOfRows() - 1 ) { + if ( row < ( getNumberOfRows() - 1 ) ) { sb.append( ForesterUtil.LINE_SEPARATOR ); } }