JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / io / WSWUBlastClient.java

diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java
index 4f0d802..9d9b940 100755 (executable)
--- 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.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 javax.swing.JOptionPane;
+
+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!
@@ -122,8 +136,7 @@ public class WSWUBlastClient
             {
               maxFound = value;
               buffer.append(" " + id2 + " " + value + "%; ");
-              suggestedIds.addElement(new Object[]
-              { seq, id2 });
+              suggestedIds.addElement(new Object[] { seq, id2 });
             }
           }
         }
@@ -163,7 +176,7 @@ public class WSWUBlastClient
           }
         }
 
-        DBRefEntry[] entries = oldseq.getDBRef();
+        DBRefEntry[] entries = oldseq.getDBRefs();
         if (entries != null)
         {
           oldseq.addDBRef(new jalview.datamodel.DBRefEntry(
@@ -208,7 +221,9 @@ public class WSWUBlastClient
           imageIndex++;
           imageIndex %= 9;
           output.setFrameIcon(imageIcon[imageIndex]);
-          output.setTitle(MessageManager.formatMessage("label.blasting_for_unidentified_sequence_jobs_running", new String[]{Integer.valueOf(jobsRunning).toString()}));
+          output.setTitle(MessageManager.formatMessage(
+                  "label.blasting_for_unidentified_sequence_jobs_running",
+                  new String[] { Integer.valueOf(jobsRunning).toString() }));
         } catch (Exception ex)
         {
         }