X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=112d502d9abb2335cbece27b241f1229f947cf74;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=d328a0d14388614b3b5d8680e936761354c50330;hpb=3516fc4a1037ffc86d51f900850ed7a04a0174cb;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index d328a0d..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; @@ -138,7 +139,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer // 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()); @@ -274,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 { @@ -301,8 +299,8 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer af.getViewport().setShowSequenceFeatures(showSeqFeatures); af.getViewport().setFeaturesDisplayed(fd); af.setMenusForViewport(); - ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme( - colourSchemeName, al); + ColourSchemeI cs = ColourSchemeMapper + .getJalviewColourScheme(colourSchemeName, al); if (cs != null) { af.changeColour(cs); @@ -329,8 +327,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer try { - af.setMaximum( - jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); + af.setMaximum(Cache.getDefault("SHOW_FULLSCREEN", false)); } catch (Exception ex) { }