git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3cd59a7
)
JAL-3026 alignmentFrame.statusBar.setText -> .setStatus
author
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Mon, 27 Aug 2018 16:09:53 +0000
(11:09 -0500)
committer
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Mon, 27 Aug 2018 16:09:53 +0000
(11:09 -0500)
src/jalview/appletgui/AlignFrame.java
patch
|
blob
|
history
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
src/jalview/gui/AlignViewport.java
patch
|
blob
|
history
src/jalview/gui/AnnotationPanel.java
patch
|
blob
|
history
src/jalview/gui/CutAndPasteTransfer.java
patch
|
blob
|
history
src/jalview/gui/SeqPanel.java
patch
|
blob
|
history
src/jalview/gui/SequenceFetcher.java
patch
|
blob
|
history
src/jalview/io/FileLoader.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/AlignFrame.java
b/src/jalview/appletgui/AlignFrame.java
index
8740f51
..
6a90bb5
100644
(file)
--- a/
src/jalview/appletgui/AlignFrame.java
+++ b/
src/jalview/appletgui/AlignFrame.java
@@
-416,7
+416,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
viewport.featureSettings.refreshTable();
}
alignPanel.paintAlignment(true, true);
viewport.featureSettings.refreshTable();
}
alignPanel.paintAlignment(true, true);
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.getString("label.successfully_added_features_alignment"));
}
return featuresFile;
.getString("label.successfully_added_features_alignment"));
}
return featuresFile;
@@
-574,7
+574,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
@@
-2349,7
+2349,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
column, al);
}
column, al);
}
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
addHistoryItem(trimRegion);
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
addHistoryItem(trimRegion);
@@
-2393,7
+2393,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
addHistoryItem(removeGapCols);
addHistoryItem(removeGapCols);
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_empty_columns", new String[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
.formatMessage("label.removed_empty_columns", new String[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
@@
-3815,7
+3815,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
*/
statusBar.setBackground(Color.white);
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
*/
statusBar.setBackground(Color.white);
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
- statusBar.setText(MessageManager.getString("label.status_bar"));
+ setStatus(MessageManager.getString("label.status_bar"));
this.add(statusBar, BorderLayout.SOUTH);
}
this.add(statusBar, BorderLayout.SOUTH);
}
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
3db81f1
..
01464fd
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-675,7
+675,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
@@
-1204,7
+1204,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
else
{
else
{
- statusBar.setText(MessageManager.formatMessage(
+ setStatus(MessageManager.formatMessage(
"label.successfully_saved_to_file_in_format", new Object[]
{ lastFilenameSaved, lastFormatSaved }));
"label.successfully_saved_to_file_in_format", new Object[]
{ lastFilenameSaved, lastFormatSaved }));
@@
-1275,7
+1275,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
out.print(output);
out.close();
AlignFrame.this.setTitle(file);
out.print(output);
out.close();
AlignFrame.this.setTitle(file);
- statusBar.setText(MessageManager.formatMessage(
+ setStatus(MessageManager.formatMessage(
"label.successfully_saved_to_file_in_format",
new Object[]
{ fileName, format.getName() }));
"label.successfully_saved_to_file_in_format",
new Object[]
{ fileName, format.getName() }));
@@
-1938,7
+1938,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
Desktop.jalviewClipboard = new Object[] { seqs,
viewport.getAlignment().getDataset(), hiddenColumns };
Desktop.jalviewClipboard = new Object[] { seqs,
viewport.getAlignment().getDataset(), hiddenColumns };
- statusBar.setText(MessageManager.formatMessage(
+ setStatus(MessageManager.formatMessage(
"label.copied_sequences_to_clipboard", new Object[]
{ Integer.valueOf(seqs.length).toString() }));
}
"label.copied_sequences_to_clipboard", new Object[]
{ Integer.valueOf(seqs.length).toString() }));
}
@@
-2603,7
+2603,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
column, viewport.getAlignment());
}
column, viewport.getAlignment());
}
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
@@
-2653,7
+2653,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
addHistoryItem(removeGapCols);
addHistoryItem(removeGapCols);
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_empty_columns", new Object[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
.formatMessage("label.removed_empty_columns", new Object[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
@@
-4689,7
+4689,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
changeColour(
new TCoffeeColourScheme(viewport.getAlignment()));
isAnnotation = true;
changeColour(
new TCoffeeColourScheme(viewport.getAlignment()));
isAnnotation = true;
- statusBar.setText(MessageManager.getString(
+ setStatus(MessageManager.getString(
"label.successfully_pasted_tcoffee_scores_to_alignment"));
}
else
"label.successfully_pasted_tcoffee_scores_to_alignment"));
}
else
@@
-4732,7
+4732,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
new FileParse(file, sourceType));
sm.parse();
// todo: i18n this message
new FileParse(file, sourceType));
sm.parse();
// todo: i18n this message
- statusBar.setText(MessageManager.formatMessage(
+ setStatus(MessageManager.formatMessage(
"label.successfully_loaded_matrix",
sm.getMatrixName()));
}
"label.successfully_loaded_matrix",
sm.getMatrixName()));
}
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
35a0cd3
..
b357734
100644
(file)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-819,7
+819,7
@@
public class AlignViewport extends AlignmentViewport
AlignFrame newAlignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
newAlignFrame.setTitle(title);
AlignFrame newAlignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
newAlignFrame.setTitle(title);
- newAlignFrame.statusBar.setText(MessageManager
+ newAlignFrame.setStatus(MessageManager
.formatMessage("label.successfully_loaded_file", new Object[]
{ title }));
.formatMessage("label.successfully_loaded_file", new Object[]
{ title }));
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
5c46d95
..
b6967df
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-808,7
+808,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
else
{
this.setToolTipText(null);
else
{
this.setToolTipText(null);
- ap.alignFrame.statusBar.setText(" ");
+ ap.alignFrame.setStatus(" ");
}
}
}
}
@@
-927,7
+927,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
}
}
}
- ap.alignFrame.statusBar.setText(text.toString());
+ ap.alignFrame.setStatus(text.toString());
}
/**
}
/**
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
142dd75
..
d328a0d
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-324,7
+324,7
@@
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
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
1d943f0
..
5eb97e0
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-1025,7
+1025,7
@@
public class SeqPanel extends JPanel
text.append(" (").append(Integer.toString(residuePos)).append(")");
}
text.append(" (").append(Integer.toString(residuePos)).append(")");
}
- ap.alignFrame.statusBar.setText(text.toString());
+ ap.alignFrame.setStatus(text.toString());
}
/**
}
/**
@@
-1252,7
+1252,7
@@
public class SeqPanel extends JPanel
}
message.append(Math.abs(startres - lastres) + " gaps.");
}
message.append(Math.abs(startres - lastres) + " gaps.");
- ap.alignFrame.statusBar.setText(message.toString());
+ ap.alignFrame.setStatus(message.toString());
// Are we editing within a selection group?
if (groupEditing || (sg != null
// Are we editing within a selection group?
if (groupEditing || (sg != null
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
7603242
..
118d877
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-1036,7
+1036,7
@@
public class SequenceFetcher extends JPanel implements Runnable
Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
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
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
4b2f797
..
dcfdd22
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-473,7
+473,7
@@
public class FileLoader implements Runnable
alignFrame.getViewport()
.applyFeaturesStyle(proxyColourScheme);
}
alignFrame.getViewport()
.applyFeaturesStyle(proxyColourScheme);
}
- alignFrame.statusBar.setText(MessageManager.formatMessage(
+ alignFrame.setStatus(MessageManager.formatMessage(
"label.successfully_loaded_file", new String[]
{ title }));
"label.successfully_loaded_file", new String[]
{ title }));