From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Mon, 18 Nov 2013 20:26:31 +0000 (+0000)
Subject: ACIBL -> KORVE
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ed9211a3bbd54e89e33a83655a9d4210c457a23a;p=jalview.git

ACIBL -> KORVE
PYRKO -> THEKO
---

diff --git a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
index 52b5fdf..1652603 100644
--- a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
+++ b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
@@ -57,7 +57,7 @@ public final class TaxonomyDataManager extends RunnableProcess {
         CODE, SN, CN, ID, LIN;
     }
     private static final int                              MAX_CACHE_SIZE           = 100000;
-    private static final int                              MAX_TAXONOMIES_TO_RETURN = 10;
+    private static final int                              MAX_TAXONOMIES_TO_RETURN = 2000;
     private static final HashMap<String, UniProtTaxonomy> _sn_up_cache_map         = new HashMap<String, UniProtTaxonomy>();
     private static final HashMap<String, UniProtTaxonomy> _lineage_up_cache_map    = new HashMap<String, UniProtTaxonomy>();
     private static final HashMap<String, UniProtTaxonomy> _code_up_cache_map       = new HashMap<String, UniProtTaxonomy>();
diff --git a/forester/java/src/org/forester/phylogeny/data/Taxonomy.java b/forester/java/src/org/forester/phylogeny/data/Taxonomy.java
index 26ed940..2e15149 100644
--- a/forester/java/src/org/forester/phylogeny/data/Taxonomy.java
+++ b/forester/java/src/org/forester/phylogeny/data/Taxonomy.java
@@ -318,11 +318,21 @@ public class Taxonomy implements PhylogenyData, MultipleUris, Comparable<Taxonom
         _synonyms = synonyms;
     }
 
-    public void setTaxonomyCode( final String taxonomy_code ) throws PhyloXmlDataFormatException {
+    public void setTaxonomyCode( String taxonomy_code ) throws PhyloXmlDataFormatException {
         if ( !ForesterUtil.isEmpty( taxonomy_code )
                 && !PhyloXmlUtil.TAXOMONY_CODE_PATTERN.matcher( taxonomy_code ).matches() ) {
             throw new PhyloXmlDataFormatException( "illegal taxonomy code: [" + taxonomy_code + "]" );
         }
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //TODO FIXME (added on 13-11-18) remove me eventually
+        if ( taxonomy_code.equals( "ACIBL" ) ) {
+            taxonomy_code = "KORVE";
+        }
+        else if ( taxonomy_code.equals( "PYRKO" ) ) {
+            taxonomy_code = "THEKO";
+        }
+        //TODO FIXME (added on 13-11-18) remove me eventually
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         _taxonomy_code = taxonomy_code;
     }