X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fanalysis%2FTaxonomyDataManager.java;h=4cc61cd661289766cb34163a8687a5cc9fbc4c77;hb=10297bd8b8a4b4ab198a17a42fc6ff24ae2ed49b;hp=d78720cf4dcfc660171f46c48fe6f24b43089c4b;hpb=af5e25d369f3240ce41018957383044c12126d98;p=jalview.git diff --git a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java index d78720c..4cc61cd 100644 --- a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java +++ b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java @@ -133,7 +133,7 @@ public final class TaxonomyDataManager extends RunnableProcess { private final static UniProtTaxonomy obtainTaxonomy( final HashMap cache, final Object query, final QUERY_TYPE qt ) throws IOException, - AncestralTaxonomyInferenceException { + AncestralTaxonomyInferenceException { if ( cache.containsKey( query ) ) { return cache.get( query ).copy(); } @@ -202,7 +202,7 @@ public final class TaxonomyDataManager extends RunnableProcess { //FIXME fix "SPHAR" issue if ( ( ( query.indexOf( "XX" ) == 3 ) && TaxonomyUtil.isHasTaxIdFromFakeTaxCode( query ) ) || query.equals( "SPHAR" ) /* TODO remove me, is same as Sphingomonas aromaticivorans */ - ) { + ) { final int id = TaxonomyUtil.getTaxIdFromFakeTaxCode( query ); return SequenceDbWsTools.getTaxonomiesFromId( String.valueOf( id ), MAX_TAXONOMIES_TO_RETURN ); } @@ -219,7 +219,7 @@ public final class TaxonomyDataManager extends RunnableProcess { synchronized final private static SortedSet obtainDetailedTaxonomicInformation( final Phylogeny phy, final boolean delete, final boolean allow_to_use_basic_node_names ) - throws IOException, AncestralTaxonomyInferenceException { + throws IOException, AncestralTaxonomyInferenceException { clearCachesIfTooLarge(); final SortedSet not_found = new TreeSet(); List not_found_external_nodes = null; @@ -254,7 +254,7 @@ public final class TaxonomyDataManager extends RunnableProcess { if ( ( ( tax != null ) && ( isHasAppropriateId( tax ) || !ForesterUtil.isEmpty( tax.getScientificName() ) || !ForesterUtil.isEmpty( tax.getTaxonomyCode() ) || !ForesterUtil - .isEmpty( tax.getCommonName() ) ) ) ) { + .isEmpty( tax.getCommonName() ) ) ) ) { uniprot_tax = obtainUniProtTaxonomy( tax, null, qt ); } else { @@ -376,7 +376,7 @@ public final class TaxonomyDataManager extends RunnableProcess { else { final List matching_taxonomies = new ArrayList(); final List up_taxonomies = getTaxonomiesFromScientificName( lineage - .get( lineage.size() - 1 ) ); + .get( lineage.size() - 1 ) ); if ( ( up_taxonomies != null ) && ( up_taxonomies.size() > 0 ) ) { for( final UniProtTaxonomy up_taxonomy : up_taxonomies ) { boolean match = true; @@ -425,7 +425,7 @@ public final class TaxonomyDataManager extends RunnableProcess { } else { throw new AncestralTaxonomyInferenceException( "taxonomy \"" + ( lineage.get( lineage.size() - 1 ) ) - + "\" not found" ); + + "\" not found" ); } } } @@ -434,7 +434,7 @@ public final class TaxonomyDataManager extends RunnableProcess { final PhylogenyNode node, final Taxonomy tax, final UniProtTaxonomy up_tax ) - throws PhyloXmlDataFormatException { + throws PhyloXmlDataFormatException { if ( ( qt != QUERY_TYPE.SN ) && !ForesterUtil.isEmpty( up_tax.getScientificName() ) && ForesterUtil.isEmpty( tax.getScientificName() ) ) { tax.setScientificName( up_tax.getScientificName() ); @@ -512,7 +512,7 @@ public final class TaxonomyDataManager extends RunnableProcess { JOptionPane.WARNING_MESSAGE ); } catch ( final Exception e ) { - // Not important if this fails, do nothing. + // Not important if this fails, do nothing. } return; } @@ -564,7 +564,7 @@ public final class TaxonomyDataManager extends RunnableProcess { JOptionPane.WARNING_MESSAGE ); } catch ( final Exception e ) { - // Not important if this fails, do nothing. + // Not important if this fails, do nothing. } } else {