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
Merge branch 'JAL-1226' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
4a06fdd
..
d11bd31
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-25,6
+25,7
@@
import jalview.analysis.CrossRef;
import jalview.analysis.NJTree;
import jalview.analysis.ParseProperties;
import jalview.analysis.SequenceIdMatcher;
import jalview.analysis.NJTree;
import jalview.analysis.ParseProperties;
import jalview.analysis.SequenceIdMatcher;
+import jalview.api.AlignViewControllerGuiI;
import jalview.api.AlignViewControllerI;
import jalview.bin.Cache;
import jalview.commands.CommandI;
import jalview.api.AlignViewControllerI;
import jalview.bin.Cache;
import jalview.commands.CommandI;
@@
-136,7
+137,7
@@
import javax.swing.SwingUtilities;
* @version $Revision$
*/
public class AlignFrame extends GAlignFrame implements DropTargetListener,
* @version $Revision$
*/
public class AlignFrame extends GAlignFrame implements DropTargetListener,
- IProgressIndicator
+ IProgressIndicator, AlignViewControllerGuiI
{
/** DOCUMENT ME!! */
{
/** DOCUMENT ME!! */
@@
-294,7
+295,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
*/
void init()
{
*/
void init()
{
- avc = new jalview.controller.AlignViewController(viewport, alignPanel);
+ avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
if (viewport.getAlignmentConservationAnnotation() == null)
{
BLOSUM62Colour.setEnabled(false);
if (viewport.getAlignmentConservationAnnotation() == null)
{
BLOSUM62Colour.setEnabled(false);
@@
-564,7
+565,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void addAlignmentPanel(final AlignmentPanel ap, boolean newPanel)
{
ap.alignFrame = this;
public void addAlignmentPanel(final AlignmentPanel ap, boolean newPanel)
{
ap.alignFrame = this;
- avc = new jalview.controller.AlignViewController(viewport, alignPanel);
+ avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
alignPanels.addElement(ap);
alignPanels.addElement(ap);
@@
-848,6
+849,10
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
return false;
}
return false;
}
+ @Override
+ public void setStatus(String text) {
+ statusBar.setText(text);
+ };
/*
* Added so Castor Mapping file can obtain Jalview Version
*/
/*
* Added so Castor Mapping file can obtain Jalview Version
*/
@@
-5297,7
+5302,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
++i;
if (++icomp >= mcomp || i == (otherdb.size()))
{
++i;
if (++icomp >= mcomp || i == (otherdb.size()))
{
- ifetch.setText(MessageManager.formatMessage("label.source_to_target",new String[]{imname,sname}));
+ ifetch.setText(MessageManager.formatMessage("label.source_to_target",imname,sname));
dfetch.add(ifetch);
ifetch = new JMenu();
imname = null;
dfetch.add(ifetch);
ifetch = new JMenu();
imname = null;
@@
-5309,7
+5314,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
++dbi;
if (comp >= mcomp || dbi >= (dbclasses.length))
{
++dbi;
if (comp >= mcomp || dbi >= (dbclasses.length))
{
- dfetch.setText(MessageManager.formatMessage("label.source_to_target",new String[]{mname,dbclass}));
+ dfetch.setText(MessageManager.formatMessage("label.source_to_target",mname,dbclass));
rfetch.add(dfetch);
dfetch = new JMenu();
mname = null;
rfetch.add(dfetch);
dfetch = new JMenu();
mname = null;