X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=2a2fc70d870f905f42fdcc47161a36bb314866d8;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=02d30bbcf9f59bf2343cd7f1ec8f26a005273399;hpb=5e8ec77d921ff2d604811e5e4ba7e9211b0f48de;p=jalview.git diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 02d30bb..2a2fc70 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -95,6 +95,7 @@ import java.awt.Menu; import java.awt.MenuBar; import java.awt.MenuItem; import java.awt.Panel; +import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -106,6 +107,7 @@ import java.awt.event.KeyListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLEncoder; import java.util.Arrays; @@ -173,15 +175,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } public AlignFrame(AlignmentI al, SequenceI[] hiddenSeqs, - HiddenColumns hidden, JalviewLite applet, - String title, boolean embedded) + HiddenColumns hidden, JalviewLite applet, String title, + boolean embedded) { this(al, hiddenSeqs, hidden, applet, title, embedded, true); } public AlignFrame(AlignmentI al, SequenceI[] hiddenSeqs, - HiddenColumns hidden, JalviewLite applet, - String title, boolean embedded, boolean addToDisplay) + HiddenColumns hidden, JalviewLite applet, String title, + boolean embedded, boolean addToDisplay) { if (applet != null) { @@ -343,7 +345,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, createAlignFrameWindow(embedded); validate(); alignPanel.adjustAnnotationHeight(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); } public AlignViewport getAlignViewport() @@ -390,8 +392,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { Map colours = alignPanel.seqPanel.seqCanvas .getFeatureRenderer().getFeatureColours(); - boolean relaxedIdMatching = viewport.applet.getDefaultParameter( - "relaxedidmatch", false); + boolean relaxedIdMatching = viewport.applet + .getDefaultParameter("relaxedidmatch", false); featuresFile = new FeaturesFile(file, sourceType).parse( viewport.getAlignment(), colours, true, relaxedIdMatching); } catch (Exception ex) @@ -415,8 +417,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { viewport.featureSettings.refreshTable(); } - alignPanel.paintAlignment(true); - statusBar.setText(MessageManager + alignPanel.paintAlignment(true, true); + setStatus(MessageManager .getString("label.successfully_added_features_alignment")); } return featuresFile; @@ -428,9 +430,10 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, ViewportRanges ranges = viewport.getRanges(); if (viewport.cursorMode - && ((evt.getKeyCode() >= KeyEvent.VK_0 && evt.getKeyCode() <= KeyEvent.VK_9) || (evt - .getKeyCode() >= KeyEvent.VK_NUMPAD0 && evt - .getKeyCode() <= KeyEvent.VK_NUMPAD9)) + && ((evt.getKeyCode() >= KeyEvent.VK_0 + && evt.getKeyCode() <= KeyEvent.VK_9) + || (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 + && evt.getKeyCode() <= KeyEvent.VK_NUMPAD9)) && Character.isDigit(evt.getKeyChar())) { alignPanel.seqPanel.numberPressed(evt.getKeyChar()); @@ -573,9 +576,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, case KeyEvent.VK_F2: viewport.cursorMode = !viewport.cursorMode; - statusBar.setText(MessageManager.formatMessage( - "label.keyboard_editing_mode", - new String[] { (viewport.cursorMode ? "on" : "off") })); + setStatus(MessageManager.formatMessage("label.keyboard_editing_mode", + new String[] + { (viewport.cursorMode ? "on" : "off") })); if (viewport.cursorMode) { alignPanel.seqPanel.seqCanvas.cursorX = ranges.getStartRes(); @@ -599,25 +602,11 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } case KeyEvent.VK_PAGE_UP: - if (viewport.getWrapAlignment()) - { - ranges.scrollUp(true); - } - else - { - ranges.pageUp(); - } + ranges.pageUp(); break; case KeyEvent.VK_PAGE_DOWN: - if (viewport.getWrapAlignment()) - { - ranges.scrollUp(false); - } - else - { - ranges.pageDown(); - } + ranges.pageDown(); break; case KeyEvent.VK_Z: @@ -704,7 +693,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, break; } - alignPanel.paintAlignment(true); + // TODO: repaint flags set only if the keystroke warrants it + alignPanel.paintAlignment(true, true); } /** @@ -722,9 +712,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // Hide everything by the current selection - this is a hack - we do the // invert and then hide // first check that there will be visible columns after the invert. - if (viewport.hasSelectedColumns() - || (sg != null && sg.getSize() > 0 && sg.getStartRes() <= sg - .getEndRes())) + if (viewport.hasSelectedColumns() || (sg != null && sg.getSize() > 0 + && sg.getStartRes() <= sg.getEndRes())) { // now invert the sequence set, if required - empty selection implies // that no hiding is required. @@ -853,16 +842,18 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { boolean newState = sortAnnBySequence.getState(); sortAnnByLabel.setState(false); - setAnnotationSortOrder(newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL - : SequenceAnnotationOrder.NONE); + setAnnotationSortOrder( + newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL + : SequenceAnnotationOrder.NONE); setViewportAnnotationOrder(); } else if (source == sortAnnByLabel) { boolean newState = sortAnnByLabel.getState(); sortAnnBySequence.setState(false); - setAnnotationSortOrder(newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE - : SequenceAnnotationOrder.NONE); + setAnnotationSortOrder( + newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE + : SequenceAnnotationOrder.NONE); setViewportAnnotationOrder(); } else if (source == showAutoFirst) @@ -929,7 +920,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { applyAutoAnnotationSettings_actionPerformed(); } - alignPanel.paintAlignment(true); + // TODO: repaint flags set only if warranted + alignPanel.paintAlignment(true, true); } /** @@ -1106,7 +1098,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, else if (source == invertColSel) { viewport.invertColumnSelection(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); viewport.sendSelection(); } else if (source == remove2LeftMenuItem) @@ -1140,34 +1132,34 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, else if (source == showColumns) { viewport.showAllHiddenColumns(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); viewport.sendSelection(); } else if (source == showSeqs) { viewport.showAllHiddenSeqs(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); // uncomment if we want to slave sequence selections in split frame // viewport.sendSelection(); } else if (source == hideColumns) { viewport.hideSelectedColumns(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); viewport.sendSelection(); } else if (source == hideSequences && viewport.getSelectionGroup() != null) { viewport.hideAllSelectedSeqs(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); // uncomment if we want to slave sequence selections in split frame // viewport.sendSelection(); } else if (source == hideAllButSelection) { toggleHiddenRegions(false, false); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); viewport.sendSelection(); } else if (source == hideAllSelection) @@ -1176,14 +1168,14 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, viewport.expandColSelection(sg, false); viewport.hideAllSelectedSeqs(); viewport.hideSelectedColumns(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); viewport.sendSelection(); } else if (source == showAllHidden) { viewport.showAllHiddenColumns(); viewport.showAllHiddenSeqs(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); viewport.sendSelection(); } else if (source == showGroupConsensus) @@ -1212,7 +1204,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } else if (source == featureSettings) { - new FeatureSettings(alignPanel); + showFeatureSettingsUI(); } else if (source == alProperties) { @@ -1222,9 +1214,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, cap.setText(contents.toString()); Frame frame = new Frame(); frame.add(cap); - jalview.bin.JalviewLite.addFrame(frame, MessageManager.formatMessage( - "label.alignment_properties", new String[] { getTitle() }), - 400, 250); + jalview.bin.JalviewLite.addFrame(frame, MessageManager + .formatMessage("label.alignment_properties", new String[] + { getTitle() }), 400, 250); } else if (source == overviewMenuItem) { @@ -1385,15 +1377,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this); Frame frame = new Frame(); frame.add(cap); - JalviewLite.addFrame(frame, MessageManager.formatMessage( - "label.alignment_output_command", - new Object[] { e.getActionCommand() }), 600, 500); - - FileFormatI fileFormat = FileFormats.getInstance().forName( - e.getActionCommand()); - cap.setText(new AppletFormatAdapter(alignPanel).formatSequences( - fileFormat, viewport.getAlignment(), - viewport.getShowJVSuffix())); + JalviewLite.addFrame(frame, MessageManager + .formatMessage("label.alignment_output_command", new Object[] + { e.getActionCommand() }), 600, 500); + + FileFormatI fileFormat = FileFormats.getInstance() + .forName(e.getActionCommand()); + cap.setText( + new AppletFormatAdapter(alignPanel).formatSequences(fileFormat, + viewport.getAlignment(), viewport.getShowJVSuffix())); } public void loadAnnotations() @@ -1438,19 +1430,32 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, return null; } + private List getDisplayedFeatureGroups() + { + if (alignPanel.getFeatureRenderer() != null + && viewport.getFeaturesDisplayed() != null) + { + return alignPanel.getFeatureRenderer().getDisplayedFeatureGroups(); + + } + return null; + } + public String outputFeatures(boolean displayTextbox, String format) { String features; FeaturesFile formatter = new FeaturesFile(); if (format.equalsIgnoreCase("Jalview")) { - features = formatter.printJalviewFormat(viewport.getAlignment() - .getSequencesArray(), getDisplayedFeatureCols()); + features = formatter.printJalviewFormat( + viewport.getAlignment().getSequencesArray(), + alignPanel.getFeatureRenderer(), true, false); } else { - features = formatter.printGffFormat(viewport.getAlignment() - .getSequencesArray(), getDisplayedFeatureCols()); + features = formatter.printGffFormat( + viewport.getAlignment().getSequencesArray(), + alignPanel.getFeatureRenderer(), true, false); } if (displayTextbox) @@ -1493,8 +1498,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, : "?"; url.append(firstSep); - url.append("open=" - + appendProtocol(viewport.applet.getParameter("file"))); + url.append( + "open=" + appendProtocol(viewport.applet.getParameter("file"))); if (viewport.applet.getParameter("features") != null) { @@ -1505,30 +1510,30 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, if (viewport.applet.getParameter("annotations") != null) { url.append("&annotations="); - url.append(appendProtocol(viewport.applet.getParameter("annotations"))); + url.append( + appendProtocol(viewport.applet.getParameter("annotations"))); } if (viewport.applet.getParameter("jnetfile") != null || viewport.applet.getParameter("jpredfile") != null) { url.append("&annotations="); - url.append(appendProtocol(viewport.applet.getParameter("jnetfile") != null ? viewport.applet - .getParameter("jnetfile") : viewport.applet - .getParameter("jpredfile"))); + url.append(appendProtocol( + viewport.applet.getParameter("jnetfile") != null + ? viewport.applet.getParameter("jnetfile") + : viewport.applet.getParameter("jpredfile"))); } if (viewport.applet.getParameter("defaultColour") != null) { - url.append("&colour=" - + removeWhiteSpace(viewport.applet - .getParameter("defaultColour"))); + url.append("&colour=" + removeWhiteSpace( + viewport.applet.getParameter("defaultColour"))); } if (viewport.applet.getParameter("userDefinedColour") != null) { - url.append("&colour=" - + removeWhiteSpace(viewport.applet - .getParameter("userDefinedColour"))); + url.append("&colour=" + removeWhiteSpace( + viewport.applet.getParameter("userDefinedColour"))); } if (viewport.applet.getParameter("tree") != null) { @@ -1567,7 +1572,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, try { new URL(url); - url = URLEncoder.encode(url); + url = URLEncoder.encode(url, "UTF-8"); } /* * When we finally deprecate 1.1 compatibility, we can start to use @@ -1579,6 +1584,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, catch (java.net.MalformedURLException ex) { url = viewport.applet.getCodeBase() + url; + } catch (UnsupportedEncodingException ex) + { + System.err.println( + "WARNING = IMPLEMENTATION ERROR - UNSUPPORTED ENCODING EXCEPTION FOR " + + url); + ex.printStackTrace(); } return url; } @@ -1600,10 +1611,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { System.exit(0); } - else + + viewport = null; + if (alignPanel != null && alignPanel.overviewPanel != null) { + alignPanel.overviewPanel.dispose(); } - viewport = null; alignPanel = null; this.dispose(); } @@ -1618,9 +1631,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { undoMenuItem.setEnabled(true); CommandI command = viewport.getHistoryList().peek(); - undoMenuItem.setLabel(MessageManager.formatMessage( - "label.undo_command", - new Object[] { command.getDescription() })); + undoMenuItem.setLabel(MessageManager + .formatMessage("label.undo_command", new Object[] + { command.getDescription() })); } else { @@ -1633,9 +1646,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, redoMenuItem.setEnabled(true); CommandI command = viewport.getRedoList().peek(); - redoMenuItem.setLabel(MessageManager.formatMessage( - "label.redo_command", - new Object[] { command.getDescription() })); + redoMenuItem.setLabel(MessageManager + .formatMessage("label.redo_command", new Object[] + { command.getDescription() })); } else { @@ -1687,8 +1700,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // viewport.getColumnSelection().getHiddenColumns() // != null; updateEditMenuBar(); - originalSource.firePropertyChange("alignment", null, originalSource - .getAlignment().getSequences()); + originalSource.firePropertyChange("alignment", null, + originalSource.getAlignment().getSequences()); } /** @@ -1720,8 +1733,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // != null; updateEditMenuBar(); - originalSource.firePropertyChange("alignment", null, originalSource - .getAlignment().getSequences()); + originalSource.firePropertyChange("alignment", null, + originalSource.getAlignment().getSequences()); } AlignmentViewport getOriginatingSource(CommandI command) @@ -1735,8 +1748,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { EditCommand editCommand = (EditCommand) command; al = editCommand.getAlignment(); - Vector comps = (Vector) PaintRefresher.components.get(viewport - .getSequenceSetId()); + Vector comps = PaintRefresher.components + .get(viewport.getSequenceSetId()); for (int i = 0; i < comps.size(); i++) { if (comps.elementAt(i) instanceof AlignmentPanel) @@ -1780,7 +1793,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } viewport.getAlignment().moveSelectedSequencesByOne(sg, up ? null : viewport.getHiddenRepSequences(), up); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); /* * Also move cDNA/protein complement sequences @@ -1792,7 +1805,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, viewport, complement); complement.getAlignment().moveSelectedSequencesByOne(mappedSelection, up ? null : complement.getHiddenRepSequences(), up); - getSplitFrame().getComplement(this).alignPanel.paintAlignment(true); + getSplitFrame().getComplement(this).alignPanel.paintAlignment(true, + false); } } @@ -1801,15 +1815,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, List sg = new Vector<>(); if (viewport.cursorMode) { - sg.add(viewport.getAlignment().getSequenceAt( - alignPanel.seqPanel.seqCanvas.cursorY)); + sg.add(viewport.getAlignment() + .getSequenceAt(alignPanel.seqPanel.seqCanvas.cursorY)); } else if (viewport.getSelectionGroup() != null && viewport.getSelectionGroup().getSize() != viewport .getAlignment().getHeight()) { - sg = viewport.getSelectionGroup().getSequences( - viewport.getHiddenRepSequences()); + sg = viewport.getSelectionGroup() + .getSequences(viewport.getHiddenRepSequences()); } if (sg.size() < 1) @@ -1829,8 +1843,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI[] seqs1 = sg.toArray(new SequenceI[sg.size()]); - SequenceI[] seqs2 = invertGroup.toArray(new SequenceI[invertGroup - .size()]); + SequenceI[] seqs2 = invertGroup + .toArray(new SequenceI[invertGroup.size()]); for (int i = 0; i < invertGroup.size(); i++) { seqs2[i] = invertGroup.elementAt(i); @@ -1839,13 +1853,13 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SlideSequencesCommand ssc; if (right) { - ssc = new SlideSequencesCommand("Slide Sequences", seqs2, seqs1, - size, viewport.getGapCharacter()); + ssc = new SlideSequencesCommand("Slide Sequences", seqs2, seqs1, size, + viewport.getGapCharacter()); } else { - ssc = new SlideSequencesCommand("Slide Sequences", seqs1, seqs2, - size, viewport.getGapCharacter()); + ssc = new SlideSequencesCommand("Slide Sequences", seqs1, seqs2, size, + viewport.getGapCharacter()); } int groupAdjustment = 0; @@ -1885,9 +1899,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, if (historyList != null && historyList.size() > 0 && historyList.peek() instanceof SlideSequencesCommand) { - appendHistoryItem = ssc - .appendSlideCommand((SlideSequencesCommand) historyList - .peek()); + appendHistoryItem = ssc.appendSlideCommand( + (SlideSequencesCommand) historyList.peek()); } if (!appendHistoryItem) @@ -1900,7 +1913,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, static StringBuffer copiedSequences; - static Vector copiedHiddenColumns; + static HiddenColumns copiedHiddenColumns; protected void copy_actionPerformed() { @@ -1924,14 +1937,14 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, if (viewport.hasHiddenColumns() && viewport.getSelectionGroup() != null) { - copiedHiddenColumns = new Vector(); int hiddenOffset = viewport.getSelectionGroup().getStartRes(); - for (int[] region : viewport.getAlignment().getHiddenColumns() - .getHiddenRegions()) - { - copiedHiddenColumns.addElement(new int[] { - region[0] - hiddenOffset, region[1] - hiddenOffset }); - } + int hiddenCutoff = viewport.getSelectionGroup().getEndRes(); + + // create new HiddenColumns object with copy of hidden regions + // between startRes and endRes, offset by startRes + copiedHiddenColumns = new HiddenColumns( + viewport.getAlignment().getHiddenColumns(), hiddenOffset, + hiddenCutoff, hiddenOffset); } else { @@ -1978,14 +1991,10 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, endRes += seq.getStart() - 1; } - copiedSequences.append(seq.getName() - + "\t" - + startRes - + "\t" - + endRes - + "\t" - + seq.getSequenceAsString(sg.getStartRes(), - sg.getEndRes() + 1) + "\n"); + copiedSequences.append(seq.getName() + "\t" + startRes + "\t" + endRes + + "\t" + seq.getSequenceAsString(sg.getStartRes(), + sg.getEndRes() + 1) + + "\n"); } } @@ -2004,13 +2013,13 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { try { - if (copiedSequences == null) { return; } - StringTokenizer st = new StringTokenizer(copiedSequences.toString()); + StringTokenizer st = new StringTokenizer(copiedSequences.toString(), + "\t"); Vector seqs = new Vector(); while (st.hasMoreElements()) { @@ -2036,19 +2045,13 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } else { - newtitle = newtitle.concat(MessageManager.formatMessage( - "label.from_msname", new String[] { getTitle() })); + newtitle = newtitle.concat(MessageManager + .formatMessage("label.from_msname", new String[] + { getTitle() })); } AlignFrame af = new AlignFrame(new Alignment(newSeqs), viewport.applet, newtitle, false); - if (copiedHiddenColumns != null) - { - for (int i = 0; i < copiedHiddenColumns.size(); i++) - { - int[] region = (int[]) copiedHiddenColumns.elementAt(i); - af.viewport.hideColumns(region[0], region[1]); - } - } + af.viewport.setHiddenColumns(copiedHiddenColumns); jalview.bin.JalviewLite.addFrame(af, newtitle, frameWidth, frameHeight); @@ -2077,10 +2080,11 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, seqs, 0, viewport.getAlignment().getWidth(), viewport.getAlignment())); - viewport.getRanges().setEndSeq(viewport.getAlignment().getHeight()); + viewport.getRanges().setEndSeq(viewport.getAlignment().getHeight() - 1); // BH + // 2019.04.18 viewport.getAlignment().getWidth(); - viewport.firePropertyChange("alignment", null, viewport.getAlignment() - .getSequences()); + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); } @@ -2112,15 +2116,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, */ if (sg.getSize() == viewport.getAlignment().getHeight()) { - boolean isEntireAlignWidth = (((sg.getEndRes() - sg.getStartRes()) + 1) == viewport - .getAlignment().getWidth()) ? true : false; + boolean isEntireAlignWidth = (((sg.getEndRes() - sg.getStartRes()) + + 1) == viewport.getAlignment().getWidth()) ? true : false; if (isEntireAlignWidth) { String title = MessageManager.getString("label.delete_all"); Panel infoPanel = new Panel(); infoPanel.setLayout(new FlowLayout()); - infoPanel - .add(new Label(MessageManager.getString("warn.delete_all"))); + infoPanel.add( + new Label(MessageManager.getString("warn.delete_all"))); final JVDialog dialog = new JVDialog(this, title, true, 400, 200); dialog.setMainPanel(infoPanel); @@ -2154,8 +2158,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, viewport.setSelectionGroup(null); viewport.getAlignment().deleteGroup(sg); - viewport.firePropertyChange("alignment", null, viewport.getAlignment() - .getSequences()); + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); if (viewport.getAlignment().getHeight() < 1) { @@ -2229,7 +2233,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { PaintRefresher.Refresh(this, viewport.getSequenceSetId()); alignPanel.updateAnnotation(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); } } @@ -2266,7 +2270,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // JAL-2034 - should delegate to // alignPanel to decide if overview needs // updating. - alignPanel.paintAlignment(false); + alignPanel.paintAlignment(false, false); PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId()); viewport.sendSelection(); } @@ -2286,7 +2290,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // JAL-2034 - should delegate to // alignPanel to decide if overview needs // updating. - alignPanel.paintAlignment(false); + alignPanel.paintAlignment(false, false); PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId()); viewport.sendSelection(); } @@ -2306,7 +2310,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, public void invertColSel_actionPerformed() { viewport.invertColumnSelection(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId()); viewport.sendSelection(); } @@ -2332,8 +2336,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI[] seqs; if (viewport.getSelectionGroup() != null) { - seqs = viewport.getSelectionGroup().getSequencesAsArray( - viewport.getHiddenRepSequences()); + seqs = viewport.getSelectionGroup() + .getSequencesAsArray(viewport.getHiddenRepSequences()); } else { @@ -2353,10 +2357,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, column, al); } - statusBar.setText(MessageManager.formatMessage( - "label.removed_columns", - new String[] { Integer.valueOf(trimRegion.getSize()) - .toString() })); + setStatus(MessageManager.formatMessage("label.removed_columns", + new String[] + { Integer.valueOf(trimRegion.getSize()).toString() })); addHistoryItem(trimRegion); for (SequenceGroup sg : al.getGroups()) @@ -2382,8 +2385,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI[] seqs; if (viewport.getSelectionGroup() != null) { - seqs = viewport.getSelectionGroup().getSequencesAsArray( - viewport.getHiddenRepSequences()); + seqs = viewport.getSelectionGroup() + .getSequencesAsArray(viewport.getHiddenRepSequences()); start = viewport.getSelectionGroup().getStartRes(); end = viewport.getSelectionGroup().getEndRes(); } @@ -2398,10 +2401,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, addHistoryItem(removeGapCols); - statusBar.setText(MessageManager.formatMessage( - "label.removed_empty_columns", - new String[] { Integer.valueOf(removeGapCols.getSize()) - .toString() })); + setStatus(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 @@ -2427,8 +2429,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI[] seqs; if (viewport.getSelectionGroup() != null) { - seqs = viewport.getSelectionGroup().getSequencesAsArray( - viewport.getHiddenRepSequences()); + seqs = viewport.getSelectionGroup() + .getSequencesAsArray(viewport.getHiddenRepSequences()); start = viewport.getSelectionGroup().getStartRes(); end = viewport.getSelectionGroup().getEndRes(); } @@ -2442,8 +2444,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI seq = al.getSequenceAt(0); int startRes = seq.findPosition(ranges.getStartRes()); - addHistoryItem(new RemoveGapsCommand("Remove Gaps", seqs, start, end, - al)); + addHistoryItem( + new RemoveGapsCommand("Remove Gaps", seqs, start, end, al)); ranges.setStartRes(seq.findIndex(startRes) - 1); @@ -2477,12 +2479,14 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, if (viewport.getAlignment().getAlignmentAnnotation() != null) { - for (int i = 0; i < viewport.getAlignment().getAlignmentAnnotation().length; i++) + for (int i = 0; i < viewport.getAlignment() + .getAlignmentAnnotation().length; i++) { - if (!viewport.getAlignment().getAlignmentAnnotation()[i].autoCalculated) + if (!viewport.getAlignment() + .getAlignmentAnnotation()[i].autoCalculated) { - newal.addAnnotation(viewport.getAlignment() - .getAlignmentAnnotation()[i]); + newal.addAnnotation( + viewport.getAlignment().getAlignmentAnnotation()[i]); } } } @@ -2499,8 +2503,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, PaintRefresher.Register(newaf.alignPanel.seqPanel.seqCanvas, newaf.alignPanel.av.getSequenceSetId()); - Vector comps = (Vector) PaintRefresher.components.get(viewport - .getSequenceSetId()); + Vector comps = PaintRefresher.components + .get(viewport.getSequenceSetId()); int viewSize = -1; for (int i = 0; i < comps.size(); i++) { @@ -2598,19 +2602,19 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { viewport.setShowJVSuffix(seqLimits.getState()); alignPanel.fontChanged(); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); } protected void colourTextMenuItem_actionPerformed() { viewport.setColourText(colourTextMenuItem.getState()); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } protected void displayNonconservedMenuItem_actionPerformed() { viewport.setShowUnconserved(displayNonconservedMenuItem.getState()); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } protected void wrapMenuItem_actionPerformed() @@ -2620,7 +2624,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, scaleAbove.setEnabled(wrapMenuItem.getState()); scaleLeft.setEnabled(wrapMenuItem.getState()); scaleRight.setEnabled(wrapMenuItem.getState()); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); } public void overviewMenuItem_actionPerformed() @@ -2631,12 +2635,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } Frame frame = new Frame(); - OverviewPanel overview = new OverviewPanel(alignPanel); + final OverviewPanel overview = new OverviewPanel(alignPanel); frame.add(overview); // +50 must allow for applet frame window - jalview.bin.JalviewLite.addFrame(frame, MessageManager.formatMessage( - "label.overview_params", new String[] { this.getTitle() }), - overview.getPreferredSize().width, + jalview.bin.JalviewLite.addFrame(frame, MessageManager + .formatMessage("label.overview_params", new String[] + { this.getTitle() }), overview.getPreferredSize().width, overview.getPreferredSize().height + 50); frame.pack(); @@ -2646,6 +2650,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, @Override public void windowClosing(WindowEvent e) { + overview.dispose(); if (ap != null) { ap.setOverviewPanel(null); @@ -2662,7 +2667,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { viewport.setGlobalColourScheme(cs); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, true); } protected void modifyPID_actionPerformed() @@ -2732,21 +2737,21 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, public void sortPairwiseMenuItem_actionPerformed() { SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray(); - AlignmentSorter.sortByPID(viewport.getAlignment(), viewport - .getAlignment().getSequenceAt(0)); + AlignmentSorter.sortByPID(viewport.getAlignment(), + viewport.getAlignment().getSequenceAt(0)); addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder, viewport.getAlignment())); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); } public void sortIDMenuItem_actionPerformed() { SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray(); AlignmentSorter.sortByID(viewport.getAlignment()); - addHistoryItem(new OrderCommand("ID Sort", oldOrder, - viewport.getAlignment())); - alignPanel.paintAlignment(true); + addHistoryItem( + new OrderCommand("ID Sort", oldOrder, viewport.getAlignment())); + alignPanel.paintAlignment(true, false); } public void sortLengthMenuItem_actionPerformed() @@ -2755,7 +2760,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, AlignmentSorter.sortByLength(viewport.getAlignment()); addHistoryItem(new OrderCommand("Length Sort", oldOrder, viewport.getAlignment())); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); } public void sortGroupMenuItem_actionPerformed() @@ -2764,7 +2769,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, AlignmentSorter.sortByGroup(viewport.getAlignment()); addHistoryItem(new OrderCommand("Group Sort", oldOrder, viewport.getAlignment())); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); } @@ -2794,7 +2799,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI current; int Width = viewport.getAlignment().getWidth(); - for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++) + for (int i = 0; i < viewport.getAlignment().getSequences() + .size(); i++) { current = viewport.getAlignment().getSequenceAt(i); @@ -2803,12 +2809,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, current.insertCharAt(Width - 1, viewport.getGapCharacter()); } } - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } if ((viewport.getSelectionGroup() != null - && viewport.getSelectionGroup().getSize() < 4 && viewport - .getSelectionGroup().getSize() > 0) + && viewport.getSelectionGroup().getSize() < 4 + && viewport.getSelectionGroup().getSize() > 0) || viewport.getAlignment().getHeight() < 4) { return; @@ -2837,15 +2843,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, protected void njTreeBlosumMenuItem_actionPerformed() { - newTreePanel(TreeBuilder.NEIGHBOUR_JOINING, ScoreModels.getInstance() - .getBlosum62().getName(), + newTreePanel(TreeBuilder.NEIGHBOUR_JOINING, + ScoreModels.getInstance().getBlosum62().getName(), "Neighbour joining tree using BLOSUM62"); } protected void avTreeBlosumMenuItem_actionPerformed() { - newTreePanel(TreeBuilder.AVERAGE_DISTANCE, ScoreModels.getInstance() - .getBlosum62().getName(), + newTreePanel(TreeBuilder.AVERAGE_DISTANCE, + ScoreModels.getInstance().getBlosum62().getName(), "Average distance tree using BLOSUM62"); } @@ -2857,7 +2863,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, SequenceI current; int Width = viewport.getAlignment().getWidth(); - for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++) + for (int i = 0; i < viewport.getAlignment().getSequences() + .size(); i++) { current = viewport.getAlignment().getSequenceAt(i); @@ -2866,12 +2873,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, current.insertCharAt(Width - 1, viewport.getGapCharacter()); } } - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } - if ((viewport.getSelectionGroup() != null && viewport - .getSelectionGroup().getSize() > 1) + if ((viewport.getSelectionGroup() != null + && viewport.getSelectionGroup().getSize() > 1) || (viewport.getAlignment().getHeight() > 1)) { final TreePanel tp = new TreePanel(alignPanel, type, pwType); @@ -2912,14 +2919,14 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, public void sortByTree(TreePanel treePanel, String title) { SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray(); - AlignmentSorter - .sortByTree(viewport.getAlignment(), treePanel.getTree()); + AlignmentSorter.sortByTree(viewport.getAlignment(), + treePanel.getTree()); // addHistoryItem(new HistoryItem("Sort", viewport.alignment, // HistoryItem.SORT)); - addHistoryItem(new OrderCommand(MessageManager.formatMessage( - "label.order_by_params", new String[] { title }), oldOrder, - viewport.getAlignment())); - alignPanel.paintAlignment(true); + addHistoryItem(new OrderCommand(MessageManager + .formatMessage("label.order_by_params", new String[] + { title }), oldOrder, viewport.getAlignment())); + alignPanel.paintAlignment(true, false); } /** @@ -2977,7 +2984,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, addHistoryItem(new OrderCommand(undoname, oldOrder, viewport.getAlignment())); } - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(true, false); return true; } @@ -3014,39 +3021,37 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // TODO: update this text for each release or centrally store it for // lite and application g.setFont(new Font("Helvetica", Font.BOLD, 14)); - g.drawString(MessageManager.formatMessage( - "label.jalviewLite_release", new String[] { version }), x, - y += fh); + g.drawString(MessageManager + .formatMessage("label.jalviewLite_release", new String[] + { version }), x, y += fh); g.setFont(new Font("Helvetica", Font.BOLD, 12)); - g.drawString(MessageManager.formatMessage( - "label.jaview_build_date", new String[] { builddate }), x, - y += fh); + g.drawString(MessageManager.formatMessage("label.jaview_build_date", + new String[] + { builddate }), x, y += fh); g.setFont(new Font("Helvetica", Font.PLAIN, 12)); - g.drawString(MessageManager.getString("label.jalview_authors_1"), - x, y += fh * 1.5); + g.drawString(MessageManager.getString("label.jalview_authors_1"), x, + y += fh * 1.5); g.drawString(MessageManager.getString("label.jalview_authors_2"), x + 50, y += fh + 8); - g.drawString( - MessageManager.getString("label.jalview_dev_managers"), x, - y += fh); + g.drawString(MessageManager.getString("label.jalview_dev_managers"), + x, y += fh); g.drawString(MessageManager .getString("label.jalview_distribution_lists"), x, y += fh); g.drawString(MessageManager.getString("label.jalview_please_cite"), x, y += fh + 8); g.drawString( - MessageManager.getString("label.jalview_cite_1_authors"), - x, y += fh); - g.drawString( - MessageManager.getString("label.jalview_cite_1_title"), x, + MessageManager.getString("label.jalview_cite_1_authors"), x, y += fh); + g.drawString(MessageManager.getString("label.jalview_cite_1_title"), + x, y += fh); g.drawString(MessageManager.getString("label.jalview_cite_1_ref"), x, y += fh); } } Frame frame = new Frame(); - frame.add(new AboutPanel(JalviewLite.getVersion(), JalviewLite - .getBuildDate())); + frame.add(new AboutPanel(JalviewLite.getVersion(), + JalviewLite.getBuildDate())); jalview.bin.JalviewLite.addFrame(frame, MessageManager.getString("label.jalview"), 580, 220); @@ -3319,20 +3324,20 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, pasteNew.addActionListener(this); pasteThis.setLabel(MessageManager.getString("label.to_this_alignment")); pasteThis.addActionListener(this); - remove2LeftMenuItem.setLabel(MessageManager - .getString("action.remove_left")); + remove2LeftMenuItem + .setLabel(MessageManager.getString("action.remove_left")); remove2LeftMenuItem.addActionListener(this); - remove2RightMenuItem.setLabel(MessageManager - .getString("action.remove_right")); + remove2RightMenuItem + .setLabel(MessageManager.getString("action.remove_right")); remove2RightMenuItem.addActionListener(this); - removeGappedColumnMenuItem.setLabel(MessageManager - .getString("action.remove_empty_columns")); + removeGappedColumnMenuItem.setLabel( + MessageManager.getString("action.remove_empty_columns")); removeGappedColumnMenuItem.addActionListener(this); - removeAllGapsMenuItem.setLabel(MessageManager - .getString("action.remove_all_gaps")); + removeAllGapsMenuItem + .setLabel(MessageManager.getString("action.remove_all_gaps")); removeAllGapsMenuItem.addActionListener(this); - removeRedundancyMenuItem.setLabel(MessageManager - .getString("action.remove_redundancy")); + removeRedundancyMenuItem + .setLabel(MessageManager.getString("action.remove_redundancy")); removeRedundancyMenuItem.addActionListener(this); /* @@ -3342,25 +3347,25 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, findMenuItem.addActionListener(this); selectAllSequenceMenuItem.addActionListener(this); deselectAllSequenceMenuItem.addActionListener(this); - invertSequenceMenuItem.setLabel(MessageManager - .getString("action.invert_sequence_selection")); + invertSequenceMenuItem.setLabel( + MessageManager.getString("action.invert_sequence_selection")); invertSequenceMenuItem.addActionListener(this); - invertColSel.setLabel(MessageManager - .getString("action.invert_column_selection")); + invertColSel.setLabel( + MessageManager.getString("action.invert_column_selection")); invertColSel.addActionListener(this); - deleteGroups.setLabel(MessageManager - .getString("action.undefine_groups")); + deleteGroups + .setLabel(MessageManager.getString("action.undefine_groups")); deleteGroups.addActionListener(this); - grpsFromSelection.setLabel(MessageManager - .getString("action.make_groups_selection")); + grpsFromSelection.setLabel( + MessageManager.getString("action.make_groups_selection")); grpsFromSelection.addActionListener(this); createGroup.setLabel(MessageManager.getString("action.create_group")); createGroup.addActionListener(this); unGroup.setLabel(MessageManager.getString("action.remove_group")); unGroup.addActionListener(this); - annotationColumnSelection.setLabel(MessageManager - .getString("action.select_by_annotation")); + annotationColumnSelection.setLabel( + MessageManager.getString("action.select_by_annotation")); annotationColumnSelection.addActionListener(this); /* @@ -3374,14 +3379,14 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, Menu hideMenu = new Menu(MessageManager.getString("action.hide")); hideColumns .setLabel(MessageManager.getString("label.selected_columns")); - hideSequences.setLabel(MessageManager - .getString("label.selected_sequences")); - hideAllButSelection.setLabel(MessageManager - .getString("label.all_but_selected_region")); - hideAllSelection.setLabel(MessageManager - .getString("label.selected_region")); - showAllHidden.setLabel(MessageManager - .getString("label.all_sequences_columns")); + hideSequences + .setLabel(MessageManager.getString("label.selected_sequences")); + hideAllButSelection.setLabel( + MessageManager.getString("label.all_but_selected_region")); + hideAllSelection + .setLabel(MessageManager.getString("label.selected_region")); + showAllHidden.setLabel( + MessageManager.getString("label.all_sequences_columns")); showColumns.addActionListener(this); showSeqs.addActionListener(this); hideColumns.addActionListener(this); @@ -3389,39 +3394,39 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, hideAllButSelection.addActionListener(this); hideAllSelection.addActionListener(this); showAllHidden.addActionListener(this); - featureSettings.setLabel(MessageManager - .getString("action.feature_settings")); + featureSettings + .setLabel(MessageManager.getString("action.feature_settings")); featureSettings.addActionListener(this); - sequenceFeatures.setLabel(MessageManager - .getString("label.show_sequence_features")); + sequenceFeatures.setLabel( + MessageManager.getString("label.show_sequence_features")); sequenceFeatures.addItemListener(this); sequenceFeatures.setState(false); - followMouseOverFlag.setLabel(MessageManager - .getString("label.automatic_scrolling")); + followMouseOverFlag.setLabel( + MessageManager.getString("label.automatic_scrolling")); followMouseOverFlag.addItemListener(this); alProperties.addActionListener(this); - overviewMenuItem.setLabel(MessageManager - .getString("label.overview_window")); + overviewMenuItem + .setLabel(MessageManager.getString("label.overview_window")); overviewMenuItem.addActionListener(this); /* * Configure Annotations menu items and actions */ - annotationPanelMenuItem.setLabel(MessageManager - .getString("label.show_annotations")); + annotationPanelMenuItem + .setLabel(MessageManager.getString("label.show_annotations")); annotationPanelMenuItem.addItemListener(this); - showGroupConsensus.setLabel(MessageManager - .getString("label.group_consensus")); - showGroupConservation.setLabel(MessageManager - .getString("label.group_conservation")); - showConsensusHistogram.setLabel(MessageManager - .getString("label.show_consensus_histogram")); - showSequenceLogo.setLabel(MessageManager - .getString("label.show_consensus_logo")); - normSequenceLogo.setLabel(MessageManager - .getString("label.norm_consensus_logo")); - applyAutoAnnotationSettings.setLabel(MessageManager - .getString("label.apply_all_groups")); + showGroupConsensus + .setLabel(MessageManager.getString("label.group_consensus")); + showGroupConservation + .setLabel(MessageManager.getString("label.group_conservation")); + showConsensusHistogram.setLabel( + MessageManager.getString("label.show_consensus_histogram")); + showSequenceLogo.setLabel( + MessageManager.getString("label.show_consensus_logo")); + normSequenceLogo.setLabel( + MessageManager.getString("label.norm_consensus_logo")); + applyAutoAnnotationSettings + .setLabel(MessageManager.getString("label.apply_all_groups")); applyAutoAnnotationSettings.setState(true); Menu autoAnnMenu = new Menu( MessageManager.getString("label.autocalculated_annotation")); @@ -3476,56 +3481,56 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, viewTextMenuItem.setLabel(MessageManager.getString("action.text")); viewTextMenuItem.setState(true); viewTextMenuItem.addItemListener(this); - colourTextMenuItem.setLabel(MessageManager - .getString("label.colour_text")); + colourTextMenuItem + .setLabel(MessageManager.getString("label.colour_text")); colourTextMenuItem.addItemListener(this); - displayNonconservedMenuItem.setLabel(MessageManager - .getString("label.show_non_conserved")); + displayNonconservedMenuItem + .setLabel(MessageManager.getString("label.show_non_conserved")); displayNonconservedMenuItem.addItemListener(this); wrapMenuItem.setLabel(MessageManager.getString("action.wrap")); wrapMenuItem.addItemListener(this); - renderGapsMenuItem.setLabel(MessageManager - .getString("action.show_gaps")); + renderGapsMenuItem + .setLabel(MessageManager.getString("action.show_gaps")); renderGapsMenuItem.setState(true); renderGapsMenuItem.addItemListener(this); - centreColumnLabelFlag.setLabel(MessageManager - .getString("label.centre_column_labels")); + centreColumnLabelFlag.setLabel( + MessageManager.getString("label.centre_column_labels")); centreColumnLabelFlag.addItemListener(this); seqLimits.setState(true); - seqLimits.setLabel(MessageManager - .getString("label.show_sequence_limits")); + seqLimits.setLabel( + MessageManager.getString("label.show_sequence_limits")); seqLimits.addItemListener(this); /* * Configure Colour menu items and actions */ - applyToAllGroups.setLabel(MessageManager - .getString("label.apply_colour_to_all_groups")); + applyToAllGroups.setLabel( + MessageManager.getString("label.apply_colour_to_all_groups")); applyToAllGroups.setState(true); applyToAllGroups.addItemListener(this); - clustalColour.setLabel(MessageManager - .getString("label.colourScheme_clustal")); + clustalColour.setLabel( + MessageManager.getString("label.colourScheme_clustal")); clustalColour.addActionListener(this); - zappoColour.setLabel(MessageManager - .getString("label.colourScheme_zappo")); + zappoColour + .setLabel(MessageManager.getString("label.colourScheme_zappo")); zappoColour.addActionListener(this); - taylorColour.setLabel(MessageManager - .getString("label.colourScheme_taylor")); + taylorColour.setLabel( + MessageManager.getString("label.colourScheme_taylor")); taylorColour.addActionListener(this); - hydrophobicityColour.setLabel(MessageManager - .getString("label.colourScheme_hydrophobic")); + hydrophobicityColour.setLabel( + MessageManager.getString("label.colourScheme_hydrophobic")); hydrophobicityColour.addActionListener(this); - helixColour.setLabel(MessageManager - .getString("label.colourScheme_helix_propensity")); + helixColour.setLabel( + MessageManager.getString("label.colourScheme_helixpropensity")); helixColour.addActionListener(this); strandColour.setLabel(MessageManager - .getString("label.colourScheme_strand_propensity")); + .getString("label.colourScheme_strandpropensity")); strandColour.addActionListener(this); - turnColour.setLabel(MessageManager - .getString("label.colourScheme_turn_propensity")); + turnColour.setLabel( + MessageManager.getString("label.colourScheme_turnpropensity")); turnColour.addActionListener(this); - buriedColour.setLabel(MessageManager - .getString("label.colourScheme_buried_index")); + buriedColour.setLabel( + MessageManager.getString("label.colourScheme_buriedindex")); buriedColour.addActionListener(this); purinePyrimidineColour.setLabel(MessageManager .getString("label.colourScheme_purine/pyrimidine")); @@ -3533,81 +3538,82 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // RNAInteractionColour.setLabel(MessageManager // .getString("label.rna_interaction")); // RNAInteractionColour.addActionListener(this); - RNAHelixColour.setLabel(MessageManager - .getString("label.colourScheme_rna_helices")); + RNAHelixColour.setLabel( + MessageManager.getString("label.colourScheme_rnahelices")); RNAHelixColour.addActionListener(this); - userDefinedColour.setLabel(MessageManager - .getString("action.user_defined")); + userDefinedColour + .setLabel(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(this); - PIDColour.setLabel(MessageManager - .getString("label.colourScheme_%_identity")); + PIDColour.setLabel( + MessageManager.getString("label.colourScheme_%identity")); PIDColour.addActionListener(this); - BLOSUM62Colour.setLabel(MessageManager - .getString("label.colourScheme_blosum62")); + BLOSUM62Colour.setLabel( + MessageManager.getString("label.colourScheme_blosum62")); BLOSUM62Colour.addActionListener(this); - tcoffeeColour.setLabel(MessageManager - .getString("label.colourScheme_t-coffee_scores")); + tcoffeeColour.setLabel( + MessageManager.getString("label.colourScheme_t-coffeescores")); // it will be enabled only if a score file is provided tcoffeeColour.setEnabled(false); tcoffeeColour.addActionListener(this); - conservationMenuItem.setLabel(MessageManager - .getString("action.by_conservation")); + conservationMenuItem + .setLabel(MessageManager.getString("action.by_conservation")); conservationMenuItem.addItemListener(this); noColourmenuItem.setLabel(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(this); - abovePIDThreshold.setLabel(MessageManager - .getString("label.above_identity_threshold")); + abovePIDThreshold.setLabel( + MessageManager.getString("label.above_identity_threshold")); abovePIDThreshold.addItemListener(this); - nucleotideColour.setLabel(MessageManager - .getString("label.colourScheme_nucleotide")); + nucleotideColour.setLabel( + MessageManager.getString("label.colourScheme_nucleotide")); nucleotideColour.addActionListener(this); - modifyPID.setLabel(MessageManager - .getString("label.modify_identity_threshold")); + modifyPID.setLabel( + MessageManager.getString("label.modify_identity_threshold")); modifyPID.setEnabled(abovePIDThreshold.getState()); modifyPID.addActionListener(this); modifyConservation.setLabel(MessageManager .getString("label.modify_conservation_threshold")); modifyConservation.setEnabled(conservationMenuItem.getState()); modifyConservation.addActionListener(this); - annotationColour.setLabel(MessageManager - .getString("action.by_annotation")); + annotationColour + .setLabel(MessageManager.getString("action.by_annotation")); annotationColour.addActionListener(this); /* * Configure Calculate menu items and actions */ - sortPairwiseMenuItem.setLabel(MessageManager - .getString("action.by_pairwise_id")); + sortPairwiseMenuItem + .setLabel(MessageManager.getString("action.by_pairwise_id")); sortPairwiseMenuItem.addActionListener(this); sortIDMenuItem.setLabel(MessageManager.getString("action.by_id")); sortIDMenuItem.addActionListener(this); - sortLengthMenuItem.setLabel(MessageManager - .getString("action.by_length")); + sortLengthMenuItem + .setLabel(MessageManager.getString("action.by_length")); sortLengthMenuItem.addActionListener(this); sortGroupMenuItem.setLabel(MessageManager.getString("action.by_group")); sortGroupMenuItem.addActionListener(this); - pairwiseAlignmentMenuItem.setLabel(MessageManager - .getString("action.pairwise_alignment")); + pairwiseAlignmentMenuItem.setLabel( + MessageManager.getString("action.pairwise_alignment")); pairwiseAlignmentMenuItem.addActionListener(this); - PCAMenuItem.setLabel(MessageManager - .getString("label.principal_component_analysis")); + PCAMenuItem.setLabel( + MessageManager.getString("label.principal_component_analysis")); PCAMenuItem.addActionListener(this); autoCalculate = new CheckboxMenuItem( - MessageManager.getString("label.autocalculate_consensus"), true); - averageDistanceTreeMenuItem.setLabel(MessageManager - .getString("label.average_distance_identity")); + MessageManager.getString("label.autocalculate_consensus"), + true); + averageDistanceTreeMenuItem.setLabel( + MessageManager.getString("label.average_distance_identity")); averageDistanceTreeMenuItem.addActionListener(this); - neighbourTreeMenuItem.setLabel(MessageManager - .getString("label.neighbour_joining_identity")); + neighbourTreeMenuItem.setLabel( + MessageManager.getString("label.neighbour_joining_identity")); neighbourTreeMenuItem.addActionListener(this); - avDistanceTreeBlosumMenuItem.setLabel(MessageManager - .getString("label.average_distance_blosum62")); + avDistanceTreeBlosumMenuItem.setLabel( + MessageManager.getString("label.average_distance_blosum62")); avDistanceTreeBlosumMenuItem.addActionListener(this); - njTreeBlosumMenuItem.setLabel(MessageManager - .getString("label.neighbour_blosum62")); + njTreeBlosumMenuItem + .setLabel(MessageManager.getString("label.neighbour_blosum62")); njTreeBlosumMenuItem.addActionListener(this); - sortByTreeMenu.setLabel(MessageManager - .getString("action.by_tree_order")); + sortByTreeMenu + .setLabel(MessageManager.getString("action.by_tree_order")); Menu sortMenu = new Menu(MessageManager.getString("action.sort")); Menu calculateTreeMenu = new Menu( MessageManager.getString("action.calculate_tree")); @@ -3817,7 +3823,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, */ statusBar.setBackground(Color.white); statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); - statusBar.setText(MessageManager.getString("label.status_bar")); + setStatus(MessageManager.getString("label.status_bar")); this.add(statusBar, BorderLayout.SOUTH); } @@ -3924,9 +3930,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, theApplet.add(embeddedMenu, BorderLayout.NORTH); theApplet.add(statusBar, BorderLayout.SOUTH); // TODO should size be left to the layout manager? - alignPanel.setSize(theApplet.getSize().width, - theApplet.getSize().height - embeddedMenu.getHeight() - - statusBar.getHeight()); + alignPanel.setSize(theApplet.getSize().width, theApplet.getSize().height + - embeddedMenu.getHeight() - statusBar.getHeight()); theApplet.add(alignPanel, BorderLayout.CENTER); final AlignFrame me = this; theApplet.addFocusListener(new FocusListener() @@ -3958,7 +3963,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, * without an additional javascript library to exchange messages between the * distinct applets. See http://issues.jalview.org/browse/JAL-621 * - * @param viewer + * @param jmolViewer * JmolViewer instance * @param sequenceIds * - sequence Ids to search for associations @@ -3972,8 +3977,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, viewer = (Viewer) jmolviewer; } catch (ClassCastException ex) { - System.err.println("Unsupported viewer object :" - + jmolviewer.getClass()); + System.err.println( + "Unsupported viewer object :" + jmolviewer.getClass()); } if (viewer == null) { @@ -4068,8 +4073,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } // resolve data source // TODO: this code should be a refactored to an io package - DataSourceType protocol = AppletFormatAdapter.resolveProtocol( - pdbFile, FileFormat.PDB); + DataSourceType protocol = AppletFormatAdapter.resolveProtocol(pdbFile, + FileFormat.PDB); if (protocol == null) { return false; @@ -4094,8 +4099,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { if (seqs[i] != null) { - sequences.addElement(new Object[] { seqs[i], - (chains != null) ? chains[i] : null }); + sequences + .addElement(new Object[] + { seqs[i], (chains != null) ? chains[i] : null }); } } seqs = new SequenceI[sequences.size()]; @@ -4121,8 +4127,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, chains = (String[]) sqch[1]; if (seqs == null || seqs.length == 0) { - System.err - .println("JalviewLite.AlignFrame:newStructureView: No sequence to bind structure to."); + System.err.println( + "JalviewLite.AlignFrame:newStructureView: No sequence to bind structure to."); } if (protocol == null) { @@ -4145,7 +4151,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { // register the association(s) and quit, don't create any windows. if (StructureSelectionManager.getStructureSelectionManager(applet) - .setMapping(seqs, chains, pdb.getFile(), protocol) == null) + .setMapping(seqs, chains, pdb.getFile(), protocol, + null) == null) { System.err.println("Failed to map " + pdb.getFile() + " (" + protocol + ") to any sequences"); @@ -4169,8 +4176,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, } if (ajm != null) { - System.err - .println("Incremental adding and aligning structure to existing Jmol view not yet implemented."); + System.err.println( + "Incremental adding and aligning structure to existing Jmol view not yet implemented."); // try and add the pdb structure // ajm.addS ajm = null; @@ -4179,14 +4186,13 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, // otherwise, create a new window if (applet.jmolAvailable) { - new AppletJmol(pdb, seqs, chains, alignPanel, - protocol); + new AppletJmol(pdb, seqs, chains, alignPanel, protocol); applet.lastFrameX += 40; applet.lastFrameY += 40; } else { - new MCview.AppletPDBViewer(pdb, seqs, chains, alignPanel, protocol); + new mc_view.AppletPDBViewer(pdb, seqs, chains, alignPanel, protocol); } } @@ -4263,12 +4269,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, */ AlignmentI aln; if ((aln = viewport.getAlignment()) != null - && (aln.getHeight() != file.getHeight() || aln.getWidth() != file - .getWidth())) + && (aln.getHeight() != file.getHeight() + || aln.getWidth() != file.getWidth())) { // TODO: raise a dialog box here rather than bomb out. - System.err - .println("The scores matrix does not match the alignment dimensions"); + System.err.println( + "The scores matrix does not match the alignment dimensions"); } @@ -4334,4 +4340,24 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, return alignPanel.av.featureSettings; } + @Override + public FeatureSettingsControllerI showFeatureSettingsUI() + { + return new FeatureSettings(alignPanel); + } + + private Rectangle fs_bounds = null; + + @Override + public void setFeatureSettingsGeometry(Rectangle bounds) + { + fs_bounds = bounds; + } + + @Override + public Rectangle getFeatureSettingsGeometry() + { + return fs_bounds; + } + }