From: cmzmasek <cmzmasek@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Sun, 30 Dec 2012 05:27:19 +0000 (+0000)
Subject: if ( !lineage.get( i ).equalsIgnoreCase( up_taxonomy.getLineage().get( i ) ) ) {
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4ccce273c55bc45e8097b284c3d90319f9279646;p=jalview.git

if ( !lineage.get( i ).equalsIgnoreCase( up_taxonomy.getLineage().get( i ) ) ) {

becomes:

if ( i == up_taxonomy.getLineage().size() || !lineage.get( i ).equalsIgnoreCase( up_taxonomy.getLineage().get( i ) ) ) {
---

diff --git a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
index 48b434c..302a93c 100644
--- a/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
+++ b/forester/java/src/org/forester/analysis/TaxonomyDataManager.java
@@ -337,7 +337,7 @@ public final class TaxonomyDataManager extends RunnableProcess {
                 for( final UniProtTaxonomy up_taxonomy : up_taxonomies ) {
                     boolean match = true;
                     I: for( int i = 0; i < lineage.size(); ++i ) {
-                        if ( !lineage.get( i ).equalsIgnoreCase( up_taxonomy.getLineage().get( i ) ) ) {
+                        if ( i == up_taxonomy.getLineage().size() || !lineage.get( i ).equalsIgnoreCase( up_taxonomy.getLineage().get( i ) ) ) {
                             match = false;
                             break I;
                         }