Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / src / jalview / ws / dbsources / EmblFlatfileSource.java

diff --git a/src/jalview/ws/dbsources/EmblFlatfileSource.java b/src/jalview/ws/dbsources/EmblFlatfileSource.java
index 7d3c6dd..6694a52 100644 (file)
--- a/src/jalview/ws/dbsources/EmblFlatfileSource.java
+++ b/src/jalview/ws/dbsources/EmblFlatfileSource.java
@@ -24,7 +24,7 @@ import jalview.ws.ebi.EBIFetchClient;
  */
 public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
 {
-  private static final Regex ACCESSION_REGEX = new Regex("^[A-Z]+[0-9]+");
+  private static final Regex ACCESSION_REGEX = null;
 
   @Override
   public String getDbVersion()
@@ -41,6 +41,10 @@ public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
   @Override
   public Regex getAccessionValidator()
   {
+    if (ACCESSION_REGEX == null)
+    {
+      ACCESSION_REGEX = Platform.newRegex("^[A-Z]+[0-9]+");
+    }
     return ACCESSION_REGEX;
   }
 
@@ -97,7 +101,6 @@ public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
       file = reply.getAbsolutePath();
       FileParse fp = new FileParse(file, DataSourceType.FILE);
       EmblFlatFile emblParser = new EmblFlatFile(fp, getDbSource());
-      emblParser.parse();
       SequenceI[] seqs = emblParser.getSeqsAsArray();
       if (seqs.length > 0)
       {