X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fdevelopment%2FMsaRenderer.java;h=ee82c70e2dc0e3313ef349ea2c8c1d7bcd02fa61;hb=f1685730483f80ab450666b9debf318c0b45b273;hp=4ad13230526fc0c575b681a5bd0ebb742942a1d4;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/development/MsaRenderer.java b/forester/java/src/org/forester/development/MsaRenderer.java index 4ad1323..ee82c70 100644 --- a/forester/java/src/org/forester/development/MsaRenderer.java +++ b/forester/java/src/org/forester/development/MsaRenderer.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.development; @@ -150,7 +150,7 @@ public class MsaRenderer extends JComponent { @Override public Dimension getPreferredSize() { final int width = ( getWellSize() + 1 ) * ( getColumns() + 1 ); - final int hight = ( getWellSize() + 1 ) * ( getRows() + 1 ) + 30; + final int hight = ( ( getWellSize() + 1 ) * ( getRows() + 1 ) ) + 30; return new Dimension( width, hight ); } @@ -168,7 +168,7 @@ public class MsaRenderer extends JComponent { private void initializeWells() { _wells = new AbstractRenderer[ getRows() + 1 ][ getColumns() + 1 ]; for( int row = 0; row < getRows(); row++ ) { - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { AbstractRenderer r; if ( col == getColumns() ) { // r = new LabelRenderer( PlateData.ALPHABET[ row % PlateData.ALPHABET.length ] + "", this ); @@ -183,7 +183,7 @@ public class MsaRenderer extends JComponent { // setAbstractRenderer( r, row, col ); } } - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { // AbstractRenderer r; if ( col == getColumns() ) { // r = new LabelRenderer( "", this ); @@ -221,8 +221,8 @@ public class MsaRenderer extends JComponent { // g // .drawString( "Number:" + getPlateData().getName() + " Replicate:" // + ( getPlateData().getReplicateNumber() + 1 ), 10, 20 ); - for( int row = 0; row < getRows() + 1; row++ ) { - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int row = 0; row < ( getRows() + 1 ); row++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { getAbstractRenderer( row, col ).paint( g ); } } @@ -245,11 +245,11 @@ public class MsaRenderer extends JComponent { public void resetWellSize( final int well_size ) { setWellSize( well_size ); final int factor = well_size + 0; - for( int row = 0; row < getRows() + 1; row++ ) { - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int row = 0; row < ( getRows() + 1 ); row++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { final AbstractRenderer r = getAbstractRenderer( row, col ); - r.setX( 10 + factor * col ); - r.setY( factor * row + 30 ); + r.setX( 10 + ( factor * col ) ); + r.setY( ( factor * row ) + 30 ); r.setWellSize( well_size ); } } @@ -296,19 +296,19 @@ public class MsaRenderer extends JComponent { } private void setIsSelectedOfAll( final boolean isSelected ) { - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { setIsSelectedOfColumn( col, isSelected ); } } private void setIsSelectedOfColumn( final int column, final boolean isSelected ) { - for( int row = 0; row < getRows() + 1; row++ ) { + for( int row = 0; row < ( getRows() + 1 ); row++ ) { getAbstractRenderer( row, column ).setIsSelected( isSelected ); } } private void setIsSelectedOfRow( final int row, final boolean isSelected ) { - for( int col = 0; col < getColumns() + 1; col++ ) { + for( int col = 0; col < ( getColumns() + 1 ); col++ ) { getAbstractRenderer( row, col ).setIsSelected( isSelected ); } }