X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fdbsources%2FUniprot.java;h=73775cf07b247c8f5eadf7fc2b61f592c0550997;hb=141abbd1a196f26a643318ed9677d0225c568402;hp=2452aed4b607423b0db11c01292b7b39acf4cb2e;hpb=f47e7c2da5a0542cd0020c727abb3dc05f8442e5;p=jalview.git

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index 2452aed..73775cf 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -60,11 +60,6 @@ public class Uniprot extends DbSourceProxyImpl
   private static Mapping map;
 
   /**
-   * configurable parameter controlling prefixing of entry names with accessions
-   */
-  private boolean includeAllIds = false;
-
-  /**
    * Constructor
    */
   public Uniprot()
@@ -208,7 +203,7 @@ public class Uniprot extends DbSourceProxyImpl
    */
   public SequenceI uniprotEntryToSequenceI(UniprotEntry entry)
   {
-    String id = getUniprotEntryId(entry, includeAllIds);
+    String id = getUniprotEntryId(entry);
     SequenceI sequence = new Sequence(id,
             entry.getUniprotSequence().getContent());
     sequence.setDescription(getUniprotEntryDescription(entry));
@@ -315,24 +310,12 @@ public class Uniprot extends DbSourceProxyImpl
   /**
    *
    * @param entry
-   *          UniportEntry
+   *          UniprotEntry
    * @return The accession id(s) and name(s) delimited by '|'.
    */
-  public static String getUniprotEntryId(UniprotEntry entry,
-          boolean includeAllIds)
+  public static String getUniprotEntryId(UniprotEntry entry)
   {
     StringBuilder name = new StringBuilder(32);
-    if (includeAllIds)
-    {
-      // // use 'canonicalised' name for optimal id matching
-      name.append(DBRefSource.UNIPROT);
-      for (String accessionId : entry.getAccession())
-      {
-        name.append(BAR_DELIMITER);
-        name.append(accessionId);
-      }
-
-    }
     for (String n : entry.getName())
     {
       if (name.length() > 0)