Jalview.isJS() --> Platform.isJS(), DBRefEntry[] --> List<DBRefEntry>

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

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index f9d7760..1e6d678 100755 (executable)
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -145,8 +145,8 @@ public class SequenceFetcher extends JPanel implements Runnable
 
     frame = new JInternalFrame();
     frame.setContentPane(this);
-    int height = Platform.isAMac() ? 240 : 180;
-    Desktop.addInternalFrame(frame, getFrameTitle(), true, 400, height);
+    Desktop.addInternalFrame(frame, getFrameTitle(), true, 400, 
+               Platform.isAMacAndNotJS() ? 240 : 180);
   }
 
   private String getFrameTitle()
@@ -187,13 +187,13 @@ public class SequenceFetcher extends JPanel implements Runnable
 
         if ("pdb".equalsIgnoreCase(currentSelection))
         {
-          new PDBFTSPanel(SequenceFetcher.this);
           frame.dispose();
+          new PDBFTSPanel(SequenceFetcher.this);
         }
         else if ("uniprot".equalsIgnoreCase(currentSelection))
         {
-          new UniprotFTSPanel(SequenceFetcher.this);
           frame.dispose();
+          new UniprotFTSPanel(SequenceFetcher.this);
         }
         else
         {
@@ -207,11 +207,11 @@ public class SequenceFetcher extends JPanel implements Runnable
     JLabel jLabel1 = new JLabel(MessageManager
             .getString("label.separate_multiple_accession_ids"));
     jLabel1.setFont(new Font("Verdana", Font.ITALIC, 11));
-    jLabel1.setHorizontalAlignment(SwingConstants.CENTER);
+    jLabel1.setHorizontalAlignment(SwingConstants.LEFT);
 
     replacePunctuation = new JCheckBox(
             MessageManager.getString("label.replace_commas_semicolons"));
-    replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER);
+    replacePunctuation.setHorizontalAlignment(SwingConstants.LEFT);
     replacePunctuation.setFont(new Font("Verdana", Font.ITALIC, 11));
     okBtn = new JButton(MessageManager.getString("action.ok"));
     okBtn.addActionListener(new ActionListener()
@@ -750,13 +750,14 @@ public class SequenceFetcher extends JPanel implements Runnable
 
     for (String q : queries)
     {
-      DBRefEntry dbr = new DBRefEntry();
-      dbr.setSource(proxy.getDbSource());
-      dbr.setVersion(null);
+       // BH 2019.01.25 dbr is never used.
+//      DBRefEntry dbr = new DBRefEntry();
+//      dbr.setSource(proxy.getDbSource());
+//      dbr.setVersion(null);
       String accId = proxy.getAccessionIdFromQuery(q);
-      dbr.setAccessionId(accId);
+//      dbr.setAccessionId(accId);
       boolean rfound = false;
-      for (int r = 0; r < rs.length; r++)
+      for (int r = 0, nr = rs.length; r < nr; r++)
       {
         if (rs[r] != null)
         {