git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved to: https://sites.google.com/site/cmzmasek/home/software/forester
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
phylogeny
/
data
/
Identifier.java
diff --git
a/forester/java/src/org/forester/phylogeny/data/Identifier.java
b/forester/java/src/org/forester/phylogeny/data/Identifier.java
index
62dc722
..
8a897af
100644
(file)
--- a/
forester/java/src/org/forester/phylogeny/data/Identifier.java
+++ b/
forester/java/src/org/forester/phylogeny/data/Identifier.java
@@
-21,7
+21,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
package org.forester.phylogeny.data;
package org.forester.phylogeny.data;
@@
-32,24
+32,36
@@
import org.forester.io.parsers.nhx.NHXtags;
import org.forester.io.parsers.phyloxml.PhyloXmlMapping;
import org.forester.util.ForesterUtil;
import org.forester.io.parsers.phyloxml.PhyloXmlMapping;
import org.forester.util.ForesterUtil;
-public class Identifier implements PhylogenyData {
+public final class Identifier implements PhylogenyData {
- final String _value;
- final String _provider;
+ final public static String NCBI = "ncbi";
+ final public static String REFSEQ = "refseq";
+ final public static String SP = "sp";
+ final private String _value;
+ final private String _provider;
+ final private String _value_provider;
public Identifier() {
_value = "";
_provider = "";
public Identifier() {
_value = "";
_provider = "";
+ _value_provider = "";
}
public Identifier( final String value ) {
_value = value;
_provider = "";
}
public Identifier( final String value ) {
_value = value;
_provider = "";
+ _value_provider = value;
}
public Identifier( final String value, final String provider ) {
_value = value;
_provider = provider;
}
public Identifier( final String value, final String provider ) {
_value = value;
_provider = provider;
+ if ( provider != null ) {
+ _value_provider = value + provider;
+ }
+ else {
+ _value_provider = value;
+ }
}
@Override
}
@Override
@@
-69,6
+81,10
@@
public class Identifier implements PhylogenyData {
return sb;
}
return sb;
}
+ public String getValuePlusProvider() {
+ return _value_provider;
+ }
+
@Override
public PhylogenyData copy() {
return new Identifier( getValue(), getProvider() );
@Override
public PhylogenyData copy() {
return new Identifier( getValue(), getProvider() );
@@
-101,10
+117,7
@@
public class Identifier implements PhylogenyData {
@Override
public int hashCode() {
@Override
public int hashCode() {
- if ( getProvider() != null ) {
- return ( getProvider() + getValue() ).hashCode();
- }
- return getValue().hashCode();
+ return _value_provider.hashCode();
}
@Override
}
@Override