X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblProtein.java;h=f586ed6fcaead0d1dc830a6eb44b3dbdefddeb66;hb=990ed4ffbaa7a95b2ebb6bf6ab0440310f6e83ab;hp=8a57a1670ba520da444a1455ce58e9d4f2050f0a;hpb=0b8abe58b934e03c34575b06d532a99f0ba70196;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblProtein.java b/src/jalview/ext/ensembl/EnsemblProtein.java
index 8a57a16..f586ed6 100644
--- a/src/jalview/ext/ensembl/EnsemblProtein.java
+++ b/src/jalview/ext/ensembl/EnsemblProtein.java
@@ -1,17 +1,68 @@
+/*
+ * 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.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;
+
+import com.stevesoft.pat.Regex;
+
+/**
+ * A client to fetch protein translated sequence for an Ensembl identifier
+ * 
+ * @author gmcarstairs
+ *
+ */
 public class EnsemblProtein extends EnsemblSeqProxy
 {
+  /*
+   * accepts ENSP with 11 digits
+   * or ENSMUSP or similar for other species
+   * or CCDSnnnnn.nn with at least 3 digits
+   */
+  private static Regex ACCESSION_REGEX;
 
+  /**
+   * Default constructor (to use rest.ensembl.org)
+   */
   public EnsemblProtein()
   {
     super();
   }
 
+  /**
+   * Constructor given the target domain to fetch data from
+   * 
+   * @param d
+   */
+  public EnsemblProtein(String d)
+  {
+    super(d);
+  }
+
   @Override
   public String getDbName()
   {
@@ -47,8 +98,7 @@ public class EnsemblProtein extends EnsemblSeqProxy
    * applicable to the protein product sequence
    */
   @Override
-  protected void addFeaturesAndProduct(String accId, AlignmentI alignment,
-          SequenceI genomicSequence)
+  protected void addFeaturesAndProduct(String accId, AlignmentI alignment)
   {
   }
 
@@ -60,10 +110,45 @@ public class EnsemblProtein extends EnsemblSeqProxy
   }
 
   @Override
-  protected boolean identifiesSequence(SequenceFeature sf, String accId)
+  protected List<SequenceFeature> getIdentifyingFeatures(SequenceI seq,
+          String accId)
   {
-    // not applicable - protein sequence is not a 'subset' of genomic sequence
-    return false;
+    return new ArrayList<>();
+  }
+
+  @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;
+  }
+
+  /**
+   * Returns an accession id for a query, including conversion of ENST* to
+   * ENSP*. This supports querying for the protein sequence for a transcript
+   * (ENST identifier) and returning the ENSP identifier.
+   */
+  @Override
+  public String getAccessionIdFromQuery(String query)
+  {
+    String accId = super.getAccessionIdFromQuery(query);
+
+    /*
+     * ensure last character before (11) digits is P
+     * ENST00000288602 -> ENSP00000288602
+     * ENSMUST00000288602 -> ENSMUSP00000288602
+     */
+    if (accId != null && accId.length() >= 12)
+    {
+      char[] chars = accId.toCharArray();
+      chars[chars.length - 12] = 'P';
+      accId = new String(chars);
+    }
+    return accId;
   }
 
 }