X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fapi%2FSiftsClientI.java;h=c795f3f23594a46e342d8fc2c6990921df7d730f;hb=742b61afae99cb551f7ac4454d97059dc3627829;hp=8a246e1e095c3c03c429b8090a8361685ad25092;hpb=9b6d2ddd33ba5e479953700040e1129847e47a06;p=jalview.git

diff --git a/src/jalview/api/SiftsClientI.java b/src/jalview/api/SiftsClientI.java
index 8a246e1..c795f3f 100644
--- a/src/jalview/api/SiftsClientI.java
+++ b/src/jalview/api/SiftsClientI.java
@@ -26,8 +26,11 @@ import jalview.ws.sifts.MappingOutputPojo;
 import jalview.ws.sifts.SiftsException;
 import jalview.xml.binding.sifts.Entry.Entity;
 
+import java.util.HashMap;
 import java.util.HashSet;
 
+// JBPComment: this isn't a top-level Jalview API - should be in its own package api
+
 public interface SiftsClientI
 {
   /**
@@ -45,13 +48,6 @@ public interface SiftsClientI
   public String getDbCoordSys();
 
   /**
-   * Get DB Evidence for the SIFTs Entry
-   * 
-   * @return
-   */
-  public String getDbEvidence();
-
-  /**
    * Get DB Source for the SIFTs Entry
    * 
    * @return
@@ -95,22 +91,17 @@ public interface SiftsClientI
    * @param accessionId
    * @return
    */
-  public boolean isFoundInSiftsEntry(String accessionId);
-
-  /**
-   * Get the standard DB referenced by the SIFTs Entry
-   * 
-   * @return
-   */
-  public String[] getEntryDBs();
+  public boolean isAccessionMatched(String accessionId);
 
   /**
    * 
    * @param mop
    *          MappingOutputPojo
    * @return Sequence<->Structure mapping as int[][]
+   * @throws SiftsException
    */
-  public StringBuffer getMappingOutput(MappingOutputPojo mop);
+  public StringBuffer getMappingOutput(MappingOutputPojo mop)
+          throws SiftsException;
 
   /**
    * 
@@ -125,7 +116,7 @@ public interface SiftsClientI
    */
   public StructureMapping getSiftsStructureMapping(SequenceI seq,
           String pdbFile, String chain) throws SiftsException;
-  
+
   /**
    * Get residue by residue mapping for a given Sequence and SIFTs entity
    * 
@@ -136,6 +127,6 @@ public interface SiftsClientI
    * @return generated mapping
    * @throws Exception
    */
-  public int[][] getGreedyMapping(String entityId, SequenceI seq,
-          java.io.PrintStream os) throws SiftsException;
+  public HashMap<Integer, int[]> getGreedyMapping(String entityId,
+          SequenceI seq, java.io.PrintStream os) throws SiftsException;
 }
\ No newline at end of file