X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDBRefFetcher.java;h=9742bca1d0f8c5419d673e9608359b8815ea3bd1;hb=fe55e5ed429347087cccb692e014f23c01026327;hp=a55658bdf461eb6fc3e08cec1919046e67ecc971;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/ws/DBRefFetcher.java b/src/jalview/ws/DBRefFetcher.java
index a55658b..9742bca 100644
--- a/src/jalview/ws/DBRefFetcher.java
+++ b/src/jalview/ws/DBRefFetcher.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
@@ -14,6 +14,7 @@
* 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws;
@@ -30,6 +31,7 @@ import jalview.gui.CutAndPasteTransfer;
import jalview.gui.Desktop;
import jalview.gui.IProgressIndicator;
import jalview.gui.OOMWarning;
+import jalview.util.MessageManager;
import jalview.ws.dbsources.das.api.jalviewSourceI;
import jalview.ws.seqfetcher.DbSourceProxy;
@@ -136,10 +138,13 @@ public class DBRefFetcher implements Runnable
{
jalviewSourceI src = en.nextElement();
List sp = src.getSequenceSourceProxies();
- selsources.addAll(sp);
- if (sp.size() > 1)
+ if (sp != null)
{
- Cache.log.debug("Added many Db Sources for :" + src.getTitle());
+ selsources.addAll(sp);
+ if (sp.size() > 1)
+ {
+ Cache.log.debug("Added many Db Sources for :" + src.getTitle());
+ }
}
}
// select appropriate databases based on alignFrame context.
@@ -446,17 +451,15 @@ public class DBRefFetcher implements Runnable
} // all databases have been queries.
if (sbuffer.length() > 0)
{
- output.setText("Your sequences have been verified against known sequence databases. Some of the ids have been\n"
- + "altered, most likely the start/end residue will have been updated.\n"
- + "Save your alignment to maintain the updated id.\n\n"
+ output.setText(MessageManager.getString("label.your_sequences_have_been_verified")
+ sbuffer.toString());
- Desktop.addInternalFrame(output, "Sequence names updated ", 600, 300);
+ Desktop.addInternalFrame(output, MessageManager.getString("label.sequence_names_updated"), 600, 300);
// The above is the dataset, we must now find out the index
// of the viewed sequence
}
- af.setProgressBar("DBRef search completed", startTime);
+ af.setProgressBar(MessageManager.getString("label.dbref_search_completed"), startTime);
// promptBeforeBlast();
running = false;