X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblProtein.java;h=f586ed6fcaead0d1dc830a6eb44b3dbdefddeb66;hb=990ed4ffbaa7a95b2ebb6bf6ab0440310f6e83ab;hp=0280f1613a16c6f17ed32b44ac345364ebd56685;hpb=a8e0667a62546cdd95d44a45cf14a629cfa416a6;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblProtein.java b/src/jalview/ext/ensembl/EnsemblProtein.java index 0280f16..f586ed6 100644 --- a/src/jalview/ext/ensembl/EnsemblProtein.java +++ b/src/jalview/ext/ensembl/EnsemblProtein.java @@ -23,6 +23,7 @@ package jalview.ext.ensembl; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; +import jalview.util.Platform; import java.util.ArrayList; import java.util.List; @@ -42,8 +43,7 @@ public class EnsemblProtein extends EnsemblSeqProxy * or ENSMUSP or similar for other species * or CCDSnnnnn.nn with at least 3 digits */ - private static final Regex ACCESSION_REGEX = new Regex( - "(ENS([A-Z]{3}|)P[0-9]{11}$)" + "|" + "(CCDS[0-9.]{3,}$)"); + private static Regex ACCESSION_REGEX; /** * Default constructor (to use rest.ensembl.org) @@ -119,6 +119,11 @@ public class EnsemblProtein extends EnsemblSeqProxy @Override public Regex getAccessionValidator() { + if (ACCESSION_REGEX == null) + { + ACCESSION_REGEX = Platform.newRegex( + "(ENS([A-Z]{3}|)P[0-9]{11}$)" + "|" + "(CCDS[0-9.]{3,}$)", null); + } return ACCESSION_REGEX; }