X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=112d502d9abb2335cbece27b241f1229f947cf74;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=7b8ade66b621da54b43a9ba2756f47ebd214b59d;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index 7b8ade6..112d502 100644 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.bin.Cache; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; import jalview.api.ComplexAlignFile; @@ -135,8 +136,10 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer @Override public void save_actionPerformed(ActionEvent e) { + // TODO: JAL-3048 JalviewFileChooser - Save option + JalviewFileChooser chooser = new JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY")); + Cache.getProperty("LAST_DIRECTORY")); chooser.setAcceptAllFileFilterUsed(false); chooser.setFileView(new JalviewFileView()); @@ -272,11 +275,8 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer */ if (viewport != null && viewport.getAlignment() != null) { - if (proxyColourScheme != null) - { - viewport.applyFeaturesStyle(proxyColourScheme); - } ((AlignViewport) viewport).addAlignment(al, title); + viewport.applyFeaturesStyle(proxyColourScheme); } else { @@ -298,6 +298,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); af.getViewport().setShowSequenceFeatures(showSeqFeatures); af.getViewport().setFeaturesDisplayed(fd); + af.setMenusForViewport(); ColourSchemeI cs = ColourSchemeMapper .getJalviewColourScheme(colourSchemeName, al); if (cs != null) @@ -321,13 +322,12 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer af.currentFileFormat = format; Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - af.statusBar.setText(MessageManager + af.setStatus(MessageManager .getString("label.successfully_pasted_alignment_file")); try { - af.setMaximum( - jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); + af.setMaximum(Cache.getDefault("SHOW_FULLSCREEN", false)); } catch (Exception ex) { }