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-4366 allow a 3di alignment to be loaded and shown as a split frame with existing...
[jalview.git]
/
src
/
jalview
/
gui
/
ProgressBar.java
diff --git
a/src/jalview/gui/ProgressBar.java
b/src/jalview/gui/ProgressBar.java
index
d7b04ee
..
d68d95f
100644
(file)
--- a/
src/jalview/gui/ProgressBar.java
+++ b/
src/jalview/gui/ProgressBar.java
@@
-126,9
+126,7
@@
public class ProgressBar implements IProgressIndicator
@Override
public void run()
{
@Override
public void run()
{
- final Long longId = Long.valueOf(id);
-
- JPanel progressPanel = progressBars.get(longId);
+ JPanel progressPanel = progressBars.get(id);
if (progressPanel != null)
{
/*
if (progressPanel != null)
{
/*
@@
-139,9
+137,9
@@
public class ProgressBar implements IProgressIndicator
{
statusBar.setText(message);
}
{
statusBar.setText(message);
}
- if (progressBarHandlers.containsKey(longId))
+ if (progressBarHandlers.containsKey(id))
{
{
- progressBarHandlers.remove(longId);
+ progressBarHandlers.remove(id);
}
removeRow(progressPanel);
}
}
removeRow(progressPanel);
}
@@
-160,7
+158,7
@@
public class ProgressBar implements IProgressIndicator
addRow(progressPanel);
addRow(progressPanel);
- progressBars.put(longId, progressPanel);
+ progressBars.put(id, progressPanel);
}
refreshLayout();
}
refreshLayout();
@@
-230,11
+228,10
@@
public class ProgressBar implements IProgressIndicator
@Override
public void run()
{
@Override
public void run()
{
- Long longId = Long.valueOf(id);
- final JPanel progressPanel = progressBars.get(longId);
+ final JPanel progressPanel = progressBars.get(id);
if (progressPanel == null)
{
if (progressPanel == null)
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"call setProgressBar before registering the progress bar's handler.");
return;
}
"call setProgressBar before registering the progress bar's handler.");
return;
}
@@
-247,7
+244,7
@@
public class ProgressBar implements IProgressIndicator
return;
}
return;
}
- progressBarHandlers.put(longId, handler);
+ progressBarHandlers.put(id, handler);
JButton cancel = new JButton(
MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
JButton cancel = new JButton(
MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()