X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FSequenceIdParser.java;h=d75a6dd8e6e2237a02a551cd56698f5d8b24f9c4;hb=32b66090883b7ca47347fef19152d84bd02c0b9d;hp=767a310f810843ae7f88ae277b927cce580871fd;hpb=6721c2fefe276eef3e17773812b05474d609ebc4;p=jalview.git diff --git a/forester/java/src/org/forester/util/SequenceIdParser.java b/forester/java/src/org/forester/util/SequenceIdParser.java index 767a310..d75a6dd 100644 --- a/forester/java/src/org/forester/util/SequenceIdParser.java +++ b/forester/java/src/org/forester/util/SequenceIdParser.java @@ -32,7 +32,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.forester.phylogeny.data.Identifier; -import org.forester.ws.uniprot.DatabaseTools; public final class SequenceIdParser { @@ -65,11 +64,7 @@ public final class SequenceIdParser { private final static Pattern REFSEQ_PATTERN = Pattern .compile( "(?:\\A|.*[^a-zA-Z0-9])([A-Z]{2}_\\d{6,})(?:[^a-zA-Z0-9]|\\Z)" ); - - private final static boolean DEBUG = true; - - - + /** * Returns null if no match. @@ -78,6 +73,7 @@ public final class SequenceIdParser { public final static Identifier parse( final String s ) { String v = parseGenbankAccessor( s ); if ( !ForesterUtil.isEmpty( v ) ) { + return new Identifier( v, Identifier.NCBI ); } v = parseRefSeqAccessor( s );