X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2Fdata%2FAccession.java;h=3a565abc7edc6a8dee6789de251a64f073336c5c;hb=6721c2fefe276eef3e17773812b05474d609ebc4;hp=c2b44355220b3d59f8e04e0a7dfcdcfbdd750649;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/data/Accession.java b/forester/java/src/org/forester/phylogeny/data/Accession.java index c2b4435..3a565ab 100644 --- a/forester/java/src/org/forester/phylogeny/data/Accession.java +++ b/forester/java/src/org/forester/phylogeny/data/Accession.java @@ -32,14 +32,21 @@ import org.forester.io.parsers.nhx.NHXtags; import org.forester.io.parsers.phyloxml.PhyloXmlMapping; import org.forester.util.ForesterUtil; -public class Accession implements PhylogenyData { +public final class Accession implements PhylogenyData { - final String _value; - final String _source; + final private String _value; + final private String _source; + final private String _value_source; public Accession( final String value, final String source ) { _value = value; _source = source; + if ( source != null ) { + _value_source = value + source; + } + else { + _value_source = value; + } } @Override @@ -91,10 +98,10 @@ public class Accession implements PhylogenyData { @Override public int hashCode() { - if ( getSource() != null ) { - return ( getSource() + getValue() ).hashCode(); - } - return getValue().hashCode(); + //if ( getSource() != null ) { + // return ( getSource() + getValue() ).hashCode(); + // } + return _value_source.hashCode(); } @Override