Merge remote-tracking branch 'origin/develop' into bug/JAL-2665-2.10.3

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

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index d92f6c0..0a6b9d6 100644 (file)
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -93,10 +93,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
   {
     mainPanel.add(this);
-    initDialogFrame(mainPanel, true, false,
-            MessageManager
-                    .getString("label.select_database_retrieval_source"),
-            650, 490);
+    initDialogFrame(mainPanel, true, false, MessageManager
+            .getString("label.select_database_retrieval_source"), 650, 490);
     /*
      * Dynamically generated database list will need a translation function from
      * internal source to externally distinct names. UNIPROT and UP_NAME are
@@ -154,8 +152,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     dbviews = new JTree(new DefaultTreeModel(root, false));
     dbviews.setCellRenderer(new DbTreeRenderer(this));
 
-    dbviews.getSelectionModel().setSelectionMode(
-            TreeSelectionModel.SINGLE_TREE_SELECTION);
+    dbviews.getSelectionModel()
+            .setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
     svp = new JScrollPane(dbviews);
     svp.setMinimumSize(new Dimension(100, 200));
     svp.setPreferredSize(new Dimension(200, 400));
@@ -186,8 +184,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
         }
       }
     });
-    JPanel jc = new JPanel(new BorderLayout()), j = new JPanel(
-            new FlowLayout());
+    JPanel jc = new JPanel(new BorderLayout()),
+            j = new JPanel(new FlowLayout());
     jc.add(svp, BorderLayout.CENTER);
 
     java.awt.Font f;
@@ -241,9 +239,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       }
       else
       {
-        throw new Error(
-                MessageManager
-                        .getString("error.implementation_error_cant_reorder_tree"));
+        throw new Error(MessageManager
+                .getString("error.implementation_error_cant_reorder_tree"));
       }
     }
     jalview.util.QuickSort.sort(names, nodes);
@@ -254,8 +251,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     }
   }
 
-  private class DbTreeRenderer extends DefaultTreeCellRenderer implements
-          TreeCellRenderer
+  private class DbTreeRenderer extends DefaultTreeCellRenderer
+          implements TreeCellRenderer
   {
     JDatabaseTree us;
 
@@ -378,8 +375,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     {
       for (TreePath tp : tsel)
       {
-        DefaultMutableTreeNode admt, dmt = (DefaultMutableTreeNode) tp
-                .getLastPathComponent();
+        DefaultMutableTreeNode admt,
+                dmt = (DefaultMutableTreeNode) tp.getLastPathComponent();
         if (dmt.getUserObject() != null)
         {
           /*
@@ -394,13 +391,13 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
           {
             if (allowMultiSelections)
             {
-              srcs.addAll(sfetcher.getSourceProxy((String) dmt
-                      .getUserObject()));
+              srcs.addAll(sfetcher
+                      .getSourceProxy((String) dmt.getUserObject()));
             }
             else
             {
-              srcs.add(sfetcher
-                      .getSourceProxy((String) dmt.getUserObject()).get(0));
+              srcs.add(sfetcher.getSourceProxy((String) dmt.getUserObject())
+                      .get(0));
               forcedFirstChild = true;
             }
           }
@@ -445,22 +442,26 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     if (allowMultiSelections)
     {
       dbstatus.setText(MessageManager.formatMessage(
-              "label.selected_database_to_fetch_from", new String[] {
-                  Integer.valueOf(srcs.size()).toString(),
+              "label.selected_database_to_fetch_from", new String[]
+              { Integer.valueOf(srcs.size()).toString(),
                   (srcs.size() == 1 ? "" : "s"),
-                  (srcs.size() > 0 ? " with " + x + " test quer"
-                          + (x == 1 ? "y" : "ies") : ".") }));
+                  (srcs.size() > 0
+                          ? " with " + x + " test quer"
+                                  + (x == 1 ? "y" : "ies")
+                          : ".") }));
     }
     else
     {
       if (nm.length() > 0)
       {
-        dbstatus.setText(MessageManager.formatMessage(
-                "label.database_param", new String[] { nm }));
+        dbstatus.setText(MessageManager
+                .formatMessage("label.database_param", new String[]
+                { nm }));
         if (qr.length() > 0)
         {
-          dbstatex.setText(MessageManager.formatMessage(
-                  "label.example_param", new String[] { qr }));
+          dbstatex.setText(MessageManager
+                  .formatMessage("label.example_param", new String[]
+                  { qr }));
         }
       }
       else