From: cmzmasek@gmail.com Date: Tue, 8 Oct 2013 06:34:55 +0000 (+0000) Subject: inprogress X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ae4720d312a5f16547340c75c1ef8917299f83f8;p=jalview.git inprogress --- diff --git a/forester_applications/src/org/forester/applications/genome_counts_for_once_appearing_dcs.java b/forester_applications/src/org/forester/applications/genome_counts_for_once_appearing_dcs.java index d7ed36a..29320bf 100644 --- a/forester_applications/src/org/forester/applications/genome_counts_for_once_appearing_dcs.java +++ b/forester_applications/src/org/forester/applications/genome_counts_for_once_appearing_dcs.java @@ -130,7 +130,7 @@ public class genome_counts_for_once_appearing_dcs { System.out.println( i ); } System.out.println(); - for( String dc : appearing_once_dcs ) { + for( final String dc : appearing_once_dcs ) { System.out.println( "1\t" + dc ); } } diff --git a/forester_applications/src/org/forester/applications/simple_node_processor.java b/forester_applications/src/org/forester/applications/simple_node_processor.java index 6f27819..7b77a4f 100644 --- a/forester_applications/src/org/forester/applications/simple_node_processor.java +++ b/forester_applications/src/org/forester/applications/simple_node_processor.java @@ -109,8 +109,8 @@ public class simple_node_processor { // } if ( node.isExternal() ) { if ( node.getNodeData().isHasTaxonomy() ) { - Taxonomy t = node.getNodeData().getTaxonomy(); - if ( !ForesterUtil.isEmpty( t.getTaxonomyCode() ) && t.getTaxonomyCode().length() == 5 ) { + final Taxonomy t = node.getNodeData().getTaxonomy(); + if ( !ForesterUtil.isEmpty( t.getTaxonomyCode() ) && ( t.getTaxonomyCode().length() == 5 ) ) { if ( node.getName().equalsIgnoreCase( t.getTaxonomyCode() ) ) { node.setName( "" ); } diff --git a/forester_applications/src/org/forester/applications/tax_code_cleaner.java b/forester_applications/src/org/forester/applications/tax_code_cleaner.java index 4af65fd..0bc4616 100644 --- a/forester_applications/src/org/forester/applications/tax_code_cleaner.java +++ b/forester_applications/src/org/forester/applications/tax_code_cleaner.java @@ -184,7 +184,7 @@ public class tax_code_cleaner { t.setTaxonomyCode( "" ); } else if ( tc.length() == 6 ) { - Pattern p = Pattern.compile( "[A-Z9][A-Z]{2}[A-Z0-9]{2}\\d" ); + final Pattern p = Pattern.compile( "[A-Z9][A-Z]{2}[A-Z0-9]{2}\\d" ); if ( p.matcher( tc ).matches() ) { t.setTaxonomyCode( tc.substring( 0, 5 ) ); }