JAL-1620 version bump and release notes

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

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 30fbe13..0f240d6 100644 (file)
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -62,7 +62,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
   JButton getDatabaseSelectorButton()
   {
-    final JButton viewdbs = new JButton(MessageManager.getString("action.select_ddbb"));
+    final JButton viewdbs = new JButton(
+            MessageManager.getString("action.select_ddbb"));
     viewdbs.addActionListener(new ActionListener()
     {
 
@@ -85,7 +86,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
   public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
   {
-    initDialogFrame(this, true, false, "Select Database Retrieval Source",
+    initDialogFrame(this, true, false, MessageManager.getString("label.select_database_retrieval_source"),
             650, 490);
     /*
      * Dynamically generated database list will need a translation function from
@@ -218,8 +219,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       }
       else
       {
-        throw new Error(
-                "Implementation Error: Can't reorder this tree. Not DefaultMutableTreeNode.");
+        throw new Error(MessageManager.getString("error.implementation_error_cant_reorder_tree"));
       }
     }
     jalview.util.QuickSort.sort(names, nodes);
@@ -365,8 +365,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
             }
             else
             {
-              srcs.add(sfetcher.getSourceProxy((String) dmt
-                      .getUserObject()).get(0));
+              srcs.add(sfetcher
+                      .getSourceProxy((String) dmt.getUserObject()).get(0));
               forcedFirstChild = true;
             }
           }
@@ -409,17 +409,27 @@ 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(),(srcs.size() == 1 ? "" : "s"),(srcs.size() > 0 ? " with " + x + " test quer" + (x == 1 ? "y" : "ies") : ".")}));
+      dbstatus.setText(MessageManager.formatMessage(
+              "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") : ".") }));
       dbstatex.setText(" ");
     }
     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
         {