X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=35bc29ad3eae2d53cc4d84987f425e87f7f354b3;hb=6752a167ac486ce6edb2ac0314618e2072f29cd3;hp=45d944df495781e0f1eb80e5de296c98085f5e56;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index 45d944d..35bc29a 100755
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
@@ -76,7 +78,7 @@ public class SequenceFetcher extends JPanel implements Runnable
if (guiWindow != null)
{
guiWindow.setProgressBar(
- "Waiting for Sequence Database Fetchers to initialise",
+ MessageManager.getString("status.waiting_sequence_database_fetchers_init"),
Thread.currentThread().hashCode());
}
// initting happening on another thread - so wait around to see if it
@@ -95,7 +97,7 @@ public class SequenceFetcher extends JPanel implements Runnable
if (guiWindow != null)
{
guiWindow.setProgressBar(
- "Waiting for Sequence Database Fetchers to initialise",
+ MessageManager.getString("status.waiting_sequence_database_fetchers_init"),
Thread.currentThread().hashCode());
}
}
@@ -113,7 +115,7 @@ public class SequenceFetcher extends JPanel implements Runnable
*/
if (guiWindow != null)
{
- guiWindow.setProgressBar("Initialising Sequence Database Fetchers",
+ guiWindow.setProgressBar(MessageManager.getString("status.init_sequence_database_fetchers"),
Thread.currentThread().hashCode());
}
dasRegistry = jalview.bin.Cache.getDasSourceRegistry();
@@ -122,7 +124,7 @@ public class SequenceFetcher extends JPanel implements Runnable
jalview.ws.SequenceFetcher sf = new jalview.ws.SequenceFetcher();
if (guiWindow != null)
{
- guiWindow.setProgressBar("Initialising Sequence Database Fetchers",
+ guiWindow.setProgressBar(MessageManager.getString("status.init_sequence_database_fetchers"),
Thread.currentThread().hashCode());
}
lastDasSourceRegistry = (dasRegistry.getDasRegistryURL() + dasRegistry
@@ -159,8 +161,8 @@ public class SequenceFetcher extends JPanel implements Runnable
JOptionPane
.showInternalMessageDialog(
Desktop.desktop,
- "Could not create the sequence fetcher client. Check error logs for details.",
- "Couldn't create SequenceFetcher",
+ MessageManager.getString("warn.couldnt_create_sequence_fetcher_client"),
+ MessageManager.getString("label.couldnt_create_sequence_fetcher"),
JOptionPane.ERROR_MESSAGE);
}
});
@@ -217,8 +219,7 @@ public class SequenceFetcher extends JPanel implements Runnable
private String getFrameTitle()
{
- return ((alignFrame == null) ? "New " : "Additional ")
- + "Sequence Fetcher";
+ return ((alignFrame == null) ? MessageManager.getString("label.new_sequence_fetcher") : MessageManager.getString("label.additional_sequence_fetcher"));
}
private void jbInit() throws Exception
@@ -229,12 +230,14 @@ public class SequenceFetcher extends JPanel implements Runnable
dbeg.setFont(new java.awt.Font("Verdana", Font.BOLD, 11));
jLabel1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));
jLabel1.setHorizontalAlignment(SwingConstants.CENTER);
- jLabel1.setText(MessageManager.getString("label.separate_multiple_accession_ids"));
+ jLabel1.setText(MessageManager
+ .getString("label.separate_multiple_accession_ids"));
replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER);
replacePunctuation
.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));
- replacePunctuation.setText(MessageManager.getString("label.replace_commas_semicolons"));
+ replacePunctuation.setText(MessageManager
+ .getString("label.replace_commas_semicolons"));
ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
@@ -306,7 +309,9 @@ public class SequenceFetcher extends JPanel implements Runnable
+ database.getSelectedSources().size()
+ " others)" : ""));
String eq = database.getExampleQueries();
- dbeg.setText(MessageManager.formatMessage("label.example_query_param", new String[]{eq}));
+ dbeg.setText(MessageManager.formatMessage(
+ "label.example_query_param", new String[]
+ { eq }));
boolean enablePunct = !(eq != null && eq.indexOf(",") > -1);
for (DbSourceProxy dbs : database.getSelectedSources())
{
@@ -488,8 +493,7 @@ public class SequenceFetcher extends JPanel implements Runnable
try
{
// update status
- guiWindow.setProgressBar("Fetching " + nqueries
- + " sequence queries from " + proxy.getDbName(), Thread
+ guiWindow.setProgressBar(MessageManager.formatMessage("status.fetching_sequence_queries_from", new String[]{Integer.valueOf(nqueries).toString(),proxy.getDbName()}), Thread
.currentThread().hashCode());
isAliSource = proxy.isA(DBRefSource.ALIGNMENTDB);
if (proxy.getAccessionSeparator() == null)
@@ -687,11 +691,11 @@ public class SequenceFetcher extends JPanel implements Runnable
presultTitle.add(titl);
}
}
- guiWindow.setProgressBar("Finished querying", Thread.currentThread()
+ guiWindow.setProgressBar(MessageManager.getString("status.finshed_querying"), Thread.currentThread()
.hashCode());
}
- guiWindow.setProgressBar((presult.size() > 0) ? "Parsing results."
- : "Processing ..", Thread.currentThread().hashCode());
+ guiWindow.setProgressBar((presult.size() > 0) ? MessageManager.getString("status.parsing_results")
+ : MessageManager.getString("status.processing"), Thread.currentThread().hashCode());
// process results
while (presult.size() > 0)
{
@@ -804,7 +808,8 @@ public class SequenceFetcher extends JPanel implements Runnable
Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
- af.statusBar.setText(MessageManager.getString("label.successfully_pasted_alignment_file"));
+ af.statusBar.setText(MessageManager
+ .getString("label.successfully_pasted_alignment_file"));
try
{
@@ -845,7 +850,8 @@ public class SequenceFetcher extends JPanel implements Runnable
public void run()
{
JOptionPane.showInternalMessageDialog(Desktop.desktop, error,
- MessageManager.getString("label.error_retrieving_data"), JOptionPane.WARNING_MESSAGE);
+ MessageManager.getString("label.error_retrieving_data"),
+ JOptionPane.WARNING_MESSAGE);
}
});
}