X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=015b95bfca2d7f2e126826dbe95e87e2d74ba3a2;hb=b5d61763044c1d72f06ce0e50da2171422a3774b;hp=6c080d1a7aafbc0f09d2dae11090b370ecd10332;hpb=afd09522be547c0fe9a3c1869e647dc616bc923c;p=jalview.git
diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
old mode 100755
new mode 100644
index 6c080d1..015b95b
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1,32 +1,41 @@
/*
- * 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.
- *
- * 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
+ * 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.
+ *
+ * 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;
import jalview.analysis.AAFrequency;
import jalview.analysis.AlignmentSorter;
+import jalview.analysis.AlignmentUtils;
import jalview.analysis.Conservation;
import jalview.analysis.CrossRef;
import jalview.analysis.NJTree;
import jalview.analysis.ParseProperties;
import jalview.analysis.SequenceIdMatcher;
+import jalview.api.AlignViewControllerGuiI;
+import jalview.api.AlignViewControllerI;
+import jalview.api.AlignmentViewPanel;
+import jalview.api.analysis.ScoreModelI;
import jalview.bin.Cache;
import jalview.commands.CommandI;
import jalview.commands.EditCommand;
+import jalview.commands.EditCommand.Action;
import jalview.commands.OrderCommand;
import jalview.commands.RemoveGapColCommand;
import jalview.commands.RemoveGapsCommand;
@@ -46,10 +55,11 @@ import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.io.AlignmentProperties;
import jalview.io.AnnotationFile;
+import jalview.io.BioJsHTMLOutput;
import jalview.io.FeaturesFile;
import jalview.io.FileLoader;
import jalview.io.FormatAdapter;
-import jalview.io.HTMLOutput;
+import jalview.io.HtmlSvgOutput;
import jalview.io.IdentifyFile;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
@@ -75,12 +85,13 @@ import jalview.schemes.TaylorColourScheme;
import jalview.schemes.TurnColourScheme;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ZappoColourScheme;
+import jalview.util.MessageManager;
import jalview.ws.jws1.Discoverer;
import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
import jalview.ws.seqfetcher.DbSourceProxy;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Component;
import java.awt.GridLayout;
import java.awt.Rectangle;
@@ -106,12 +117,14 @@ import java.beans.PropertyChangeEvent;
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
import javax.swing.JEditorPane;
import javax.swing.JInternalFrame;
import javax.swing.JLabel;
@@ -127,12 +140,12 @@ import javax.swing.SwingUtilities;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
public class AlignFrame extends GAlignFrame implements DropTargetListener,
- IProgressIndicator
+ IProgressIndicator, AlignViewControllerGuiI
{
/** DOCUMENT ME!! */
@@ -145,6 +158,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
AlignViewport viewport;
+ public AlignViewControllerI avc;
+
Vector alignPanels = new Vector();
/**
@@ -159,7 +174,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Creates a new AlignFrame object with specific width and height.
- *
+ *
* @param al
* @param width
* @param height
@@ -172,7 +187,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Creates a new AlignFrame object with specific width, height and
* sequenceSetId
- *
+ *
* @param al
* @param width
* @param height
@@ -187,7 +202,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Creates a new AlignFrame object with specific width, height and
* sequenceSetId
- *
+ *
* @param al
* @param width
* @param height
@@ -202,7 +217,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* new alignment window with hidden columns
- *
+ *
* @param al
* AlignmentI
* @param hiddenColumns
@@ -221,7 +236,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Create alignment frame for al with hiddenColumns, a specific width and
* height, and specific sequenceId
- *
+ *
* @param al
* @param hiddenColumns
* @param width
@@ -238,7 +253,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Create alignment frame for al with hiddenColumns, a specific width and
* height, and specific sequenceId
- *
+ *
* @param al
* @param hiddenColumns
* @param width
@@ -252,22 +267,24 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
int width, int height, String sequenceSetId, String viewId)
{
setSize(width, height);
- viewport = new AlignViewport(al, hiddenColumns, sequenceSetId, viewId);
-
- alignPanel = new AlignmentPanel(this, viewport);
if (al.getDataset() == null)
{
al.setDataset(null);
}
+ viewport = new AlignViewport(al, hiddenColumns, sequenceSetId, viewId);
+
+ alignPanel = new AlignmentPanel(this, viewport);
+
+
addAlignmentPanel(alignPanel, true);
init();
}
/**
- * Make a new AlignFrame from exisiting alignmentPanels
- *
+ * Make a new AlignFrame from existing alignmentPanels
+ *
* @param ap
* AlignmentPanel
* @param av
@@ -287,6 +304,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
*/
void init()
{
+ avc = new jalview.controller.AlignViewController(this, viewport,
+ alignPanel);
if (viewport.getAlignmentConservationAnnotation() == null)
{
BLOSUM62Colour.setEnabled(false);
@@ -318,6 +337,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
setMenusFromViewport(viewport);
buildSortByAnnotationScoresMenu();
+ buildTreeMenu();
+
if (viewport.wrapAlignment)
{
wrapMenuItem_actionPerformed(null);
@@ -335,7 +356,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Change the filename and format for the alignment, and enable the 'reload'
* button functionality.
- *
+ *
* @param file
* valid filename
* @param format
@@ -360,7 +381,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
.getKeyCode() >= KeyEvent.VK_NUMPAD0 && evt
.getKeyCode() <= KeyEvent.VK_NUMPAD9))
&& Character.isDigit(evt.getKeyChar()))
- alignPanel.seqPanel.numberPressed(evt.getKeyChar());
+ {
+ alignPanel.getSeqPanel().numberPressed(evt.getKeyChar());
+ }
switch (evt.getKeyCode())
{
@@ -372,38 +395,54 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
case KeyEvent.VK_DOWN:
if (evt.isAltDown() || !viewport.cursorMode)
+ {
moveSelectedSequences(false);
+ }
if (viewport.cursorMode)
- alignPanel.seqPanel.moveCursor(0, 1);
+ {
+ alignPanel.getSeqPanel().moveCursor(0, 1);
+ }
break;
case KeyEvent.VK_UP:
if (evt.isAltDown() || !viewport.cursorMode)
+ {
moveSelectedSequences(true);
+ }
if (viewport.cursorMode)
- alignPanel.seqPanel.moveCursor(0, -1);
+ {
+ alignPanel.getSeqPanel().moveCursor(0, -1);
+ }
break;
case KeyEvent.VK_LEFT:
if (evt.isAltDown() || !viewport.cursorMode)
- slideSequences(false, alignPanel.seqPanel.getKeyboardNo1());
+ {
+ slideSequences(false, alignPanel.getSeqPanel().getKeyboardNo1());
+ }
else
- alignPanel.seqPanel.moveCursor(-1, 0);
+ {
+ alignPanel.getSeqPanel().moveCursor(-1, 0);
+ }
break;
case KeyEvent.VK_RIGHT:
if (evt.isAltDown() || !viewport.cursorMode)
- slideSequences(true, alignPanel.seqPanel.getKeyboardNo1());
+ {
+ slideSequences(true, alignPanel.getSeqPanel().getKeyboardNo1());
+ }
else
- alignPanel.seqPanel.moveCursor(1, 0);
+ {
+ alignPanel.getSeqPanel().moveCursor(1, 0);
+ }
break;
case KeyEvent.VK_SPACE:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()
+ alignPanel.getSeqPanel().insertGapAtCursor(evt.isControlDown()
|| evt.isShiftDown() || evt.isAltDown());
}
break;
@@ -427,7 +466,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
else
{
- alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
+ alignPanel.getSeqPanel().deleteGapAtCursor(evt.isControlDown()
|| evt.isShiftDown() || evt.isAltDown());
}
@@ -436,19 +475,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
case KeyEvent.VK_S:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.setCursorRow();
+ alignPanel.getSeqPanel().setCursorRow();
}
break;
case KeyEvent.VK_C:
if (viewport.cursorMode && !evt.isControlDown())
{
- alignPanel.seqPanel.setCursorColumn();
+ alignPanel.getSeqPanel().setCursorColumn();
}
break;
case KeyEvent.VK_P:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.setCursorPosition();
+ alignPanel.getSeqPanel().setCursorPosition();
}
break;
@@ -456,46 +495,40 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
case KeyEvent.VK_COMMA:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.setCursorRowAndColumn();
+ alignPanel.getSeqPanel().setCursorRowAndColumn();
}
break;
case KeyEvent.VK_Q:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.setSelectionAreaAtCursor(true);
+ alignPanel.getSeqPanel().setSelectionAreaAtCursor(true);
}
break;
case KeyEvent.VK_M:
if (viewport.cursorMode)
{
- alignPanel.seqPanel.setSelectionAreaAtCursor(false);
+ alignPanel.getSeqPanel().setSelectionAreaAtCursor(false);
}
break;
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
- statusBar.setText("Keyboard editing mode is "
- + (viewport.cursorMode ? "on" : "off"));
+ statusBar.setText(MessageManager.formatMessage(
+ "label.keyboard_editing_mode", new String[]
+ { (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
{
- alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;
- alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;
+ alignPanel.getSeqPanel().seqCanvas.cursorX = viewport.startRes;
+ alignPanel.getSeqPanel().seqCanvas.cursorY = viewport.startSeq;
}
- alignPanel.seqPanel.seqCanvas.repaint();
+ alignPanel.getSeqPanel().seqCanvas.repaint();
break;
case KeyEvent.VK_F1:
try
{
- ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
- java.net.URL url = javax.help.HelpSet.findHelpSet(cl,
- "help/help");
- javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
-
- javax.help.HelpBroker hb = hs.createHelpBroker();
- hb.setCurrentID("home");
- hb.setDisplayed(true);
+ Help.showHelpWindow();
} catch (Exception ex)
{
ex.printStackTrace();
@@ -540,14 +573,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
case KeyEvent.VK_LEFT:
if (evt.isAltDown() || !viewport.cursorMode)
+ {
viewport.firePropertyChange("alignment", null, viewport
.getAlignment().getSequences());
+ }
break;
case KeyEvent.VK_RIGHT:
if (evt.isAltDown() || !viewport.cursorMode)
+ {
viewport.firePropertyChange("alignment", null, viewport
.getAlignment().getSequences());
+ }
break;
}
}
@@ -557,6 +594,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void addAlignmentPanel(final AlignmentPanel ap, boolean newPanel)
{
ap.alignFrame = this;
+ avc = new jalview.controller.AlignViewController(this, viewport,
+ alignPanel);
alignPanels.addElement(ap);
@@ -691,7 +730,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Need to call this method when tabs are selected for multiple views, or when
* loading from Jalview2XML.java
- *
+ *
* @param av
* AlignViewport
*/
@@ -702,14 +741,21 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
abovePIDThreshold.setSelected(av.getAbovePIDThreshold());
conservationMenuItem.setSelected(av.getConservationSelected());
seqLimits.setSelected(av.getShowJVSuffix());
- idRightAlign.setSelected(av.rightAlignIds);
+ idRightAlign.setSelected(av.isRightAlignIds());
centreColumnLabelsMenuItem.setState(av.centreColumnLabels);
renderGapsMenuItem.setSelected(av.renderGaps);
wrapMenuItem.setSelected(av.wrapAlignment);
scaleAbove.setVisible(av.wrapAlignment);
scaleLeft.setVisible(av.wrapAlignment);
scaleRight.setVisible(av.wrapAlignment);
- annotationPanelMenuItem.setState(av.showAnnotation);
+ annotationPanelMenuItem.setState(av.isShowAnnotation());
+ /*
+ * Show/hide annotations only enabled if annotation panel is shown
+ */
+ showAllSeqAnnotations.setEnabled(annotationPanelMenuItem.getState());
+ hideAllSeqAnnotations.setEnabled(annotationPanelMenuItem.getState());
+ showAllAlAnnotations.setEnabled(annotationPanelMenuItem.getState());
+ hideAllAlAnnotations.setEnabled(annotationPanelMenuItem.getState());
viewBoxesMenuItem.setSelected(av.showBoxes);
viewTextMenuItem.setSelected(av.showText);
showNonconservedMenuItem.setSelected(av.getShowUnconserved());
@@ -722,7 +768,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
setColourSelected(ColourSchemeProperty.getColourName(av
.getGlobalColourScheme()));
- showSeqFeatures.setSelected(av.showSequenceFeatures);
+ showSeqFeatures.setSelected(av.isShowSequenceFeatures());
hiddenMarkers.setState(av.showHiddenMarkers);
applyToAllGroups.setState(av.getColourAppliesToAllGroups());
showNpFeatsMenuitem.setSelected(av.isShowNpFeats());
@@ -734,16 +780,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
rnahelicesColour
.setSelected(av.getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
setShowProductsEnabled();
-
updateEditMenuBar();
}
+
// methods for implementing IProgressIndicator
// need to refactor to a reusable stub class
Hashtable progressBars, progressBarHandlers;
/*
* (non-Javadoc)
- *
+ *
* @see jalview.gui.IProgressIndicator#setProgressBar(java.lang.String, long)
*/
@Override
@@ -800,14 +846,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
if (progressBarHandlers == null || !progressBars.contains(new Long(id)))
{
- throw new Error(
- "call setProgressBar before registering the progress bar's handler.");
+ throw new Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler"));
}
progressBarHandlers.put(new Long(id), handler);
final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
if (handler.canCancel())
{
- JButton cancel = new JButton("Cancel");
+ JButton cancel = new JButton(
+ MessageManager.getString("action.cancel"));
final IProgressIndicator us = this;
cancel.addActionListener(new ActionListener()
{
@@ -816,10 +862,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void actionPerformed(ActionEvent e)
{
handler.cancelActivity(id);
- us.setProgressBar(
- "Cancelled "
- + ((JLabel) progressPanel.getComponent(0))
- .getText(), id);
+ us.setProgressBar(MessageManager.formatMessage("label.cancelled_params", new String[]{((JLabel) progressPanel.getComponent(0)).getText()}), id);
}
});
progressPanel.add(cancel, BorderLayout.EAST);
@@ -827,7 +870,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- *
+ *
* @return true if any progress bars are still active
*/
@Override
@@ -840,6 +883,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
return false;
}
+ @Override
+ public void setStatus(String text)
+ {
+ statusBar.setText(text);
+ };
+
/*
* Added so Castor Mapping file can obtain Jalview Version
*/
@@ -850,7 +899,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public FeatureRenderer getFeatureRenderer()
{
- return alignPanel.seqPanel.seqCanvas.getFeatureRenderer();
+ return alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer();
}
@Override
@@ -880,6 +929,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
for (int i = 0; i < frames.length; i++)
{
if (frames[i] instanceof AlignFrame && frames[i] != this
+ && ((AlignFrame) frames[i]).fileName != null
&& ((AlignFrame) frames[i]).fileName.equals(fileName))
{
try
@@ -961,7 +1011,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -975,8 +1025,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
currentFileFormat, false);
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save Alignment to file");
- chooser.setToolTipText("Save");
+ chooser.setDialogTitle(MessageManager.getString("label.save_alignment_to_file"));
+ chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
@@ -985,9 +1035,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
currentFileFormat = chooser.getSelectedFormat();
if (currentFileFormat == null)
{
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "You must select a file format before saving!",
- "File format not specified", JOptionPane.WARNING_MESSAGE);
+ JOptionPane
+ .showInternalMessageDialog(
+ Desktop.desktop,
+ MessageManager
+ .getString("label.select_file_format_before_saving"),
+ MessageManager
+ .getString("label.file_format_not_specified"),
+ JOptionPane.WARNING_MESSAGE);
value = chooser.showSaveDialog(this);
return;
}
@@ -1023,8 +1078,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
success = new Jalview2XML().SaveAlignment(this, file, shortName);
- statusBar.setText("Successfully saved to file: " + fileName + " in "
- + format + " format.");
+ statusBar.setText(MessageManager.formatMessage(
+ "label.successfully_saved_to_file_in_format", new String[]
+ { fileName, format }));
}
else
@@ -1045,9 +1101,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
int reply = JOptionPane
.showInternalConfirmDialog(
Desktop.desktop,
- "The Alignment contains hidden columns."
- + "\nDo you want to save only the visible alignment?",
- "Save / Omit Hidden Columns",
+ MessageManager
+ .getString("label.alignment_contains_hidden_columns"),
+ MessageManager
+ .getString("action.save_omit_hidden_columns"),
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
@@ -1057,8 +1114,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
}
FormatAdapter f = new FormatAdapter();
- String output = f.formatSequences(
- format,
+ String output = f.formatSequences(format,
viewport.getAlignment(), // class cast exceptions will
// occur in the distant future
omitHidden, f.getCacheSuffixDefault(format),
@@ -1078,8 +1134,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
out.print(output);
out.close();
this.setTitle(file);
- statusBar.setText("Successfully saved to file: " + fileName
- + " in " + format + " format.");
+ statusBar.setText(MessageManager.formatMessage(
+ "label.successfully_saved_to_file_in_format",
+ new String[]
+ { fileName, format }));
} catch (Exception ex)
{
success = false;
@@ -1090,8 +1148,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (!success)
{
- JOptionPane.showInternalMessageDialog(this, "Couldn't save file: "
- + fileName, "Error Saving File", JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showInternalMessageDialog(this, MessageManager
+ .formatMessage("label.couldnt_save_file", new String[]
+ { fileName }), MessageManager
+ .getString("label.error_saving_file"),
+ JOptionPane.WARNING_MESSAGE);
}
return success;
@@ -1114,7 +1175,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1128,9 +1189,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
int reply = JOptionPane
.showInternalConfirmDialog(
Desktop.desktop,
- "The Alignment contains hidden columns."
- + "\nDo you want to output only the visible alignment?",
- "Save / Omit Hidden Columns",
+ MessageManager
+ .getString("label.alignment_contains_hidden_columns"),
+ MessageManager
+ .getString("action.save_omit_hidden_columns"),
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
@@ -1148,8 +1210,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
viewport.getAlignment(), omitHidden,
viewport.getColumnSelection()));
- Desktop.addInternalFrame(cap,
- "Alignment output - " + e.getActionCommand(), 600, 500);
+ Desktop.addInternalFrame(cap, MessageManager.formatMessage(
+ "label.alignment_output_command", new String[]
+ { e.getActionCommand() }), 600, 500);
} catch (OutOfMemoryError oom)
{
new OOMWarning("Outputting alignment as " + e.getActionCommand(), oom);
@@ -1160,18 +1223,25 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@Override
protected void htmlMenuItem_actionPerformed(ActionEvent e)
{
- new HTMLOutput(alignPanel,
- alignPanel.seqPanel.seqCanvas.getSequenceRenderer(),
- alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+ // new HTMLOutput(alignPanel,
+ // alignPanel.getSeqPanel().seqCanvas.getSequenceRenderer(),
+ // alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
+ new HtmlSvgOutput(null, alignPanel);
}
+ @Override
+ public void bioJSMenuItem_actionPerformed(ActionEvent e)
+ {
+ new BioJsHTMLOutput(alignPanel,
+ alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
+ }
public void createImageMap(File file, String image)
{
alignPanel.makePNGImageMap(file, image);
@@ -1179,7 +1249,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1191,7 +1261,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1201,6 +1271,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
alignPanel.makeEPS(f);
}
+ public void createSVG(File f)
+ {
+ alignPanel.makeSVG(f);
+ }
@Override
public void pageSetup_actionPerformed(ActionEvent e)
{
@@ -1210,7 +1284,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1232,7 +1306,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void exportAnnotations_actionPerformed(ActionEvent e)
{
new AnnotationExporter().exportAnnotations(alignPanel,
- viewport.showAnnotation ? viewport.getAlignment()
+ viewport.isShowAnnotation() ? viewport.getAlignment()
.getAlignmentAnnotation() : null, viewport
.getAlignment().getGroups(), ((Alignment) viewport
.getAlignment()).alignmentProperties);
@@ -1245,8 +1319,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Load Jalview Annotations or Features File");
- chooser.setToolTipText("Load Jalview Annotations / Features file");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.load_jalview_annotations"));
+ chooser.setToolTipText(MessageManager
+ .getString("label.load_jalview_annotations"));
int value = chooser.showOpenDialog(null);
@@ -1262,7 +1338,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Close the current view or all views in the alignment frame. If the frame
* only contains one view then the alignment will be removed from memory.
- *
+ *
* @param closeAllTabs
*/
@Override
@@ -1308,7 +1384,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* close alignPanel2 and shuffle tabs appropriately.
- *
+ *
* @param alignPanel2
*/
public void closeView(AlignmentPanel alignPanel2)
@@ -1345,26 +1421,30 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (viewport.historyList.size() > 0)
{
undoMenuItem.setEnabled(true);
- CommandI command = (CommandI) viewport.historyList.peek();
- undoMenuItem.setText("Undo " + command.getDescription());
+ CommandI command = viewport.historyList.peek();
+ undoMenuItem.setText(MessageManager.formatMessage(
+ "label.undo_command", new String[]
+ { command.getDescription() }));
}
else
{
undoMenuItem.setEnabled(false);
- undoMenuItem.setText("Undo");
+ undoMenuItem.setText(MessageManager.getString("action.undo"));
}
if (viewport.redoList.size() > 0)
{
redoMenuItem.setEnabled(true);
- CommandI command = (CommandI) viewport.redoList.peek();
- redoMenuItem.setText("Redo " + command.getDescription());
+ CommandI command = viewport.redoList.peek();
+ redoMenuItem.setText(MessageManager.formatMessage(
+ "label.redo_command", new String[]
+ { command.getDescription() }));
}
else
{
redoMenuItem.setEnabled(false);
- redoMenuItem.setText("Redo");
+ redoMenuItem.setText(MessageManager.getString("action.redo"));
}
}
@@ -1384,7 +1464,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- *
+ *
* @return alignment objects for all views
*/
AlignmentI[] getViewAlignments()
@@ -1409,7 +1489,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1417,8 +1497,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
protected void undoMenuItem_actionPerformed(ActionEvent e)
{
if (viewport.historyList.empty())
+ {
return;
- CommandI command = (CommandI) viewport.historyList.pop();
+ }
+ CommandI command = viewport.historyList.pop();
viewport.redoList.push(command);
command.undoCommand(getViewAlignments());
@@ -1445,7 +1527,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1457,7 +1539,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
return;
}
- CommandI command = (CommandI) viewport.redoList.pop();
+ CommandI command = viewport.redoList.pop();
viewport.historyList.push(command);
command.doCommand(getViewAlignments());
@@ -1527,7 +1609,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param up
* DOCUMENT ME!
*/
@@ -1539,7 +1621,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
return;
}
- viewport.getAlignment().moveSelectedSequencesByOne(sg, viewport.getHiddenRepSequences(), up);
+ viewport.getAlignment().moveSelectedSequencesByOne(sg,
+ viewport.getHiddenRepSequences(), up);
alignPanel.paintAlignment(true);
}
@@ -1549,7 +1632,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (viewport.cursorMode)
{
sg.add(viewport.getAlignment().getSequenceAt(
- alignPanel.seqPanel.seqCanvas.cursorY));
+ alignPanel.getSeqPanel().seqCanvas.cursorY));
}
else if (viewport.getSelectionGroup() != null
&& viewport.getSelectionGroup().getSize() != viewport
@@ -1569,37 +1652,53 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
for (int i = 0; i < viewport.getAlignment().getHeight(); i++)
{
if (!sg.contains(viewport.getAlignment().getSequenceAt(i)))
+ {
invertGroup.add(viewport.getAlignment().getSequenceAt(i));
+ }
}
SequenceI[] seqs1 = sg.toArray(new SequenceI[0]);
SequenceI[] seqs2 = new SequenceI[invertGroup.size()];
for (int i = 0; i < invertGroup.size(); i++)
+ {
seqs2[i] = (SequenceI) invertGroup.elementAt(i);
+ }
SlideSequencesCommand ssc;
if (right)
+ {
ssc = new SlideSequencesCommand("Slide Sequences", seqs2, seqs1,
size, viewport.getGapCharacter());
+ }
else
+ {
ssc = new SlideSequencesCommand("Slide Sequences", seqs1, seqs2,
size, viewport.getGapCharacter());
+ }
int groupAdjustment = 0;
if (ssc.getGapsInsertedBegin() && right)
{
if (viewport.cursorMode)
- alignPanel.seqPanel.moveCursor(size, 0);
+ {
+ alignPanel.getSeqPanel().moveCursor(size, 0);
+ }
else
+ {
groupAdjustment = size;
+ }
}
else if (!ssc.getGapsInsertedBegin() && !right)
{
if (viewport.cursorMode)
- alignPanel.seqPanel.moveCursor(-size, 0);
+ {
+ alignPanel.getSeqPanel().moveCursor(-size, 0);
+ }
else
+ {
groupAdjustment = -size;
+ }
}
if (groupAdjustment != 0)
@@ -1620,14 +1719,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
if (!appendHistoryItem)
+ {
addHistoryItem(ssc);
+ }
repaint();
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1691,12 +1792,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
Desktop.jalviewClipboard = new Object[]
{ seqs, viewport.getAlignment().getDataset(), hiddenColumns };
- statusBar.setText("Copied " + seqs.length + " sequences to clipboard.");
+ statusBar.setText(MessageManager.formatMessage(
+ "label.copied_sequences_to_clipboard", new String[]
+ { Integer.valueOf(seqs.length).toString() }));
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1708,7 +1811,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -1720,7 +1823,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Paste contents of Jalview clipboard
- *
+ *
* @param newAlignment
* true to paste to a new alignment, otherwise add to this.
*/
@@ -1781,6 +1884,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
int alwidth = 0;
+ ArrayList newGraphGroups = new ArrayList();
+ int fgroup = -1;
if (newAlignment)
{
@@ -1848,6 +1953,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
newDs.clear(); // tidy up
}
+ if (alignment.getAlignmentAnnotation() != null)
+ {
+ for (AlignmentAnnotation alan : alignment
+ .getAlignmentAnnotation())
+ {
+ if (alan.graphGroup > fgroup)
+ {
+ fgroup = alan.graphGroup;
+ }
+ }
+ }
if (pastedal.getAlignmentAnnotation() != null)
{
// Add any annotation attached to alignment.
@@ -1858,6 +1974,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (alann[i].sequenceRef == null && !alann[i].autoCalculated)
{
AlignmentAnnotation newann = new AlignmentAnnotation(alann[i]);
+ if (newann.graphGroup > -1)
+ {
+ if (newGraphGroups.size() <= newann.graphGroup
+ || newGraphGroups.get(newann.graphGroup) == null)
+ {
+ for (int q = newGraphGroups.size(); q <= newann.graphGroup; q++)
+ {
+ newGraphGroups.add(q, null);
+ }
+ newGraphGroups.set(newann.graphGroup, new Integer(
+ ++fgroup));
+ }
+ newann.graphGroup = newGraphGroups.get(newann.graphGroup)
+ .intValue();
+ }
+
newann.padAnnotation(alwidth);
alignment.addAnnotation(newann);
}
@@ -1869,7 +2001,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
// /////
// ADD HISTORY ITEM
//
- addHistoryItem(new EditCommand("Add sequences", EditCommand.PASTE,
+ addHistoryItem(new EditCommand(
+ MessageManager.getString("label.add_sequences"),
+ Action.PASTE,
sequences, 0, alignment.getWidth(), alignment));
}
// Add any annotations attached to sequences
@@ -1877,11 +2011,31 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
if (sequences[i].getAnnotation() != null)
{
+ AlignmentAnnotation newann;
for (int a = 0; a < sequences[i].getAnnotation().length; a++)
{
annotationAdded = true;
- sequences[i].getAnnotation()[a].adjustForAlignment();
- sequences[i].getAnnotation()[a].padAnnotation(alwidth);
+ newann = sequences[i].getAnnotation()[a];
+ newann.adjustForAlignment();
+ newann.padAnnotation(alwidth);
+ if (newann.graphGroup > -1)
+ {
+ if (newann.graphGroup > -1)
+ {
+ if (newGraphGroups.size() <= newann.graphGroup
+ || newGraphGroups.get(newann.graphGroup) == null)
+ {
+ for (int q = newGraphGroups.size(); q <= newann.graphGroup; q++)
+ {
+ newGraphGroups.add(q, null);
+ }
+ newGraphGroups.set(newann.graphGroup, new Integer(
+ ++fgroup));
+ }
+ newann.graphGroup = newGraphGroups.get(newann.graphGroup)
+ .intValue();
+ }
+ }
alignment.addAnnotation(sequences[i].getAnnotation()[a]); // annotation
// was
// duplicated
@@ -1904,7 +2058,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
AlignmentAnnotation sann[] = sequences[i].getAnnotation();
if (sann == null)
+ {
continue;
+ }
for (int avnum = 0; avnum < alview.length; avnum++)
{
if (alview[avnum] != alignment)
@@ -1921,6 +2077,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
newann.padAnnotation(avwidth);
alview[avnum].addAnnotation(newann); // annotation was
// duplicated earlier
+ // TODO JAL-1145 graphGroups are not updated for sequence
+ // annotation added to several views. This may cause
+ // strangeness
alview[avnum].setAnnotationIndex(newann, a);
}
}
@@ -1930,6 +2089,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
viewport.firePropertyChange("alignment", null,
alignment.getSequences());
+ if (alignPanels != null)
+ {
+ for (AlignmentPanel ap : ((Vector) alignPanels))
+ {
+ ap.validateAnnotationDimensions(false);
+ }
+ }
+ else
+ {
+ alignPanel.validateAnnotationDimensions(false);
+ }
}
else
@@ -1951,9 +2121,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
// >>>This is a fix for the moment, until a better solution is
// found!!<<<
- af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer()
+ af.alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer()
.transferSettings(
- alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+ alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
// TODO: maintain provenance of an alignment, rather than just make the
// title a concatenation of operations.
@@ -1987,9 +2157,63 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
+ @Override
+ protected void expand_newalign(ActionEvent e)
+ {
+ try
+ {
+ AlignmentI alignment = AlignmentUtils.expandContext(getViewport()
+ .getAlignment(), -1);
+ AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH,
+ DEFAULT_HEIGHT);
+ String newtitle = new String("Flanking alignment");
+
+ if (Desktop.jalviewClipboard != null
+ && Desktop.jalviewClipboard[2] != null)
+ {
+ Vector hc = (Vector) Desktop.jalviewClipboard[2];
+ for (int i = 0; i < hc.size(); i++)
+ {
+ int[] region = (int[]) hc.elementAt(i);
+ af.viewport.hideColumns(region[0], region[1]);
+ }
+ }
+
+ // >>>This is a fix for the moment, until a better solution is
+ // found!!<<<
+ af.alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer()
+ .transferSettings(
+ alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
+
+ // TODO: maintain provenance of an alignment, rather than just make the
+ // title a concatenation of operations.
+ {
+ if (title.startsWith("Copied sequences"))
+ {
+ newtitle = title;
+ }
+ else
+ {
+ newtitle = newtitle.concat("- from " + title);
+ }
+ }
+
+ Desktop.addInternalFrame(af, newtitle, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+
+ } catch (Exception ex)
+ {
+ ex.printStackTrace();
+ System.out.println("Exception whilst pasting: " + ex);
+ // could be anything being pasted in here
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Viewing flanking region of alignment", oom);
+ }
+ }
+
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2002,7 +2226,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2016,17 +2240,27 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
return;
}
- Vector seqs = new Vector();
+ List seqs = new ArrayList(sg.getSize());
SequenceI seq;
for (int i = 0; i < sg.getSize(); i++)
{
seq = sg.getSequenceAt(i);
- seqs.addElement(seq);
+ seqs.add(seq);
}
- // If the cut affects all sequences, remove highlighted columns
+ // If the cut affects all sequences, warn, remove highlighted columns
if (sg.getSize() == viewport.getAlignment().getHeight())
{
+ int confirm = JOptionPane.showConfirmDialog(this,
+ MessageManager.getString("warn.delete_all"), // $NON-NLS-1$
+ MessageManager.getString("label.delete_all"), // $NON-NLS-1$
+ JOptionPane.OK_CANCEL_OPTION);
+
+ if (confirm == JOptionPane.CANCEL_OPTION
+ || confirm == JOptionPane.CLOSED_OPTION)
+ {
+ return;
+ }
viewport.getColumnSelection().removeElements(sg.getStartRes(),
sg.getEndRes() + 1);
}
@@ -2034,14 +2268,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
SequenceI[] cut = new SequenceI[seqs.size()];
for (int i = 0; i < seqs.size(); i++)
{
- cut[i] = (SequenceI) seqs.elementAt(i);
+ cut[i] = seqs.get(i);
}
/*
* //ADD HISTORY ITEM
*/
- addHistoryItem(new EditCommand("Cut Sequences", EditCommand.CUT, cut,
- sg.getStartRes(), sg.getEndRes() - sg.getStartRes() + 1,
+ addHistoryItem(new EditCommand(
+ MessageManager.getString("label.cut_sequences"), Action.CUT,
+ cut, sg.getStartRes(), sg.getEndRes() - sg.getStartRes() + 1,
viewport.getAlignment()));
viewport.setSelectionGroup(null);
@@ -2063,24 +2298,24 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@Override
protected void deleteGroups_actionPerformed(ActionEvent e)
{
- viewport.getAlignment().deleteAllGroups();
- viewport.sequenceColours = null;
- viewport.setSelectionGroup(null);
- PaintRefresher.Refresh(this, viewport.getSequenceSetId());
- alignPanel.updateAnnotation();
- alignPanel.paintAlignment(true);
+ if (avc.deleteGroups())
+ {
+ PaintRefresher.Refresh(this, viewport.getSequenceSetId());
+ alignPanel.updateAnnotation();
+ alignPanel.paintAlignment(true);
+ }
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2103,7 +2338,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2112,14 +2347,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
if (viewport.cursorMode)
{
- alignPanel.seqPanel.keyboardNo1 = null;
- alignPanel.seqPanel.keyboardNo2 = null;
+ alignPanel.getSeqPanel().keyboardNo1 = null;
+ alignPanel.getSeqPanel().keyboardNo2 = null;
}
viewport.setSelectionGroup(null);
viewport.getColumnSelection().clear();
viewport.setSelectionGroup(null);
- alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
- alignPanel.idPanel.idCanvas.searchResults = null;
+ alignPanel.getSeqPanel().seqCanvas.highlightSearchResults(null);
+ alignPanel.getIdPanel().getIdCanvas().searchResults = null;
alignPanel.paintAlignment(true);
PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
viewport.sendSelection();
@@ -2127,7 +2362,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2163,7 +2398,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2175,7 +2410,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2229,11 +2464,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
viewport.getSelectionGroup());
}
- statusBar.setText("Removed " + trimRegion.getSize() + " columns.");
+ statusBar.setText(MessageManager.formatMessage(
+ "label.removed_columns", new String[]
+ { Integer.valueOf(trimRegion.getSize()).toString() }));
addHistoryItem(trimRegion);
- for (SequenceGroup sg :viewport.getAlignment().getGroups())
+ for (SequenceGroup sg : viewport.getAlignment().getGroups())
{
if ((trimLeft && !sg.adjustForRemoveLeft(column))
|| (!trimLeft && !sg.adjustForRemoveRight(column)))
@@ -2249,7 +2486,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2277,8 +2514,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
addHistoryItem(removeGapCols);
- statusBar.setText("Removed " + removeGapCols.getSize()
- + " empty columns.");
+ statusBar.setText(MessageManager.formatMessage(
+ "label.removed_empty_columns", new String[]
+ { Integer.valueOf(removeGapCols.getSize()).toString() }));
// This is to maintain viewport position on first residue
// of first sequence
@@ -2297,7 +2535,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2336,7 +2574,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2360,7 +2598,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2377,7 +2615,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- *
+ *
* @param copyAnnotation
* if true then duplicate all annnotation, groups and settings
* @return new alignment panel, already displayed.
@@ -2388,7 +2626,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- *
+ *
* @param viewTitle
* title of newly created view
* @return new alignment panel, already displayed.
@@ -2399,7 +2637,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- *
+ *
* @param viewTitle
* title of newly created view
* @param copyAnnotation
@@ -2441,7 +2679,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
boolean addFirstIndex = false;
if (viewTitle == null || viewTitle.trim().length() == 0)
{
- viewTitle = "View";
+ viewTitle = MessageManager.getString("action.view");
addFirstIndex = true;
}
else
@@ -2472,6 +2710,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
newap.av.viewName = newViewName;
addAlignmentPanel(newap, true);
+ newap.alignmentChanged();
if (alignPanels.size() == 2)
{
@@ -2495,7 +2734,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2507,7 +2746,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2516,7 +2755,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
viewport.setShowJVSuffix(seqLimits.isSelected());
- alignPanel.idPanel.idCanvas.setPreferredSize(alignPanel
+ alignPanel.getIdPanel().getIdCanvas().setPreferredSize(alignPanel
.calculateIdWidth());
alignPanel.paintAlignment(true);
}
@@ -2524,7 +2763,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void idRightAlign_actionPerformed(ActionEvent e)
{
- viewport.rightAlignIds = idRightAlign.isSelected();
+ viewport.setRightAlignIds(idRightAlign.isSelected());
alignPanel.paintAlignment(true);
}
@@ -2537,7 +2776,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see jalview.jbgui.GAlignFrame#followHighlight_actionPerformed()
*/
@Override
@@ -2546,13 +2785,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (viewport.followHighlight = this.followHighlightMenuItem.getState())
{
alignPanel.scrollToPosition(
- alignPanel.seqPanel.seqCanvas.searchResults, false);
+ alignPanel.getSeqPanel().seqCanvas.searchResults, false);
}
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2565,7 +2804,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2601,7 +2840,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* called by key handler and the hide all/show all menu items
- *
+ *
* @param toggleSeqs
* @param toggleCols
*/
@@ -2671,7 +2910,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#hideAllButSelection_actionPerformed(java.awt.
* event.ActionEvent)
@@ -2684,7 +2923,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#hideAllSelection_actionPerformed(java.awt.event
* .ActionEvent)
@@ -2701,7 +2940,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showAllhidden_actionPerformed(java.awt.event.
* ActionEvent)
@@ -2730,7 +2969,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2743,7 +2982,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2756,7 +2995,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2769,7 +3008,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2782,7 +3021,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2795,7 +3034,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2827,7 +3066,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Set or clear 'Show Sequence Features'
- *
+ *
* @param evt
* DOCUMENT ME!
*/
@@ -2844,7 +3083,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Set or clear 'Show Sequence Features'
- *
+ *
* @param evt
* DOCUMENT ME!
*/
@@ -2853,7 +3092,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
viewport.setShowSequenceFeaturesHeight(showSeqFeaturesHeight
.isSelected());
- if (viewport.getShowSequenceFeaturesHeight())
+ if (viewport.isShowSequenceFeaturesHeight())
{
// ensure we're actually displaying features
viewport.setShowSequenceFeatures(true);
@@ -2867,16 +3106,24 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
/**
- * DOCUMENT ME!
- *
+ * Action on toggle of the 'Show annotations' menu item. This shows or hides
+ * the annotations panel as a whole.
+ *
+ * The options to show/hide all annotations should be enabled when the panel
+ * is shown, and disabled when the panel is hidden.
+ *
* @param e
- * DOCUMENT ME!
*/
@Override
public void annotationPanelMenuItem_actionPerformed(ActionEvent e)
{
- viewport.setShowAnnotation(annotationPanelMenuItem.isSelected());
- alignPanel.setAnnotationVisible(annotationPanelMenuItem.isSelected());
+ final boolean setVisible = annotationPanelMenuItem.isSelected();
+ viewport.setShowAnnotation(setVisible);
+ alignPanel.setAnnotationVisible(setVisible);
+ this.showAllSeqAnnotations.setEnabled(setVisible);
+ this.hideAllSeqAnnotations.setEnabled(setVisible);
+ this.showAllAlAnnotations.setEnabled(setVisible);
+ this.hideAllAlAnnotations.setEnabled(setVisible);
}
@Override
@@ -2886,17 +3133,20 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
editPane.setEditable(false);
StringBuffer contents = new AlignmentProperties(viewport.getAlignment())
.formatAsHtml();
- editPane.setText("" + contents.toString() + "");
+ editPane.setText(MessageManager.formatMessage("label.html_content",
+ new String[]
+ { contents.toString() }));
JInternalFrame frame = new JInternalFrame();
frame.getContentPane().add(new JScrollPane(editPane));
- Desktop.instance.addInternalFrame(frame, "Alignment Properties: "
- + getTitle(), 500, 400);
+ Desktop.instance.addInternalFrame(frame, MessageManager.formatMessage(
+ "label.alignment_properties", new String[]
+ { getTitle() }), 500, 400);
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2911,8 +3161,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JInternalFrame frame = new JInternalFrame();
OverviewPanel overview = new OverviewPanel(alignPanel);
frame.setContentPane(overview);
- Desktop.addInternalFrame(frame, "Overview " + this.getTitle(),
- frame.getWidth(), frame.getHeight());
+ Desktop.addInternalFrame(frame, MessageManager.formatMessage(
+ "label.overview_params", new String[]
+ { this.getTitle() }), frame.getWidth(), frame.getHeight());
frame.pack();
frame.setLayer(JLayeredPane.PALETTE_LAYER);
frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
@@ -2936,7 +3187,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2948,19 +3199,20 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@Override
public void clustalColour_actionPerformed(ActionEvent e)
{
- changeColour(new ClustalxColourScheme(viewport.getAlignment(), viewport.getHiddenRepSequences()));
+ changeColour(new ClustalxColourScheme(viewport.getAlignment(),
+ viewport.getHiddenRepSequences()));
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2972,7 +3224,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2984,7 +3236,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -2996,7 +3248,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3008,7 +3260,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3020,7 +3272,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3032,7 +3284,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3044,7 +3296,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3080,7 +3332,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3092,7 +3344,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param cs
* DOCUMENT ME!
*/
@@ -3107,10 +3359,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
"Background");
-
cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
-
- viewport.setGlobalColourScheme(cs);
}
else
{
@@ -3146,8 +3395,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (viewport.getColourAppliesToAllGroups())
{
-
- for (SequenceGroup sg:viewport.getAlignment().getGroups())
+ for (SequenceGroup sg : viewport.getAlignment().getGroups())
{
if (cs == null)
{
@@ -3157,8 +3405,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (cs instanceof ClustalxColourScheme)
{
- sg.cs = new ClustalxColourScheme(sg, viewport
- .getHiddenRepSequences());
+ sg.cs = new ClustalxColourScheme(sg,
+ viewport.getHiddenRepSequences());
}
else if (cs instanceof UserColourScheme)
{
@@ -3216,7 +3464,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3234,7 +3482,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3252,7 +3500,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3271,7 +3519,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3290,14 +3538,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@Override
public void userDefinedColour_actionPerformed(ActionEvent e)
{
- if (e.getActionCommand().equals("User Defined..."))
+ if (e.getActionCommand().equals(
+ MessageManager.getString("action.user_defined")))
{
new UserDefinedColours(alignPanel, null);
}
@@ -3346,8 +3595,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
int option = JOptionPane.showInternalConfirmDialog(
jalview.gui.Desktop.desktop,
- "Remove from default list?",
- "Remove user defined colour",
+ MessageManager
+ .getString("label.remove_from_default_list"),
+ MessageManager
+ .getString("label.remove_user_defined_colour"),
JOptionPane.YES_NO_OPTION);
if (option == JOptionPane.YES_OPTION)
{
@@ -3386,7 +3637,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3398,7 +3649,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3410,7 +3661,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3427,7 +3678,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3443,7 +3694,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3459,7 +3710,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3476,7 +3727,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3488,7 +3739,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3498,21 +3749,24 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if ((viewport.getSelectionGroup() == null)
|| (viewport.getSelectionGroup().getSize() < 2))
{
- JOptionPane.showInternalMessageDialog(this,
- "You must select at least 2 sequences.", "Invalid Selection",
+ JOptionPane.showInternalMessageDialog(this, MessageManager
+ .getString("label.you_must_select_least_two_sequences"),
+ MessageManager.getString("label.invalid_selection"),
JOptionPane.WARNING_MESSAGE);
}
else
{
JInternalFrame frame = new JInternalFrame();
frame.setContentPane(new PairwiseAlignPanel(viewport));
- Desktop.addInternalFrame(frame, "Pairwise Alignment", 600, 500);
+ Desktop.addInternalFrame(frame,
+ MessageManager.getString("action.pairwise_alignment"), 600,
+ 500);
}
}
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3524,11 +3778,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
.getSelectionGroup().getSize() > 0))
|| (viewport.getAlignment().getHeight() < 4))
{
- JOptionPane.showInternalMessageDialog(this,
- "Principal component analysis must take\n"
- + "at least 4 input sequences.",
- "Sequence selection insufficient",
- JOptionPane.WARNING_MESSAGE);
+ JOptionPane
+ .showInternalMessageDialog(
+ this,
+ MessageManager
+ .getString("label.principal_component_analysis_must_take_least_four_input_sequences"),
+ MessageManager
+ .getString("label.sequence_selection_insufficient"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
@@ -3561,7 +3818,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3573,7 +3830,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3585,7 +3842,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3597,7 +3854,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3609,7 +3866,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param type
* DOCUMENT ME!
* @param pwType
@@ -3621,33 +3878,36 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
TreePanel tp;
- if (viewport.getSelectionGroup() != null)
+ if (viewport.getSelectionGroup() != null
+ && viewport.getSelectionGroup().getSize() > 0)
{
if (viewport.getSelectionGroup().getSize() < 3)
{
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "You need to have more than two sequences selected to build a tree!",
- "Not enough sequences", JOptionPane.WARNING_MESSAGE);
+ MessageManager
+ .getString("label.you_need_more_two_sequences_selected_build_tree"),
+ MessageManager
+ .getString("label.not_enough_sequences"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
SequenceGroup sg = viewport.getSelectionGroup();
/* Decide if the selection is a column region */
- for (SequenceI _s:sg.getSequences())
+ for (SequenceI _s : sg.getSequences())
{
- if (_s.getLength() < sg
- .getEndRes())
+ if (_s.getLength() < sg.getEndRes())
{
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "The selected region to create a tree may\nonly contain residues or gaps.\n"
- + "Try using the Pad function in the edit menu,\n"
- + "or one of the multiple sequence alignment web services.",
- "Sequences in selection are not aligned",
+ MessageManager
+ .getString("label.selected_region_to_tree_may_only_contain_residues_or_gaps"),
+ MessageManager
+ .getString("label.sequences_selection_not_aligned"),
JOptionPane.WARNING_MESSAGE);
return;
@@ -3665,10 +3925,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "The sequences must be aligned before creating a tree.\n"
- + "Try using the Pad function in the edit menu,\n"
- + "or one of the multiple sequence alignment web services.",
- "Sequences not aligned",
+ MessageManager
+ .getString("label.sequences_must_be_aligned_before_creating_tree"),
+ MessageManager
+ .getString("label.sequences_not_aligned"),
JOptionPane.WARNING_MESSAGE);
return;
@@ -3696,7 +3956,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param title
* DOCUMENT ME!
* @param order
@@ -3705,7 +3965,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void addSortByOrderMenuItem(String title,
final AlignmentOrder order)
{
- final JMenuItem item = new JMenuItem("by " + title);
+ final JMenuItem item = new JMenuItem(MessageManager.formatMessage("action.by_title_param", new String[]{title}));
sort.add(item);
item.addActionListener(new java.awt.event.ActionListener()
{
@@ -3728,7 +3988,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Add a new sort by annotation score menu item
- *
+ *
* @param sort
* the menu to add the option to
* @param scoreLabel
@@ -3765,7 +4025,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
* search the alignment and rebuild the sort by annotation score submenu the
* last alignment annotation vector hash is stored to minimize cost of
* rebuilding in subsequence calls.
- *
+ *
*/
@Override
public void buildSortByAnnotationScoresMenu()
@@ -3781,7 +4041,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
// almost certainly a quicker way to do this - but we keep it simple
Hashtable scoreSorts = new Hashtable();
AlignmentAnnotation aann[];
- for (SequenceI sqa:viewport.getAlignment().getSequences())
+ for (SequenceI sqa : viewport.getAlignment().getSequences())
{
aann = sqa.getAnnotation();
for (int i = 0; aann != null && i < aann.length; i++)
@@ -3812,7 +4072,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
* call. Listeners are added to remove the menu item when the treePanel is
* closed, and adjust the tree leaf to sequence mapping when the alignment is
* modified.
- *
+ *
* @param treePanel
* Displayed tree window.
* @param title
@@ -3821,6 +4081,38 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void buildTreeMenu()
{
+ calculateTree.removeAll();
+ // build the calculate menu
+
+ for (final String type : new String[]
+ { "NJ", "AV" })
+ {
+ String treecalcnm = MessageManager.getString("label.tree_calc_"
+ + type.toLowerCase());
+ for (final Object pwtype : ResidueProperties.scoreMatrices.keySet())
+ {
+ JMenuItem tm = new JMenuItem();
+ ScoreModelI sm = ResidueProperties.scoreMatrices.get(pwtype);
+ if (sm.isProtein() == !viewport.getAlignment().isNucleotide())
+ {
+ String smn = MessageManager.getStringOrReturn(
+ "label.score_model_", sm.getName());
+ final String title = MessageManager.formatMessage(
+ "label.treecalc_title", treecalcnm, smn);
+ tm.setText(title);//
+ tm.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ NewTreePanel(type, (String) pwtype, title);
+ }
+ });
+ calculateTree.add(tm);
+ }
+
+ }
+ }
sortByTreeMenu.removeAll();
Vector comps = (Vector) PaintRefresher.components.get(viewport
@@ -3881,7 +4173,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Work out whether the whole set of sequences or just the selected set will
* be submitted for multiple alignment.
- *
+ *
*/
public jalview.datamodel.AlignmentView gatherSequencesForAlignment()
{
@@ -3896,22 +4188,26 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* SequenceGroup seqs = viewport.getSelectionGroup(); int sz; msa = new
* SequenceI[sz = seqs.getSize(false)];
- *
+ *
* for (int i = 0; i < sz; i++) { msa[i] = (SequenceI)
* seqs.getSequenceAt(i); }
*/
msa = viewport.getAlignmentView(true);
}
+ else if (viewport.getSelectionGroup() != null
+ && viewport.getSelectionGroup().getSize() == 1)
+ {
+ int option = JOptionPane.showConfirmDialog(this,
+ MessageManager.getString("warn.oneseq_msainput_selection"),
+ MessageManager.getString("label.invalid_selection"),
+ JOptionPane.OK_CANCEL_OPTION);
+ if (option == JOptionPane.OK_OPTION)
+ {
+ msa = viewport.getAlignmentView(false);
+ }
+ }
else
{
- /*
- * Vector seqs = viewport.getAlignment().getSequences();
- *
- * if (seqs.size() > 1) { msa = new SequenceI[seqs.size()];
- *
- * for (int i = 0; i < seqs.size(); i++) { msa[i] = (SequenceI)
- * seqs.elementAt(i); } }
- */
msa = viewport.getAlignmentView(false);
}
return msa;
@@ -3954,7 +4250,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* DOCUMENT ME!
- *
+ *
* @param e
* DOCUMENT ME!
*/
@@ -3965,8 +4261,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Select a newick-like tree file");
- chooser.setToolTipText("Load a tree file");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.select_newick_like_tree_file"));
+ chooser.setToolTipText(MessageManager.getString("label.load_tree_file"));
int value = chooser.showOpenDialog(null);
@@ -3981,14 +4278,20 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
} catch (Exception ex)
{
- JOptionPane.showMessageDialog(Desktop.desktop, ex.getMessage(),
- "Problem reading tree file", JOptionPane.WARNING_MESSAGE);
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ ex.getMessage(),
+ MessageManager
+ .getString("label.problem_reading_tree_file"),
+ JOptionPane.WARNING_MESSAGE);
ex.printStackTrace();
}
if (fin != null && fin.hasWarningMessage())
{
- JOptionPane.showMessageDialog(Desktop.desktop,
- fin.getWarningMessage(), "Possible problem with tree file",
+ JOptionPane.showMessageDialog(Desktop.desktop, fin
+ .getWarningMessage(), MessageManager
+ .getString("label.possible_problem_with_tree_file"),
JOptionPane.WARNING_MESSAGE);
}
}
@@ -4020,7 +4323,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Add a treeviewer for the tree extracted from a newick file object to the
* current alignment view
- *
+ *
* @param nf
* the tree
* @param title
@@ -4071,7 +4374,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* Generates menu items and listener event actions for web service clients
- *
+ *
*/
public void BuildWebServiceMenu()
{
@@ -4093,6 +4396,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void run()
{
+ final List legacyItems = new ArrayList();
try
{
System.err.println("Building ws menu again "
@@ -4115,6 +4419,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
final JMenu seqsrchmenu = new JMenu("Sequence Database Search");
final JMenu analymenu = new JMenu("Analysis");
final JMenu dismenu = new JMenu("Protein Disorder");
+ // final JMenu msawsmenu = new
+ // JMenu(MessageManager.getString("label.alignment"));
+ // final JMenu secstrmenu = new
+ // JMenu(MessageManager.getString("label.secondary_structure_prediction"));
+ // final JMenu seqsrchmenu = new
+ // JMenu(MessageManager.getString("label.sequence_database_search"));
+ // final JMenu analymenu = new
+ // JMenu(MessageManager.getString("label.analysis"));
+ // final JMenu dismenu = new
+ // JMenu(MessageManager.getString("label.protein_disorder"));
// JAL-940 - only show secondary structure prediction services from
// the legacy server
if (// Cache.getDefault("SHOW_JWS1_SERVICES", true)
@@ -4124,28 +4438,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
// TODO: refactor to allow list of AbstractName/Handler bindings to
// be
// stored or retrieved from elsewhere
- Vector msaws = null; // (Vector) Discoverer.services.get("MsaWS");
+ // No MSAWS used any more:
+ // Vector msaws = null; // (Vector)
+ // Discoverer.services.get("MsaWS");
Vector secstrpr = (Vector) Discoverer.services
.get("SecStrPred");
- Vector seqsrch = null; // (Vector)
- // Discoverer.services.get("SeqSearch");
- // TODO: move GUI generation code onto service implementation - so a
- // client instance attaches itself to the GUI with method call like
- // jalview.ws.MsaWSClient.bind(servicehandle, Desktop.instance,
- // alignframe)
- if (msaws != null)
- {
- // Add any Multiple Sequence Alignment Services
- for (int i = 0, j = msaws.size(); i < j; i++)
- {
- final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) msaws
- .get(i);
- jalview.ws.WSMenuEntryProviderI impl = jalview.ws.jws1.Discoverer
- .getServiceClient(sh);
- impl.attachWSMenuEntry(msawsmenu, me);
-
- }
- }
if (secstrpr != null)
{
// Add any secondary structure prediction services
@@ -4155,19 +4452,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
.get(i);
jalview.ws.WSMenuEntryProviderI impl = jalview.ws.jws1.Discoverer
.getServiceClient(sh);
+ int p = secstrmenu.getItemCount();
impl.attachWSMenuEntry(secstrmenu, me);
- }
- }
- if (seqsrch != null)
- {
- // Add any sequence search services
- for (int i = 0, j = seqsrch.size(); i < j; i++)
- {
- final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) seqsrch
- .elementAt(i);
- jalview.ws.WSMenuEntryProviderI impl = jalview.ws.jws1.Discoverer
- .getServiceClient(sh);
- impl.attachWSMenuEntry(seqsrchmenu, me);
+ int q = secstrmenu.getItemCount();
+ for (int litm = p; litm < q; litm++)
+ {
+ legacyItems.add(secstrmenu.getItem(litm));
+ }
}
}
}
@@ -4178,12 +4469,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
wsmenu.add(secstrmenu);
wsmenu.add(dismenu);
wsmenu.add(analymenu);
- // final ArrayList submens=new ArrayList();
- // submens.add(msawsmenu);
- // submens.add(secstrmenu);
- // submens.add(dismenu);
- // submens.add(analymenu);
-
// No search services yet
// wsmenu.add(seqsrchmenu);
@@ -4208,6 +4493,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
webService.add(me.webServiceNoServices);
}
// TODO: move into separate menu builder class.
+ boolean new_sspred = false;
if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
{
Jws2Discoverer jws2servs = Jws2Discoverer.getDiscoverer();
@@ -4216,6 +4502,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (jws2servs.hasServices())
{
jws2servs.attachWSMenuEntry(webService, me);
+ for (Jws2Instance sv : jws2servs.getServices())
+ {
+ if (sv.description.toLowerCase().contains("jpred"))
+ {
+ for (JMenuItem jmi : legacyItems)
+ {
+ jmi.setVisible(false);
+ }
+ }
+ }
+
}
if (jws2servs.isRunning())
{
@@ -4226,7 +4523,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
}
}
-
build_urlServiceMenu(me.webService);
build_fetchdbmenu(webService);
for (JMenu item : wsmenu)
@@ -4242,6 +4538,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
} catch (Exception e)
{
+ Cache.log
+ .debug("Exception during web service menu building process.",
+ e);
}
;
}
@@ -4259,7 +4558,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* construct any groupURL type service menu entries.
- *
+ *
* @param webService
*/
private void build_urlServiceMenu(JMenu webService)
@@ -4269,12 +4568,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* JMenuItem testAlView = new JMenuItem("Test AlignmentView"); final
* AlignFrame af = this; testAlView.addActionListener(new ActionListener() {
- *
+ *
* @Override public void actionPerformed(ActionEvent e) {
* jalview.datamodel.AlignmentView
* .testSelectionViews(af.viewport.getAlignment(),
* af.viewport.getColumnSelection(), af.viewport.selectionGroup); }
- *
+ *
* }); webService.add(testAlView);
*/
// TODO: refactor to RestClient discoverer and merge menu entries for
@@ -4289,24 +4588,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JvSwingUtils.findOrCreateMenu(webService, client.getAction()),
this);
}
-
- if (Cache.getDefault("SHOW_ENFIN_SERVICES", true))
- {
- jalview.ws.EnfinEnvision2OneWay.getInstance().attachWSMenuEntry(
- webService, this);
- }
}
/*
* public void vamsasStore_actionPerformed(ActionEvent e) { JalviewFileChooser
* chooser = new JalviewFileChooser(jalview.bin.Cache.
* getProperty("LAST_DIRECTORY"));
- *
+ *
* chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Export
* to Vamsas file"); chooser.setToolTipText("Export");
- *
+ *
* int value = chooser.showSaveDialog(this);
- *
+ *
* if (value == JalviewFileChooser.APPROVE_OPTION) {
* jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
* //vs.store(chooser.getSelectedFile().getAbsolutePath() ); vs.storeJalview(
@@ -4314,7 +4607,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
*/
/**
* prototype of an automatically enabled/disabled analysis function
- *
+ *
*/
protected void setShowProductsEnabled()
{
@@ -4334,7 +4627,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* search selection for sequence xRef products and build the show products
* menu.
- *
+ *
* @param selection
* @param dataset
* @return true if showProducts menu should be enabled.
@@ -4402,7 +4695,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void run()
{
final long sttime = System.currentTimeMillis();
- ths.setProgressBar("Searching for sequences from " + fsrc, sttime);
+ ths.setProgressBar(MessageManager.formatMessage("status.searching_for_sequences_from", new String[]{fsrc}), sttime);
try
{
Alignment ds = ths.getViewport().getAlignment().getDataset(); // update
@@ -4420,7 +4713,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (ds.getSequences() == null
|| !ds.getSequences().contains(
sprods[s].getDatasetSequence()))
+ {
ds.addSequence(sprods[s].getDatasetSequence());
+ }
sprods[s].updatePDBIds();
}
Alignment al = new Alignment(sprods);
@@ -4456,7 +4751,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
jalview.bin.Cache.log.error("Error when finding crossreferences",
e);
}
- ths.setProgressBar("Finished searching for sequences from " + fsrc,
+ ths.setProgressBar(MessageManager.formatMessage("status.finished_searching_for_sequences_from", new String[]{fsrc}),
sttime);
}
@@ -4505,14 +4800,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "Please select at least three bases in at least one sequence in order to perform a cDNA translation.",
- "Translation Failed", JOptionPane.WARNING_MESSAGE);
+ MessageManager
+ .getString("label.select_at_least_three_bases_in_at_least_one_sequence_to_cDNA_translation"),
+ MessageManager.getString("label.translation_failed"),
+ JOptionPane.WARNING_MESSAGE);
}
else
{
AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- Desktop.addInternalFrame(af, "Translation of " + this.getTitle(),
- DEFAULT_WIDTH, DEFAULT_HEIGHT);
+ Desktop.addInternalFrame(af, MessageManager.formatMessage(
+ "label.translation_of_params", new String[]
+ { this.getTitle() }), DEFAULT_WIDTH, DEFAULT_HEIGHT);
}
}
@@ -4535,27 +4833,42 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
} catch (Exception ex)
{
al = null;
- jalview.bin.Cache.log.debug("Exception during translation.", ex);
+ jalview.bin.Cache.log.error(
+ "Exception during translation. Please report this !", ex);
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ MessageManager
+ .getString("label.error_when_translating_sequences_submit_bug_report"),
+ MessageManager
+ .getString("label.implementation_error")
+ + MessageManager
+ .getString("translation_failed"),
+ JOptionPane.ERROR_MESSAGE);
+ return;
}
if (al == null)
{
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "Please select at least three bases in at least one sequence in order to perform a cDNA translation.",
- "Translation Failed", JOptionPane.WARNING_MESSAGE);
+ MessageManager
+ .getString("label.select_at_least_three_bases_in_at_least_one_sequence_to_cDNA_translation"),
+ MessageManager.getString("label.translation_failed"),
+ JOptionPane.WARNING_MESSAGE);
}
else
{
AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- Desktop.addInternalFrame(af, "Translation of " + this.getTitle(),
- DEFAULT_WIDTH, DEFAULT_HEIGHT);
+ Desktop.addInternalFrame(af, MessageManager.formatMessage(
+ "label.translation_of_params", new String[]
+ { this.getTitle() }), DEFAULT_WIDTH, DEFAULT_HEIGHT);
}
}
/**
* Try to load a features file onto the alignment.
- *
+ *
* @param file
* contents or path to retrieve file
* @param type
@@ -4568,8 +4881,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
try
{
featuresFile = new FeaturesFile(file, type).parse(viewport
- .getAlignment().getDataset(), alignPanel.seqPanel.seqCanvas
- .getFeatureRenderer().featureColours, false,
+ .getAlignment().getDataset(), alignPanel.getSeqPanel().seqCanvas
+ .getFeatureRenderer().getFeatureColours(), false,
jalview.bin.Cache.getDefault("RELAXEDSEQIDMATCHING", false));
} catch (Exception ex)
{
@@ -4578,12 +4891,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (featuresFile)
{
- viewport.showSequenceFeatures = true;
+ viewport.setShowSequenceFeatures(true);
showSeqFeatures.setSelected(true);
- if (alignPanel.seqPanel.seqCanvas.fr != null)
+ if (alignPanel.getSeqPanel().seqCanvas.fr != null)
{
// update the min/max ranges where necessary
- alignPanel.seqPanel.seqCanvas.fr.findAllFeatures(true);
+ alignPanel.getSeqPanel().seqCanvas.fr.findAllFeatures(true);
}
if (featureSettings != null)
{
@@ -4742,10 +5055,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
|| JOptionPane
.showConfirmDialog(
this,
- "Do you want to automatically associate the "
- + filesmatched.size()
- + " PDB files with sequences in the alignment that have the same name ?",
- "Automatically Associate PDB files by name",
+ MessageManager
+ .formatMessage(
+ "label.automatically_associate_pdb_files_with_sequences_same_name",
+ new String[]
+ { Integer.valueOf(
+ filesmatched
+ .size())
+ .toString() }),
+ MessageManager
+ .getString("label.automatically_associate_pdb_files_by_name"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
{
@@ -4758,7 +5077,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
PDBEntry pe = new AssociatePdbFileWithSeq()
.associatePdbWithSeq((String) fm[0],
- (String) fm[1], toassoc, false);
+ (String) fm[1], toassoc, false,
+ Desktop.instance);
if (pe != null)
{
System.err.println("Associated file : "
@@ -4778,10 +5098,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
"AUTOASSOCIATE_PDBANDSEQS_IGNOREOTHERS", false) || JOptionPane
.showConfirmDialog(
this,
- "Do you want to ignore the "
- + filesnotmatched.size()
- + " files whose names did not match any sequence IDs ?",
- "Ignore unmatched dropped files ?",
+ ""+MessageManager
+ .formatMessage(
+ "label.ignore_unmatched_dropped_files_info",
+ new String[]
+ { Integer.valueOf(
+ filesnotmatched
+ .size())
+ .toString() })+"",
+ MessageManager
+ .getString("label.ignore_unmatched_dropped_files"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION))
{
return;
@@ -4804,7 +5130,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
* it's and Annotation file, then a JNet file, and finally a features file. If
* all are false then the user may have dropped an alignment file onto this
* AlignFrame.
- *
+ *
* @param file
* either a filename or a URL string.
*/
@@ -4841,15 +5167,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
changeColour(new TCoffeeColourScheme(viewport.getAlignment()));
isAnnotation = true;
statusBar
- .setText("Successfully pasted T-Coffee scores to alignment.");
+ .setText(MessageManager
+ .getString("label.successfully_pasted_tcoffee_scores_to_alignment"));
}
else
{
- // some problem - if no warning its probable that the ID matching process didn't work
- JOptionPane.showMessageDialog(Desktop.desktop,
- tcf.getWarningMessage()==null ? "Check that the file matches sequence IDs in the alignment." : tcf.getWarningMessage(),
- "Problem reading T-COFFEE score file",
- JOptionPane.WARNING_MESSAGE);
+ // some problem - if no warning its probable that the ID matching
+ // process didn't work
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ tcf.getWarningMessage() == null ? MessageManager
+ .getString("label.check_file_matches_sequence_ids_alignment")
+ : tcf.getWarningMessage(),
+ MessageManager
+ .getString("label.problem_reading_tcoffee_score_file"),
+ JOptionPane.WARNING_MESSAGE);
}
}
else
@@ -4858,7 +5191,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
} catch (Exception x)
{
- Cache.log.debug("Exception when processing data source as T-COFFEE score file",x);
+ Cache.log
+ .debug("Exception when processing data source as T-COFFEE score file",
+ x);
tcf = null;
}
if (tcf == null)
@@ -4882,7 +5217,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
/*
* if (format.equalsIgnoreCase("PDB")) {
- *
+ *
* String pdbfn = ""; // try to match up filename with sequence id
* try { if (protocol == jalview.io.FormatAdapter.FILE) { File fl =
* new File(file); pdbfn = fl.getName(); } else if (protocol ==
@@ -4927,6 +5262,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
} catch (Exception ex)
{
ex.printStackTrace();
+ } catch (OutOfMemoryError oom)
+ {
+ try
+ {
+ System.gc();
+ } catch (Exception x)
+ {
+ }
+ ;
+ new OOMWarning(
+ "loading data "
+ + (protocol != null ? (protocol.equals(FormatAdapter.PASTE) ? "from clipboard."
+ : "using " + protocol + " from " + file)
+ : ".")
+ + (format != null ? "(parsing as '" + format
+ + "' file)" : ""), oom, Desktop.desktop);
}
}
@@ -4937,6 +5288,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
alignPanel = (AlignmentPanel) alignPanels.elementAt(index);
viewport = alignPanel.av;
+ avc.setViewportAndAlignmentPanel(viewport, alignPanel);
setMenusFromViewport(viewport);
}
}
@@ -4947,7 +5299,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (SwingUtilities.isRightMouseButton(e))
{
String reply = JOptionPane.showInternalInputDialog(this,
- "Enter View Name", "Edit View Name",
+ MessageManager.getString("label.enter_view_name"),
+ MessageManager.getString("label.enter_view_name"),
JOptionPane.QUESTION_MESSAGE);
if (reply != null)
@@ -4984,7 +5337,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showDbRefs_actionPerformed(java.awt.event.ActionEvent
* )
@@ -4997,7 +5350,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @seejalview.jbgui.GAlignFrame#showNpFeats_actionPerformed(java.awt.event.
* ActionEvent)
*/
@@ -5010,7 +5363,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/**
* find the viewport amongst the tabs in this alignment frame and close that
* tab
- *
+ *
* @param av
*/
public boolean closeView(AlignViewport av)
@@ -5042,12 +5395,32 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
// TODO We probably want to store a sequence database checklist in
// preferences and have checkboxes.. rather than individual sources selected
// here
- final JMenu rfetch = new JMenu("Fetch DB References");
- rfetch.setToolTipText("Retrieve and parse sequence database records for the alignment or the currently selected sequences");
+ final JMenu rfetch = new JMenu(
+ MessageManager.getString("action.fetch_db_references"));
+ rfetch.setToolTipText(MessageManager
+ .getString("label.retrieve_parse_sequence_database_records_alignment_or_selected_sequences"));
webService.add(rfetch);
- JMenuItem fetchr = new JMenuItem("Standard Databases");
- fetchr.setToolTipText("Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources");
+ final JCheckBoxMenuItem trimrs = new JCheckBoxMenuItem(
+ MessageManager.getString("option.trim_retrieved_seqs"));
+ trimrs.setToolTipText(MessageManager
+ .getString("label.trim_retrieved_sequences"));
+ trimrs.setSelected(Cache.getDefault("TRIM_FETCHED_DATASET_SEQS", true));
+ trimrs.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ trimrs.setSelected(trimrs.isSelected());
+ Cache.setProperty("TRIM_FETCHED_DATASET_SEQS",
+ Boolean.valueOf(trimrs.isSelected()).toString());
+ };
+ });
+ rfetch.add(trimrs);
+ JMenuItem fetchr = new JMenuItem(
+ MessageManager.getString("label.standard_databases"));
+ fetchr.setToolTipText(MessageManager
+ .getString("label.fetch_embl_uniprot"));
fetchr.addActionListener(new ActionListener()
{
@@ -5139,9 +5512,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
});
- fetchr.setToolTipText(""
- + JvSwingUtils.wrapTooltip("Retrieve from "
- + src.getDbName()) + "");
+ fetchr.setToolTipText(JvSwingUtils.wrapTooltip(true, MessageManager.formatMessage("label.fetch_retrieve_from", new String[]{src.getDbName()})));
dfetch.add(fetchr);
comp++;
}
@@ -5151,8 +5522,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
.toArray(new DbSourceProxy[0]);
// fetch all entry
DbSourceProxy src = otherdb.get(0);
- fetchr = new JMenuItem("Fetch All '" + src.getDbSource()
- + "'");
+ fetchr = new JMenuItem(MessageManager.formatMessage(
+ "label.fetch_all_param", new String[]
+ { src.getDbSource() }));
fetchr.addActionListener(new ActionListener()
{
@Override
@@ -5173,15 +5545,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
});
- fetchr.setToolTipText(""
- + JvSwingUtils.wrapTooltip("Retrieve from all "
- + otherdb.size() + " sources in "
- + src.getDbSource() + "
First is :"
- + src.getDbName()) + "");
+ fetchr.setToolTipText(JvSwingUtils.wrapTooltip(true, MessageManager.formatMessage("label.fetch_retrieve_from_all_sources", new String[]{Integer.valueOf(otherdb.size()).toString(), src.getDbSource(), src.getDbName()})));
dfetch.add(fetchr);
comp++;
// and then build the rest of the individual menus
- ifetch = new JMenu("Sources from " + src.getDbSource());
+ ifetch = new JMenu(MessageManager.formatMessage("label.source_from_db_source", new String[]{src.getDbSource()}));
icomp = 0;
String imname = null;
int i = 0;
@@ -5194,7 +5562,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
0, 10) + "..." : dbname;
if (imname == null)
{
- imname = "from '" + sname + "'";
+ imname = MessageManager.formatMessage("label.from_msname", new String[]{sname});
}
fetchr = new JMenuItem(msname);
final DbSourceProxy[] dassrc =
@@ -5221,13 +5589,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
});
fetchr.setToolTipText(""
- + JvSwingUtils.wrapTooltip("Retrieve from "
- + dbname) + "");
+ + MessageManager.formatMessage("label.fetch_retrieve_from", new String[]{dbname}));
ifetch.add(fetchr);
++i;
if (++icomp >= mcomp || i == (otherdb.size()))
{
- ifetch.setText(imname + " to '" + sname + "'");
+ ifetch.setText(MessageManager.formatMessage(
+ "label.source_to_target", imname, sname));
dfetch.add(ifetch);
ifetch = new JMenu();
imname = null;
@@ -5239,7 +5607,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
++dbi;
if (comp >= mcomp || dbi >= (dbclasses.length))
{
- dfetch.setText(mname + " to '" + dbclass + "'");
+ dfetch.setText(MessageManager.formatMessage(
+ "label.source_to_target", mname, dbclass));
rfetch.add(dfetch);
dfetch = new JMenu();
mname = null;
@@ -5283,7 +5652,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showUnconservedMenuItem_actionPerformed(java.
* awt.event.ActionEvent)
@@ -5297,7 +5666,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showGroupConsensus_actionPerformed(java.awt.event
* .ActionEvent)
@@ -5312,7 +5681,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showGroupConservation_actionPerformed(java.awt
* .event.ActionEvent)
@@ -5326,7 +5695,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showConsensusHistogram_actionPerformed(java.awt
* .event.ActionEvent)
@@ -5340,7 +5709,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#showConsensusProfile_actionPerformed(java.awt
* .event.ActionEvent)
@@ -5355,6 +5724,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
protected void normaliseSequenceLogo_actionPerformed(ActionEvent e)
{
+ showSequenceLogo.setState(true);
+ viewport.setShowSequenceLogo(true);
viewport.setNormaliseSequenceLogo(normaliseSequenceLogo.getState());
alignPanel.updateAnnotation(applyAutoAnnotationSettings.getState());
}
@@ -5367,7 +5738,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
/*
* (non-Javadoc)
- *
+ *
* @see
* jalview.jbgui.GAlignFrame#makeGrpsFromSelection_actionPerformed(java.awt
* .event.ActionEvent)
@@ -5375,39 +5746,35 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
protected void makeGrpsFromSelection_actionPerformed(ActionEvent e)
{
- if (viewport.getSelectionGroup() != null)
+ if (avc.makeGroupsFromSelection())
{
- SequenceGroup[] gps = jalview.analysis.Grouping.makeGroupsFrom(
- viewport.getSequenceSelection(),
- viewport.getAlignmentView(true).getSequenceStrings(
- viewport.getGapCharacter()), viewport.getAlignment()
- .getGroups());
- viewport.getAlignment().deleteAllGroups();
- viewport.sequenceColours = null;
- viewport.setSelectionGroup(null);
- // set view properties for each group
- for (int g = 0; g < gps.length; g++)
- {
- gps[g].setShowNonconserved(viewport.getShowUnconserved());
- gps[g].setshowSequenceLogo(viewport.isShowSequenceLogo());
- viewport.getAlignment().addGroup(gps[g]);
- Color col = new Color((int) (Math.random() * 255),
- (int) (Math.random() * 255), (int) (Math.random() * 255));
- col = col.brighter();
- for (SequenceI s:gps[g].getSequences())
- viewport.setSequenceColour(
- s, col)
- ;
- }
PaintRefresher.Refresh(this, viewport.getSequenceSetId());
alignPanel.updateAnnotation();
alignPanel.paintAlignment(true);
}
}
+ @Override
+ protected void createGroup_actionPerformed(ActionEvent e)
+ {
+ if (avc.createGroup())
+ {
+ alignPanel.alignmentChanged();
+ }
+ }
+
+ @Override
+ protected void unGroup_actionPerformed(ActionEvent e)
+ {
+ if (avc.unGroup())
+ {
+ alignPanel.alignmentChanged();
+ }
+ }
+
/**
* make the given alignmentPanel the currently selected tab
- *
+ *
* @param alignmentPanel
*/
public void setDisplayedView(AlignmentPanel alignmentPanel)
@@ -5415,8 +5782,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (!viewport.getSequenceSetId().equals(
alignmentPanel.av.getSequenceSetId()))
{
- throw new Error(
- "Implementation error: cannot show a view from another alignment in an AlignFrame.");
+ throw new Error(MessageManager.getString("error.implementation_error_cannot_show_view_alignment_frame"));
}
if (tabbedPane != null
& alignPanels.indexOf(alignmentPanel) != tabbedPane
@@ -5425,6 +5791,54 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
tabbedPane.setSelectedIndex(alignPanels.indexOf(alignmentPanel));
}
}
+
+ /**
+ * Action on selection of menu options to Show or Hide annotations.
+ *
+ * @param visible
+ * @param forSequences
+ * update sequence-related annotations
+ * @param forAlignment
+ * update non-sequence-related annotations
+ */
+ @Override
+ protected void setAnnotationsVisibility(boolean visible,
+ boolean forSequences, boolean forAlignment)
+ {
+ for (AlignmentAnnotation aa : alignPanel.getAlignment()
+ .getAlignmentAnnotation())
+ {
+ boolean apply = (aa.sequenceRef == null && forAlignment)
+ || (aa.sequenceRef != null && forSequences);
+ if (apply)
+ {
+ aa.visible = visible;
+ }
+ }
+ alignPanel.validateAnnotationDimensions(false);
+ alignPanel.alignmentChanged();
+ }
+
+ /**
+ * Store selected annotation sort order for the view and repaint.
+ */
+ @Override
+ protected void sortAnnotations_actionPerformed()
+ {
+ this.alignPanel.av.setSortAnnotationsBy(getAnnotationSortOrder());
+ this.alignPanel.av
+ .setShowAutocalculatedAbove(isShowAutoCalculatedAbove());
+ alignPanel.paintAlignment(true);
+ }
+
+ /**
+ *
+ * @return alignment panels in this alignemnt frame
+ */
+ public List getAlignPanels()
+ {
+ return alignPanels == null ? Arrays.asList(alignPanel) : alignPanels;
+ }
}
class PrintThread extends Thread