git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-360 JAL-3975 update parent for text colour dialog - doesn't seem to help but...
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
2a96daf
..
112d502
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-20,6
+20,7
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import jalview.bin.Cache;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.ComplexAlignFile;
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)
{
@Override
public void save_actionPerformed(ActionEvent e)
{
+ // TODO: JAL-3048 JalviewFileChooser - Save option
+
JalviewFileChooser chooser = new JalviewFileChooser(
JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+ Cache.getProperty("LAST_DIRECTORY"));
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
@@
-272,11
+275,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
*/
if (viewport != null && viewport.getAlignment() != null)
{
*/
if (viewport != null && viewport.getAlignment() != null)
{
- if (proxyColourScheme != null)
- {
- viewport.applyFeaturesStyle(proxyColourScheme);
- }
((AlignViewport) viewport).addAlignment(al, title);
((AlignViewport) viewport).addAlignment(al, title);
+ viewport.applyFeaturesStyle(proxyColourScheme);
}
else
{
}
else
{
@@
-299,8
+299,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
af.getViewport().setFeaturesDisplayed(fd);
af.setMenusForViewport();
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);
if (cs != null)
{
af.changeColour(cs);
@@
-322,13
+322,12
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
af.currentFileFormat = format;
Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
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
{
.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)
{
}
} catch (Exception ex)
{
}