git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3829 open web page for 3d beacons structure by right-clicking and selecting pop...
[jalview.git]
/
src
/
jalview
/
gui
/
VamsasApplication.java
diff --git
a/src/jalview/gui/VamsasApplication.java
b/src/jalview/gui/VamsasApplication.java
index
973cfe8
..
19ede62
100644
(file)
--- a/
src/jalview/gui/VamsasApplication.java
+++ b/
src/jalview/gui/VamsasApplication.java
@@
-264,8
+264,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
{
if (!inSession())
{
{
if (!inSession())
{
- throw new Error(MessageManager.getString(
- "error.implementation_error_vamsas_operation_not_init"));
+ throw new Error(
+ "Implementation error! Vamsas Operations when client not initialised and connected");
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
@@
-351,8
+351,7
@@
public class VamsasApplication implements SelectionSource, VamsasSource
{
if (!inSession())
{
{
if (!inSession())
{
- throw new Error(MessageManager
- .getString("error.jalview_no_connected_vamsas_session"));
+ throw new Error("Jalview not connected to Vamsas session");
}
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
}
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
@@
-484,8
+483,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
errorsDuringUpdate = true;
Cache.log.error("Exception synchronizing " + af.getTitle()
+ " "
errorsDuringUpdate = true;
Cache.log.error("Exception synchronizing " + af.getTitle()
+ " "
- + (af.getViewport().viewName == null ? ""
- : " view " + af.getViewport().viewName)
+ + (af.getViewport().getViewName() == null ? ""
+ : " view " + af.getViewport().getViewName())
+ " to document.", e);
stored = false;
}
+ " to document.", e);
stored = false;
}
@@
-688,7
+687,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
public void disableGui(boolean b)
{
public void disableGui(boolean b)
{
- Desktop.instance.setVamsasUpdate(b);
+ // JAL-3311 TODO: remove this class!
+ // Desktop.instance.setVamsasUpdate(b);
}
Hashtable _backup_vobj2jv;
}
Hashtable _backup_vobj2jv;
@@
-721,8
+721,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
return;
}
return;
}
- throw new Error(MessageManager.getString(
- "error.implementation_error_cannot_recover_vamsas_object_mappings"));
+ throw new Error(
+ "IMPLEMENTATION ERROR: Cannot recover vamsas object mappings - no backup was made");
}
jv2vobj.clear();
Iterator el = _backup_jv2vobj.entrySet().iterator();
}
jv2vobj.clear();
Iterator el = _backup_jv2vobj.entrySet().iterator();