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-1988 Some TEST code accidentally left in now removed -- was affecting some saved...
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
adc8a15
..
f3a8ab5
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-974,7
+974,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void setStatus(String text)
{
@Override
public void setStatus(String text)
{
- statusBar.setText(text);
+ statusBar.setText(text == null || text.isEmpty() ? " " : text);
}
/*
}
/*
@@
-1203,23
+1203,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
PrintWriter out = new PrintWriter(
new FileWriter(backupfiles.getTempFilePath()));
PrintWriter out = new PrintWriter(
new FileWriter(backupfiles.getTempFilePath()));
- // TESTING code here
- boolean TESTING = true;
- if (TESTING)
- {
- out.print("; TESTSTART\n");
- int count = 20;
- for (int i = 0; i < count; i++)
- {
- // Thread.sleep(1000);
- out.println("; TEST: " + (count - 1 - i));
- }
- }
out.print(output);
out.print(output);
- if (TESTING)
- {
- out.print("; TESTEND\n");
- }
out.close();
this.setTitle(file);
statusBar.setText(MessageManager.formatMessage(
out.close();
this.setTitle(file);
statusBar.setText(MessageManager.formatMessage(
@@
-3120,7
+3104,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
protected void scaleAbove_actionPerformed(ActionEvent e)
{
viewport.setScaleAboveWrapped(scaleAbove.isSelected());
protected void scaleAbove_actionPerformed(ActionEvent e)
{
viewport.setScaleAboveWrapped(scaleAbove.isSelected());
- // TODO: do we actually need to update overview for scale above change ?
+ alignPanel.updateLayout();
alignPanel.paintAlignment(true, false);
}
alignPanel.paintAlignment(true, false);
}
@@
-3134,6
+3118,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
protected void scaleLeft_actionPerformed(ActionEvent e)
{
viewport.setScaleLeftWrapped(scaleLeft.isSelected());
protected void scaleLeft_actionPerformed(ActionEvent e)
{
viewport.setScaleLeftWrapped(scaleLeft.isSelected());
+ alignPanel.updateLayout();
alignPanel.paintAlignment(true, false);
}
alignPanel.paintAlignment(true, false);
}
@@
-3147,6
+3132,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
protected void scaleRight_actionPerformed(ActionEvent e)
{
viewport.setScaleRightWrapped(scaleRight.isSelected());
protected void scaleRight_actionPerformed(ActionEvent e)
{
viewport.setScaleRightWrapped(scaleRight.isSelected());
+ alignPanel.updateLayout();
alignPanel.paintAlignment(true, false);
}
alignPanel.paintAlignment(true, false);
}