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
Merge branch 'Release_2_8_0b1_Branch' into try_r20b1_merge
[jalview.git]
/
src
/
jalview
/
gui
/
PCAPanel.java
diff --git
a/src/jalview/gui/PCAPanel.java
b/src/jalview/gui/PCAPanel.java
old mode 100755
(executable)
new mode 100644
(file)
index
e59005f
..
538b245
--- a/
src/jalview/gui/PCAPanel.java
+++ b/
src/jalview/gui/PCAPanel.java
@@
-27,6
+27,7
@@
import javax.swing.*;
import jalview.datamodel.*;
import jalview.jbgui.*;
import jalview.datamodel.*;
import jalview.jbgui.*;
+import jalview.util.MessageManager;
import jalview.viewmodel.PCAModel;
/**
import jalview.viewmodel.PCAModel;
/**
@@
-625,7
+626,7
@@
public class PCAPanel extends GPCAPanel implements Runnable,
final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
if (handler.canCancel())
{
final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
if (handler.canCancel())
{
- JButton cancel = new JButton("Cancel");
+ JButton cancel = new JButton(MessageManager.getString("action.cancel"));
final IProgressIndicator us = this;
cancel.addActionListener(new ActionListener()
{
final IProgressIndicator us = this;
cancel.addActionListener(new ActionListener()
{