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-3244 renamed Platform method for clarity
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
8dd6d0c
..
0ab7515
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,7
+1203,23
@@
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(
@@
-2092,7
+2108,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
- new Integer(++fgroup));
+ Integer.valueOf(++fgroup));
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
@@
-2139,7
+2155,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
- new Integer(++fgroup));
+ Integer.valueOf(++fgroup));
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
@@
-3104,7
+3120,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);
}
@@
-3118,6
+3134,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);
}
@@
-3131,6
+3148,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);
}
@@
-3352,6
+3370,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
* otherwise set the chosen colour scheme (or null for 'None')
*/
ColourSchemeI cs = ColourSchemes.getInstance().getColourScheme(name,
* otherwise set the chosen colour scheme (or null for 'None')
*/
ColourSchemeI cs = ColourSchemes.getInstance().getColourScheme(name,
+ viewport,
viewport.getAlignment(), viewport.getHiddenRepSequences());
changeColour(cs);
}
viewport.getAlignment(), viewport.getHiddenRepSequences());
changeColour(cs);
}
@@
-4488,7
+4507,8
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
int assocfiles = 0;
if (filesmatched.size() > 0)
{
int assocfiles = 0;
if (filesmatched.size() > 0)
{
- boolean autoAssociate = Cache.getDefault("AUTOASSOCIATE_PDBANDSEQS", false);
+ boolean autoAssociate = Cache
+ .getDefault("AUTOASSOCIATE_PDBANDSEQS", false);
if (!autoAssociate)
{
String msg = MessageManager.formatMessage(
if (!autoAssociate)
{
String msg = MessageManager.formatMessage(
@@
-5308,7
+5328,8
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
PaintRefresher.Refresh(this, viewport.getSequenceSetId());
alignPanel.updateAnnotation();
{
PaintRefresher.Refresh(this, viewport.getSequenceSetId());
alignPanel.updateAnnotation();
- alignPanel.paintAlignment(true, true);
+ alignPanel.paintAlignment(true,
+ viewport.needToUpdateStructureViews());
}
}
}
}