X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FVamsasApplication.java;h=77a7693031077dae490f665a695136d6e28e68de;hb=0155cd99a3b96570ad67dbc992c731ba2ce74bb9;hp=764b2563a4d7e77cb373bb4c89945c4ff83956ba;hpb=b81d4d7d46ea8b1c89df086fb847baab6b69d427;p=jalview.git
diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java
index 764b256..77a7693 100644
--- a/src/jalview/gui/VamsasApplication.java
+++ b/src/jalview/gui/VamsasApplication.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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;
@@ -28,6 +31,7 @@ import jalview.structure.SelectionSource;
import jalview.structure.StructureSelectionManager;
import jalview.structure.VamsasListener;
import jalview.structure.VamsasSource;
+import jalview.util.MessageManager;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -45,7 +49,6 @@ import uk.ac.vamsas.client.ClientHandle;
import uk.ac.vamsas.client.IClient;
import uk.ac.vamsas.client.IClientDocument;
import uk.ac.vamsas.client.InvalidSessionDocumentException;
-import uk.ac.vamsas.client.NoDefaultSessionException;
import uk.ac.vamsas.client.UserHandle;
import uk.ac.vamsas.client.VorbaId;
import uk.ac.vamsas.client.picking.IMessageHandler;
@@ -62,7 +65,7 @@ import uk.ac.vamsas.objects.core.Seg;
* @author jimp
*
*/
-public class VamsasApplication implements SelectionSource,VamsasSource
+public class VamsasApplication implements SelectionSource, VamsasSource
{
IClient vclient = null;
@@ -153,8 +156,7 @@ public class VamsasApplication implements SelectionSource,VamsasSource
{
if (sess != null)
{
- throw new Error(
- "Implementation Error - cannot import existing vamsas document into an existing session, Yet!");
+ throw new Error(MessageManager.getString("error.implementation_error_cannot_import_vamsas_doc"));
}
try
{
@@ -174,8 +176,8 @@ public class VamsasApplication implements SelectionSource,VamsasSource
.showInternalMessageDialog(
Desktop.desktop,
- "VAMSAS Document could not be opened as a new session - please choose another",
- "VAMSAS Document Import Failed",
+ MessageManager.getString("label.vamsas_doc_couldnt_be_opened_as_new_session"),
+ MessageManager.getString("label.vamsas_document_import_failed"),
JOptionPane.ERROR_MESSAGE);
}
@@ -261,8 +263,7 @@ public class VamsasApplication implements SelectionSource,VamsasSource
{
if (!inSession())
{
- throw new Error(
- "Impementation error! Vamsas Operations when client not initialised and connected.");
+ throw new Error(MessageManager.getString("error.implementation_error_vamsas_operation_not_init"));
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
@@ -346,7 +347,7 @@ public class VamsasApplication implements SelectionSource,VamsasSource
public void end_session(boolean promptUser)
{
if (!inSession())
- throw new Error("Jalview not connected to Vamsas session.");
+ throw new Error(MessageManager.getString("error.jalview_no_connected_vamsas_session"));
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
{
@@ -714,8 +715,7 @@ public class VamsasApplication implements SelectionSource,VamsasSource
return;
}
- throw new Error(
- "IMPLEMENTATION ERROR: Cannot recover vamsas object mappings - no backup was made.");
+ throw new Error(MessageManager.getString("error.implementation_error_cannot_recover_vamsas_object_mappings"));
}
jv2vobj.clear();
Iterator el = _backup_jv2vobj.entrySet().iterator();
@@ -958,7 +958,8 @@ public class VamsasApplication implements SelectionSource,VamsasSource
int i = -1;
- public void mouseOver(SequenceI seq, int index, VamsasSource source)
+ public void mouseOver(SequenceI seq, int index,
+ VamsasSource source)
{
if (jv2vobj == null)
return;
@@ -1021,7 +1022,7 @@ public class VamsasApplication implements SelectionSource,VamsasSource
{
String[] vobj = new String[seqsel.getSize()];
int o = 0;
- for (SequenceI sel:seqsel.getSequences(null))
+ for (SequenceI sel : seqsel.getSequences(null))
{
VorbaId v = (VorbaId) jv2vobj.get(sel);
if (v != null)