X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblFlatfileSource.java;h=577bc0f3dcef5f5d757a42ecc5d41c8b5a660e79;hb=c0501eaa85c0594f9275766f64de8ea44a59c368;hp=6694a524622bc72b88c0137694a2fc278f8bdf3b;hpb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;p=jalview.git

diff --git a/src/jalview/ws/dbsources/EmblFlatfileSource.java b/src/jalview/ws/dbsources/EmblFlatfileSource.java
index 6694a52..577bc0f 100644
--- a/src/jalview/ws/dbsources/EmblFlatfileSource.java
+++ b/src/jalview/ws/dbsources/EmblFlatfileSource.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.dbsources;
 
 import java.util.Locale;
@@ -7,13 +27,14 @@ import java.io.IOException;
 
 import com.stevesoft.pat.Regex;
 
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.io.DataSourceType;
 import jalview.io.EmblFlatFile;
 import jalview.io.FileParse;
+import jalview.util.Platform;
 import jalview.ws.ebi.EBIFetchClient;
 
 /**
@@ -24,7 +45,7 @@ import jalview.ws.ebi.EBIFetchClient;
  */
 public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
 {
-  private static final Regex ACCESSION_REGEX = null;
+  private static final Regex ACCESSION_REGEX = Platform.newRegex("^[A-Z]+[0-9]+");
 
   @Override
   public String getDbVersion()
@@ -41,10 +62,6 @@ 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;
   }
 
@@ -79,7 +96,8 @@ public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
     try
     {
       reply = dbFetch.fetchDataAsFile(
-              dbName.toLowerCase(Locale.ROOT) + ":" + query.trim(), null, "gz");
+              dbName.toLowerCase(Locale.ROOT) + ":" + query.trim(), null,
+              "gz");
     } catch (Exception e)
     {
       stopQuery();
@@ -109,8 +127,7 @@ public abstract class EmblFlatfileSource extends EbiFileRetrievedProxy
 
       if (al == null)
       {
-        Cache.log.error(
-                "No record found for '" + dbName + ":" + query + "'");
+        Console.error("No record found for '" + dbName + ":" + query + "'");
       }
     }