X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FWSWUBlastClient.java;h=6e7df710776261fafacee819af4edc6c3bb4f3f9;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=cc5fbed18aad88deaafe5eb6f12f7352435a67d8;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java
index cc5fbed..6e7df71 100755
--- a/src/jalview/io/WSWUBlastClient.java
+++ b/src/jalview/io/WSWUBlastClient.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.
  * 
@@ -20,15 +20,29 @@
  */
 package jalview.io;
 
-import java.util.*;
+import jalview.analysis.AlignSeq;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.Sequence;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.CutAndPasteTransfer;
+import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
+import jalview.util.MessageManager;
 
-import javax.swing.*;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
-import jalview.analysis.*;
-import jalview.datamodel.*;
-import jalview.gui.*;
-import jalview.util.MessageManager;
-import uk.ac.ebi.www.*;
+import javax.swing.ImageIcon;
+
+import uk.ac.ebi.www.Data;
+import uk.ac.ebi.www.InputParams;
+import uk.ac.ebi.www.WSFile;
+import uk.ac.ebi.www.WSWUBlast;
+import uk.ac.ebi.www.WSWUBlastService;
+import uk.ac.ebi.www.WSWUBlastServiceLocator;
 
 /**
  * DOCUMENT ME!
@@ -60,12 +74,11 @@ public class WSWUBlastClient
   {
     this.ap = ap;
     this.al = al;
-    output.setText(MessageManager
-            .getString("label.wswublast_client_credits"));
+    output.setText(
+            MessageManager.getString("label.wswublast_client_credits"));
 
-    Desktop.addInternalFrame(output, MessageManager
-            .getString("label.blasting_for_unidentified_sequence"), 800,
-            300);
+    Desktop.addInternalFrame(output, MessageManager.getString(
+            "label.blasting_for_unidentified_sequence"), 800, 300);
 
     for (int i = 0; i < ids.size(); i++)
     {
@@ -115,15 +128,14 @@ public class WSWUBlastClient
           {
             identitiesFound = true;
 
-            int value = Integer.parseInt(data.substring(
-                    data.indexOf("(") + 1, data.indexOf("%")));
+            int value = Integer.parseInt(data
+                    .substring(data.indexOf("(") + 1, data.indexOf("%")));
 
             if (value >= maxFound)
             {
               maxFound = value;
               buffer.append(" " + id2 + " " + value + "%; ");
-              suggestedIds.addElement(new Object[]
-              { seq, id2 });
+              suggestedIds.addElement(new Object[] { seq, id2 });
             }
           }
         }
@@ -137,11 +149,11 @@ public class WSWUBlastClient
   {
     // This must be outside the run() body as java 1.5
     // will not return any value from the OptionPane to the expired thread.
-    int reply = JOptionPane.showConfirmDialog(Desktop.desktop,
+    int reply = JvOptionPane.showConfirmDialog(Desktop.desktop,
             "Automatically update suggested ids?",
-            "Auto replace sequence ids", JOptionPane.YES_NO_OPTION);
+            "Auto replace sequence ids", JvOptionPane.YES_NO_OPTION);
 
-    if (reply == JOptionPane.YES_OPTION)
+    if (reply == JvOptionPane.YES_OPTION)
     {
       Enumeration keys = suggestedIds.elements();
       while (keys.hasMoreElements())
@@ -163,12 +175,12 @@ public class WSWUBlastClient
           }
         }
 
-        DBRefEntry[] entries = oldseq.getDBRef();
+        DBRefEntry[] entries = oldseq.getDBRefs();
         if (entries != null)
         {
           oldseq.addDBRef(new jalview.datamodel.DBRefEntry(
-                  jalview.datamodel.DBRefSource.UNIPROT, "0", entries[0]
-                          .getAccessionId()));
+                  jalview.datamodel.DBRefSource.UNIPROT, "0",
+                  entries[0].getAccessionId()));
         }
       }
     }
@@ -188,8 +200,8 @@ public class WSWUBlastClient
 
       for (int i = 0; i < 9; i++)
       {
-        java.net.URL url = getClass().getResource(
-                "/images/dna" + (i + 1) + ".gif");
+        java.net.URL url = getClass()
+                .getResource("/images/dna" + (i + 1) + ".gif");
 
         if (url != null)
         {
@@ -198,6 +210,7 @@ public class WSWUBlastClient
       }
     }
 
+    @Override
     public void run()
     {
       while (jobsRunning > 0)
@@ -208,8 +221,10 @@ public class WSWUBlastClient
           imageIndex++;
           imageIndex %= 9;
           output.setFrameIcon(imageIcon[imageIndex]);
-          output.setTitle("BLASTing for unidentified sequences - "
-                  + jobsRunning + " jobs running.");
+          output.setTitle(MessageManager.formatMessage(
+                  "label.blasting_for_unidentified_sequence_jobs_running",
+                  new String[]
+                  { Integer.valueOf(jobsRunning).toString() }));
         } catch (Exception ex)
         {
         }
@@ -236,6 +251,7 @@ public class WSWUBlastClient
       this.sequence = sequence;
     }
 
+    @Override
     public void run()
     {
       StartJob();