X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=a886723b786a219a90808d311315c093dd67fb8d;hb=81764c0a4a0a1807ac2a1cab2e4d99d588d09669;hp=43f5333fad8f6d877b8a68658d219d9e1a8cc7b3;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 43f5333..a886723 100644
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.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.
  * 
@@ -60,6 +60,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 {
   boolean allowMultiSelections = false;
 
+  public int action;
+
   JButton getDatabaseSelectorButton()
   {
     final JButton viewdbs = new JButton(
@@ -86,7 +88,9 @@ 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
@@ -220,7 +224,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       else
       {
         throw new Error(
-                "Implementation Error: Can't reorder this tree. Not DefaultMutableTreeNode.");
+                MessageManager
+                        .getString("error.implementation_error_cant_reorder_tree"));
       }
     }
     jalview.util.QuickSort.sort(names, nodes);
@@ -411,8 +416,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     if (allowMultiSelections)
     {
       dbstatus.setText(MessageManager.formatMessage(
-              "label.selected_database_to_fetch_from", new String[]
-              {
+              "label.selected_database_to_fetch_from", new String[] {
                   Integer.valueOf(srcs.size()).toString(),
                   (srcs.size() == 1 ? "" : "s"),
                   (srcs.size() > 0 ? " with " + x + " test quer"
@@ -424,13 +428,11 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       if (nm.length() > 0)
       {
         dbstatus.setText(MessageManager.formatMessage(
-                "label.database_param", new String[]
-                { nm }));
+                "label.database_param", new String[] { nm }));
         if (qr.length() > 0)
         {
           dbstatex.setText(MessageManager.formatMessage(
-                  "label.example_param", new String[]
-                  { qr }));
+                  "label.example_param", new String[] { qr }));
         }
         else
         {
@@ -545,10 +547,12 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   {
     if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
     {
+      action = arg0.getKeyCode();
       okPressed();
     }
     if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
     {
+      action = arg0.getKeyCode();
       cancelPressed();
     }
   }