X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPDBSearchPanel.java;h=9b94c2713303272ee50925ab0adf39ee12cb8a66;hb=c9df9ff2328d948b50aecced66df5f0b57edac82;hp=77626054fa98dd599f20e5707714edaf94d28f85;hpb=2e9f37c7818e03fc46d626f288cb6b7d03e4c2f5;p=jalview.git

diff --git a/src/jalview/gui/PDBSearchPanel.java b/src/jalview/gui/PDBSearchPanel.java
index 7762605..9b94c27 100644
--- a/src/jalview/gui/PDBSearchPanel.java
+++ b/src/jalview/gui/PDBSearchPanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -54,54 +54,77 @@ public class PDBSearchPanel extends GPDBSearchPanel
             .getProgressIndicator();
   }
 
-
   /**
    * Action performed when an input is detected on txt_search field.
    */
   @Override
   public void txt_search_ActionPerformed()
   {
-    btn_ok.setEnabled(false);
-    boolean allowEmptySequence = false;
-    mainFrame.setTitle(MessageManager
-            .getString("label.pdb_sequence_getcher"));
-    tbl_summary.setModel(new DefaultTableModel());
-    if (txt_search.getText().trim().length() > 0)
+    new Thread()
     {
-      long startTime = System.currentTimeMillis();
-
-      String searchTarget = ((PDBDocField) cmb_searchTarget
-              .getSelectedItem()).getCode();
-
-      wantedFields = PDBDocFieldPreferences
-              .getSearchSummaryFields();
-
-      String searchTerm = decodeSearchTerm(txt_search.getText(),
-              searchTarget);
-
-      PDBRestRequest request = new PDBRestRequest();
-      request.setAllowEmptySeq(allowEmptySequence);
-      request.setResponseSize(100);
-      request.setFieldToSearchBy("(" + searchTarget + ":");
-      request.setSearchTerm(searchTerm + ")");
-      request.setWantedFields(wantedFields);
-      // System.out.println(">>>>>>>>>>>>>> " + request.getQuery());
-      PDBRestClient pdbRestCleint = new PDBRestClient();
-      PDBRestResponse resultList = pdbRestCleint.executeRequest(request);
-      if (resultList.getSearchSummary() != null)
+      @Override
+      public void run()
       {
-        tbl_summary.setModel(PDBRestResponse.getTableModel(request,
-                resultList.getSearchSummary()));
-      }
+        lbl_loading.setVisible(false);
+        errorWarning.setLength(0);
+        lbl_warning.setVisible(false);
+        btn_ok.setEnabled(false);
+        boolean allowEmptySequence = false;
+        mainFrame.setTitle(MessageManager
+                .getString("label.pdb_sequence_getcher"));
+        tbl_summary.setModel(new DefaultTableModel());
+        if (txt_search.getText().trim().length() > 0)
+        {
+          lbl_loading.setVisible(true);
+          long startTime = System.currentTimeMillis();
 
-      long endTime = System.currentTimeMillis();
-      int resultSetCount = resultList.getNumberOfItemsFound();
-      String result = (resultSetCount > 1) ? MessageManager
-              .getString("label.results") : MessageManager
-              .getString("label.result");
-      mainFrame.setTitle(frameTitle + " - " + resultSetCount + " " + result
-              + " (" + (endTime - startTime) + " milli secs)");
-    }
+          String searchTarget = ((PDBDocField) cmb_searchTarget
+                  .getSelectedItem()).getCode();
+
+          wantedFields = PDBDocFieldPreferences.getSearchSummaryFields();
+
+          String searchTerm = decodeSearchTerm(txt_search.getText(),
+                  searchTarget);
+
+          PDBRestRequest request = new PDBRestRequest();
+          request.setAllowEmptySeq(allowEmptySequence);
+          request.setResponseSize(100);
+          request.setFieldToSearchBy("(" + searchTarget + ":");
+          request.setSearchTerm(searchTerm + ")");
+          request.setWantedFields(wantedFields);
+          // System.out.println(">>>>>>>>>>>>>> " + request.getQuery());
+          PDBRestClient pdbRestCleint = new PDBRestClient();
+          PDBRestResponse resultList;
+          try
+          {
+            resultList = pdbRestCleint.executeRequest(request);
+          } catch (Exception e)
+          {
+            // e.printStackTrace();
+            errorWarning.append(e.getMessage());
+            checkForErrors();
+            return;
+          }
+
+          if (resultList.getSearchSummary() != null)
+          {
+            tbl_summary.setModel(PDBRestResponse.getTableModel(request,
+                    resultList.getSearchSummary()));
+          }
+
+          PDBRestResponse.configureTableColumn(tbl_summary, wantedFields);
+
+          long endTime = System.currentTimeMillis();
+          int resultSetCount = resultList.getNumberOfItemsFound();
+          String result = (resultSetCount > 1) ? MessageManager
+                  .getString("label.results") : MessageManager
+                  .getString("label.result");
+          mainFrame.setTitle(frameTitle + " - " + resultSetCount + " "
+                  + result + " (" + (endTime - startTime) + " milli secs)");
+          lbl_loading.setVisible(false);
+        }
+      }
+    }.start();
   }
 
   public static String decodeSearchTerm(String enteredText,
@@ -140,7 +163,6 @@ public class PDBSearchPanel extends GPDBSearchPanel
     return foundSearchTerms;
   }
 
-
   @Override
   public void btn_ok_ActionPerformed()
   {
@@ -160,12 +182,22 @@ public class PDBSearchPanel extends GPDBSearchPanel
     mainFrame.dispose();
   }
 
+  @Override
+  public void transferToSequenceFetcher(String ids)
+  {
+    // mainFrame.dispose();
+    seqFetcher.textArea.setText(ids);
+    Thread worker = new Thread(seqFetcher);
+    worker.start();
+  }
+
   /**
    * Add the discovered/selected sequences to a target alignment window
    */
   public void loadSelectedPDBSequencesToAlignment()
   {
-    mainFrame.dispose();
+    // mainFrame.dispose();
+    disableActionButtons();
     StringBuilder selectedIds = new StringBuilder();
     HashSet<String> selectedIdsSet = new HashSet<String>();
     int pdbIdCol = PDBRestClient.getPDBIdColumIndex(wantedFields, false);
@@ -184,10 +216,40 @@ public class PDBSearchPanel extends GPDBSearchPanel
     }
 
     String ids = selectedIds.toString();
-    System.out.println(">>>>>>>>>>>>>>>> selected Ids: " + ids);
+    // System.out.println(">>>>>>>>>>>>>>>> selected Ids: " + ids);
     seqFetcher.textArea.setText(ids);
     Thread worker = new Thread(seqFetcher);
     worker.start();
+    delayAndEnableActionButtons();
+
+  }
+
+  private void disableActionButtons()
+  {
+    btn_ok.setEnabled(false);
+    btn_back.setEnabled(false);
+    btn_cancel.setEnabled(false);
+  }
+
+  private void delayAndEnableActionButtons()
+  {
+    new Thread()
+    {
+      @Override
+      public void run()
+      {
+        try
+        {
+          Thread.sleep(1500);
+        } catch (InterruptedException e)
+        {
+          e.printStackTrace();
+        }
+        btn_ok.setEnabled(true);
+        btn_back.setEnabled(true);
+        btn_cancel.setEnabled(true);
+      }
+    }.start();
   }
 
   public static String getPDBIdwithSpecifiedChain(String pdbId,
@@ -219,6 +281,7 @@ public class PDBSearchPanel extends GPDBSearchPanel
   /**
    * Populates search target combo-box options
    */
+  @Override
   public void populateCmbSearchTargetOptions()
   {
     List<PDBDocField> searchableTargets = new ArrayList<PDBDocField>();
@@ -246,4 +309,15 @@ public class PDBSearchPanel extends GPDBSearchPanel
     }
   }
 
+  public void checkForErrors()
+  {
+    lbl_warning.setVisible(false);
+    if (errorWarning.length() > 0)
+    {
+      lbl_loading.setVisible(false);
+      lbl_warning.setToolTipText(JvSwingUtils.wrapTooltip(true,
+              errorWarning.toString()));
+      lbl_warning.setVisible(true);
+    }
+  }
 }