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-1925 update source version in license
[jalview.git]
/
src
/
jalview
/
gui
/
VamsasApplication.java
diff --git
a/src/jalview/gui/VamsasApplication.java
b/src/jalview/gui/VamsasApplication.java
index
b789040
..
8ade00d
100644
(file)
--- a/
src/jalview/gui/VamsasApplication.java
+++ b/
src/jalview/gui/VamsasApplication.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-31,12
+31,13
@@
import jalview.structure.SelectionSource;
import jalview.structure.StructureSelectionManager;
import jalview.structure.VamsasListener;
import jalview.structure.VamsasSource;
import jalview.structure.StructureSelectionManager;
import jalview.structure.VamsasListener;
import jalview.structure.VamsasSource;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Hashtable;
import java.util.IdentityHashMap;
import java.util.Iterator;
@@
-156,7
+157,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
if (sess != null)
{
throw new Error(
if (sess != null)
{
throw new Error(
- "Implementation Error - cannot import existing vamsas document into an existing session, Yet!");
+ 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,
- "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);
}
JOptionPane.ERROR_MESSAGE);
}
@@
-264,7
+268,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
if (!inSession())
{
throw new Error(
if (!inSession())
{
throw new Error(
- "Impementation error! Vamsas Operations when client not initialised and connected.");
+ MessageManager
+ .getString("error.implementation_error_vamsas_operation_not_init"));
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
}
addDocumentUpdateHandler();
addStoreDocumentHandler();
@@
-348,7
+353,11
@@
public class VamsasApplication implements SelectionSource, VamsasSource
public void end_session(boolean promptUser)
{
if (!inSession())
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
{
Cache.log.info("Jalview disconnecting from the Vamsas Session.");
try
{
@@
-717,7
+726,8
@@
public class VamsasApplication implements SelectionSource, VamsasSource
}
throw new Error(
}
throw new Error(
- "IMPLEMENTATION ERROR: Cannot recover vamsas object mappings - no backup was made.");
+ 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();
@@
-960,11
+970,14
@@
public class VamsasApplication implements SelectionSource, VamsasSource
int i = -1;
int i = -1;
- public void mouseOver(SequenceI seq, int index,
+ @Override
+ public void mouseOverSequence(SequenceI seq, int index,
VamsasSource source)
{
if (jv2vobj == null)
VamsasSource source)
{
if (jv2vobj == null)
+ {
return;
return;
+ }
if (seq != last || i != index)
{
VorbaId v = (VorbaId) jv2vobj.get(seq);
if (seq != last || i != index)
{
VorbaId v = (VorbaId) jv2vobj.get(seq);
@@
-1000,7
+1013,7
@@
public class VamsasApplication implements SelectionSource, VamsasSource
AlignmentI visal = null;
if (source instanceof AlignViewport)
{
AlignmentI visal = null;
if (source instanceof AlignViewport)
{
- visal = ((AlignViewport) source).getAlignment();
+ visal = ((AlignmentViewport) source).getAlignment();
}
SelectionMessage sm = null;
if ((seqsel == null || seqsel.getSize() == 0)
}
SelectionMessage sm = null;
if ((seqsel == null || seqsel.getSize() == 0)
@@
-1010,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[]
- { ((AlignViewport) source).getSequenceSetId() }, null,
- true);
+ sm = new SelectionMessage("jalview",
+ new String[] { ((AlignmentViewport) source)
+ .getSequenceSetId() }, null, true);
}
else
{
}
else
{
@@
-1052,10
+1065,9
@@
public class VamsasApplication implements SelectionSource, VamsasSource
{
// gather selected columns outwith the sequence positions
// too
{
// gather selected columns outwith the sequence positions
// too
- Enumeration cols = colsel.getSelected().elements();
- while (cols.hasMoreElements())
+ for (Object obj : colsel.getSelected())
{
{
- int ival = ((Integer) cols.nextElement()).intValue();
+ int ival = ((Integer) obj).intValue();
Pos p = new Pos();
p.setI(ival + 1);
range.addPos(p);
Pos p = new Pos();
p.setI(ival + 1);
range.addPos(p);