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-2137 prevent NPE when inFile is null. Not sure this is correct ?
[jalview.git]
/
src
/
jalview
/
gui
/
VamsasApplication.java
diff --git
a/src/jalview/gui/VamsasApplication.java
b/src/jalview/gui/VamsasApplication.java
index
6444667
..
7588e07
100644
(file)
--- a/
src/jalview/gui/VamsasApplication.java
+++ b/
src/jalview/gui/VamsasApplication.java
@@
-156,7
+156,9
@@
public class VamsasApplication implements SelectionSource, VamsasSource
{
if (sess != null)
{
{
if (sess != null)
{
- throw new Error(MessageManager.getString("error.implementation_error_cannot_import_vamsas_doc"));
+ throw new Error(
+ MessageManager
+ .getString("error.implementation_error_cannot_import_vamsas_doc"));
}
try
{
}
try
{
@@
-176,8
+178,10
@@
public class VamsasApplication implements SelectionSource, VamsasSource
.showInternalMessageDialog(
Desktop.desktop,
.showInternalMessageDialog(
Desktop.desktop,
- MessageManager.getString("label.vamsas_doc_couldnt_be_opened_as_new_session"),
- MessageManager.getString("label.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);
}
JOptionPane.ERROR_MESSAGE);
}
@@
-263,7
+267,9
@@
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(
+ MessageManager
+ .getString("error.implementation_error_vamsas_operation_not_init"));
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
@@
-348,7
+354,9
@@
public class VamsasApplication implements SelectionSource, VamsasSource
{
if (!inSession())
{
{
if (!inSession())
{
- throw new Error(MessageManager.getString("error.jalview_no_connected_vamsas_session"));
+ throw new Error(
+ MessageManager
+ .getString("error.jalview_no_connected_vamsas_session"));
}
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
}
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
@@
-717,7
+725,9
@@
public class VamsasApplication implements SelectionSource, VamsasSource
return;
}
return;
}
- throw new Error(MessageManager.getString("error.implementation_error_cannot_recover_vamsas_object_mappings"));
+ throw new Error(
+ MessageManager
+ .getString("error.implementation_error_cannot_recover_vamsas_object_mappings"));
}
jv2vobj.clear();
Iterator el = _backup_jv2vobj.entrySet().iterator();
}
jv2vobj.clear();
Iterator el = _backup_jv2vobj.entrySet().iterator();
@@
-1013,9
+1023,9
@@
public class VamsasApplication implements SelectionSource, VamsasSource
if (source instanceof AlignViewport)
{
// the empty selection.
if (source instanceof AlignViewport)
{
// the empty selection.
- sm = new SelectionMessage("jalview", new String[]
- { ((AlignmentViewport) source).getSequenceSetId() }, null,
- true);
+ sm = new SelectionMessage("jalview",
+ new String[] { ((AlignmentViewport) source)
+ .getSequenceSetId() }, null, true);
}
else
{
}
else
{