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 'Jalview-JS/develop' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
index
5240eea
..
25ade21
100644
(file)
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-46,6
+46,8
@@
import javax.swing.JTabbedPane;
import javax.swing.JTextArea;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.JTextArea;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
@@
-99,7
+101,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
super.setVisible(aFlag);
frame.setVisible(aFlag);
{
super.setVisible(aFlag);
frame.setVisible(aFlag);
- };
+ }
JTabbedPane subjobs = null;
JTabbedPane subjobs = null;
@@
-352,11
+354,10
@@
public class WebserviceInfo extends GWebserviceInfo
thread.start();
final WebserviceInfo thisinfo = this;
frame.addInternalFrameListener(
thread.start();
final WebserviceInfo thisinfo = this;
frame.addInternalFrameListener(
- new javax.swing.event.InternalFrameAdapter()
+ new InternalFrameAdapter()
{
@Override
{
@Override
- public void internalFrameClosed(
- javax.swing.event.InternalFrameEvent evt)
+ public void internalFrameClosed(InternalFrameEvent evt)
{
// System.out.println("Shutting down webservice client");
WSClientI service = thisinfo.getthisService();
{
// System.out.println("Shutting down webservice client");
WSClientI service = thisinfo.getthisService();
@@
-364,7
+365,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
service.cancelJob();
}
{
service.cancelJob();
}
- };
+ }
});
frame.validate();
});
frame.validate();
@@
-711,7
+712,7
@@
public class WebserviceInfo extends GWebserviceInfo
* DOCUMENT ME!
*/
@Override
* DOCUMENT ME!
*/
@Override
-protected void cancel_actionPerformed(ActionEvent e)
+ protected void cancel_actionPerformed(ActionEvent e)
{
if (!serviceIsCancellable)
{
{
if (!serviceIsCancellable)
{
@@
-743,7
+744,7
@@
protected void cancel_actionPerformed(ActionEvent e)
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
@Override
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
@Override
- public void run()
+ public void run()
{
JvOptionPane.showInternalMessageDialog(Desktop.desktop, message,
title, JvOptionPane.WARNING_MESSAGE);
{
JvOptionPane.showInternalMessageDialog(Desktop.desktop, message,
title, JvOptionPane.WARNING_MESSAGE);
@@
-848,8
+849,6
@@
protected void cancel_actionPerformed(ActionEvent e)
{
Thread.sleep(25);
{
Thread.sleep(25);
- int units = (int) ((System.currentTimeMillis() - startTime)
- / 5f);
float delta = (System.currentTimeMillis() - startTime) / invSpeed;
angle += delta * factor;
startTime = System.currentTimeMillis();
float delta = (System.currentTimeMillis() - startTime) / invSpeed;
angle += delta * factor;
startTime = System.currentTimeMillis();