JAL-1563 reverted to old uniprot fetcher to enable Geoff's presentation tomorrow

diff --git a/resources/fts/uniprot_data_columns.txt b/resources/fts/uniprot_data_columns.txt
index 10f5043..40e28e4 100644 (file)
--- a/resources/fts/uniprot_data_columns.txt
+++ b/resources/fts/uniprot_data_columns.txt
@@ -34,7 +34,7 @@ _data_column.max_col_width
 _data_column.preferred_col_width
 _data_column.is_shown_by_default
 _data_column.is_searchable
-Entry Name;entry name;String;g3;80;100;85;true;true
+Entry Name;entry name;String;g3;90;150;95;true;true
 Protein names;protein names;String;g3;300;1500;500;true;true
 Gene Names;genes;String;g3;50;1000;95;true;true
 Organism;organism;String;g3;50;1000;95;true;true
@@ -88,7 +88,7 @@ Miscellaneous [CC];comment(GENERAL);String;g6;50;1000;95;false;false
 Keywords;keywords;String;g6;50;1000;95;false;true
 Protein existence;existence;String;g6;50;1000;95;false;true
 Status;reviewed;String;g6;50;1000;95;false;true
-ALL;entry name;String;g7;50;1000;95;false;true;
+ALL;name;String;g7;50;1000;95;false;true;
 Subunit structure [CC];comment(SUBUNIT);String;g9;50;1000;95;false;false
 Interacts with;interactor;String;g9;50;1000;95;false;true
 Developmental stage;comment(DEVELOPMENTAL STAGE);String;g10;50;1000;95;false;false

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index ab78ad3..7dcd2b9 100755 (executable)
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -380,11 +380,12 @@ public class SequenceFetcher extends JPanel implements Runnable
         {
           pdbSourceAction();
         }
-        else if (currentSelection.equalsIgnoreCase("uniprot")
-                && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) == 0)))
-        {
-          uniprotSourceAction();
-        }
+        // else if (currentSelection.equalsIgnoreCase("uniprot")
+        // && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) ==
+        // 0)))
+        // {
+        // uniprotSourceAction();
+        // }
         else
         {
           otherSourceAction();