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 commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
index
5240eea
..
7eabfab
100644
(file)
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-22,6
+22,7
@@
package jalview.gui;
import jalview.jbgui.GWebserviceInfo;
import jalview.util.MessageManager;
import jalview.jbgui.GWebserviceInfo;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.ws.WSClientI;
import java.awt.BorderLayout;
import jalview.ws.WSClientI;
import java.awt.BorderLayout;
@@
-35,6
+36,7
@@
import java.awt.MediaTracker;
import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
+import java.util.Locale;
import java.util.Vector;
import javax.swing.JComponent;
import java.util.Vector;
import javax.swing.JComponent;
@@
-46,6
+48,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
+103,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
super.setVisible(aFlag);
frame.setVisible(aFlag);
{
super.setVisible(aFlag);
frame.setVisible(aFlag);
- };
+ }
JTabbedPane subjobs = null;
JTabbedPane subjobs = null;
@@
-257,6
+261,7
@@
public class WebserviceInfo extends GWebserviceInfo
public WebserviceInfo(String title, String info, int width, int height,
boolean makeVisible)
{
public WebserviceInfo(String title, String info, int width, int height,
boolean makeVisible)
{
+ // no references
init(title, info, width, height, makeVisible);
}
init(title, info, width, height, makeVisible);
}
@@
-320,7
+325,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
frame = new JInternalFrame();
frame.setContentPane(this);
{
frame = new JInternalFrame();
frame.setContentPane(this);
- Desktop.addInternalFrame(frame, title, makeVisible, width, height);
+ Desktop.addInternalFrame(frame, title, makeVisible, width, height, Desktop.FRAME_ALLOW_RESIZE, Desktop.FRAME_SET_MIN_SIZE_300);
frame.setClosable(false);
progressBar = new ProgressBar(statusPanel, statusBar);
frame.setClosable(false);
progressBar = new ProgressBar(statusPanel, statusBar);
@@
-328,9
+333,7
@@
public class WebserviceInfo extends GWebserviceInfo
this.title = title;
setInfoText(info);
this.title = title;
setInfoText(info);
- java.net.URL url = getClass()
- .getResource("/images/Jalview_Logo_small_with_border.png");
- image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+ image = ChannelProperties.getImage("rotatable_logo.48");
MediaTracker mt = new MediaTracker(this);
mt.addImage(image, 0);
MediaTracker mt = new MediaTracker(this);
mt.addImage(image, 0);
@@
-348,15
+351,18
@@
public class WebserviceInfo extends GWebserviceInfo
titlePanel.add(titleText, BorderLayout.CENTER);
setStatus(currentStatus);
titlePanel.add(titleText, BorderLayout.CENTER);
setStatus(currentStatus);
- Thread thread = new Thread(ap);
- thread.start();
+ if (!Platform.isJS())
+ {
+ // No animation for the moment//
+ Thread thread = new Thread(ap);
+ thread.start();
+ }
final WebserviceInfo thisinfo = this;
frame.addInternalFrameListener(
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
+370,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
service.cancelJob();
}
{
service.cancelJob();
}
- };
+ }
});
frame.validate();
});
frame.validate();
@@
-546,7
+552,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
return null;
}
{
return null;
}
- String lowertxt = text.toLowerCase();
+ String lowertxt = text.toLowerCase(Locale.ROOT);
int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("<body");
int htmlend = leaveLast ? -1 : lowertxt.indexOf("</body");
int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("<body");
int htmlend = leaveLast ? -1 : lowertxt.indexOf("</body");
@@
-575,7
+581,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
return "";
}
{
return "";
}
- String lowertxt = text.toLowerCase();
+ String lowertxt = text.toLowerCase(Locale.ROOT);
int htmlpos = lowertxt.indexOf("<body");
int htmlend = lowertxt.indexOf("</body");
int doctype = lowertxt.indexOf("<!doctype");
int htmlpos = lowertxt.indexOf("<body");
int htmlend = lowertxt.indexOf("</body");
int doctype = lowertxt.indexOf("<!doctype");
@@
-711,7
+717,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,9
+749,9
@@
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,
+ JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), message,
title, JvOptionPane.WARNING_MESSAGE);
}
title, JvOptionPane.WARNING_MESSAGE);
}
@@
-848,8
+854,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();
@@
-898,7
+902,7
@@
protected void cancel_actionPerformed(ActionEvent e)
}
@Override
}
@Override
- public void paintComponent(Graphics g1)
+ public void paintComponent(Graphics g1)
{
drawPanel();
{
drawPanel();
@@
-914,7
+918,7
@@
protected void cancel_actionPerformed(ActionEvent e)
}
@Override
}
@Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+ public void hyperlinkUpdate(HyperlinkEvent e)
{
Desktop.hyperlinkUpdate(e);
}
{
Desktop.hyperlinkUpdate(e);
}
@@
-929,6
+933,12
@@
public void hyperlinkUpdate(HyperlinkEvent e)
{
progressBar.setProgressBar(message, id);
}
{
progressBar.setProgressBar(message, id);
}
+
+ @Override
+ public void removeProgressBar(long id)
+ {
+ progressBar.removeProgressBar(id);
+ }
@Override
public void registerHandler(final long id,
@Override
public void registerHandler(final long id,