merge from develop

[jalview.git] / src / jalview / gui / PDBSearchPanel.java

diff --git a/src/jalview/gui/PDBSearchPanel.java b/src/jalview/gui/PDBSearchPanel.java
index 964a7d8..b31c637 100644 (file)
--- a/src/jalview/gui/PDBSearchPanel.java
+++ b/src/jalview/gui/PDBSearchPanel.java
@@ -61,62 +61,68 @@ public class PDBSearchPanel extends GPDBSearchPanel
   @Override
   public void txt_search_ActionPerformed()
   {
-    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)
+    new Thread()
     {
-      long startTime = System.currentTimeMillis();
+      public void run()
+      {
+        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();
 
-      String searchTarget = ((PDBDocField) cmb_searchTarget
-              .getSelectedItem()).getCode();
+          String searchTarget = ((PDBDocField) cmb_searchTarget
+                  .getSelectedItem()).getCode();
 
-      wantedFields = PDBDocFieldPreferences
-              .getSearchSummaryFields();
+          wantedFields = PDBDocFieldPreferences.getSearchSummaryFields();
 
-      String searchTerm = decodeSearchTerm(txt_search.getText(),
-              searchTarget);
+          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)
-      {
-        // System.out.println(">>>>>>>>>>>>>>>" + e.getMessage());
-        // JOptionPane.showMessageDialog(this, e.getMessage(),
-        // "PDB Web-service Error", JOptionPane.ERROR_MESSAGE);
-        errorWarning.append(e.getMessage());
-        checkForErrors();
-        return;
-      }
+          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()));
-      }
+          if (resultList.getSearchSummary() != null)
+          {
+            tbl_summary.setModel(PDBRestResponse.getTableModel(request,
+                    resultList.getSearchSummary()));
+          }
 
-      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)");
-    }
+          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,
@@ -274,6 +280,7 @@ public class PDBSearchPanel extends GPDBSearchPanel
     lbl_warning.setVisible(false);
     if (errorWarning.length() > 0)
     {
+      lbl_loading.setVisible(false);
       lbl_warning.setToolTipText(JvSwingUtils.wrapTooltip(true,
               errorWarning.toString()));
       lbl_warning.setVisible(true);