X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=7eabfab3f740b73d9de62f8441392617a29e2412;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=f97f80854d2d99829438d612c1a451facf491a62;hpb=fbee8e851a60b04ed79ed0e21d9e5af6ee488c0e;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index f97f808..7eabfab 100644 --- 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.util.Platform; 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.util.Locale; 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.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.StyleSheet; @@ -82,7 +86,7 @@ public class WebserviceInfo extends GWebserviceInfo Image image; - int angle = 0; + float angle = 0f; String title = ""; @@ -99,7 +103,7 @@ public class WebserviceInfo extends GWebserviceInfo { super.setVisible(aFlag); frame.setVisible(aFlag); - }; + } JTabbedPane subjobs = null; @@ -257,6 +261,7 @@ public class WebserviceInfo extends GWebserviceInfo public WebserviceInfo(String title, String info, int width, int height, boolean makeVisible) { + // no references init(title, info, width, height, makeVisible); } @@ -320,7 +325,7 @@ public class WebserviceInfo extends GWebserviceInfo { 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); @@ -328,9 +333,7 @@ public class WebserviceInfo extends GWebserviceInfo 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); @@ -346,16 +349,20 @@ public class WebserviceInfo extends GWebserviceInfo ap.setPreferredSize(new Dimension(60, 60)); titlePanel.add(ap, BorderLayout.WEST); 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( - new javax.swing.event.InternalFrameAdapter() + new InternalFrameAdapter() { @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(); @@ -363,7 +370,7 @@ public class WebserviceInfo extends GWebserviceInfo { service.cancelJob(); } - }; + } }); frame.validate(); @@ -545,7 +552,7 @@ public class WebserviceInfo extends GWebserviceInfo { return null; } - String lowertxt = text.toLowerCase(); + String lowertxt = text.toLowerCase(Locale.ROOT); int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("= STATE_STOPPED_OK) { + park(); angle = 0; } @@ -822,13 +842,42 @@ protected void cancel_actionPerformed(ActionEvent e) cancel.setEnabled(false); } + public void park() + { + startTime = System.currentTimeMillis(); + + while (angle < 360) + { + float invSpeed = 5f; + float factor = 1f; + try + { + Thread.sleep(25); + + float delta = (System.currentTimeMillis() - startTime) / invSpeed; + angle += delta * factor; + startTime = System.currentTimeMillis(); + + if (angle >= 360) + { + angle = 360; + } + + repaint(); + } catch (Exception ex) + { + } + } + + } + void drawPanel() { if (offscreen == null || offscreen.getWidth(this) != getWidth() || offscreen.getHeight(this) != getHeight()) { offscreen = new BufferedImage(getWidth(), getHeight(), - BufferedImage.TYPE_INT_ARGB); + BufferedImage.TYPE_INT_RGB); } Graphics2D g = (Graphics2D) offscreen.getGraphics(); @@ -846,14 +895,14 @@ protected void cancel_actionPerformed(ActionEvent e) if (image != null) { int x = image.getWidth(this) / 2, y = image.getHeight(this) / 2; - g.rotate(Math.toRadians(angle), x, y); + g.rotate(3.14159 / 180 * (angle), x, y); g.drawImage(image, 0, 0, this); - g.rotate(-Math.toRadians(angle), x, y); + g.rotate(-3.14159 / 180 * (angle), x, y); } } @Override - public void paintComponent(Graphics g1) + public void paintComponent(Graphics g1) { drawPanel(); @@ -869,7 +918,7 @@ protected void cancel_actionPerformed(ActionEvent e) } @Override -public void hyperlinkUpdate(HyperlinkEvent e) + public void hyperlinkUpdate(HyperlinkEvent e) { Desktop.hyperlinkUpdate(e); } @@ -884,6 +933,12 @@ public void hyperlinkUpdate(HyperlinkEvent e) { progressBar.setProgressBar(message, id); } + + @Override + public void removeProgressBar(long id) + { + progressBar.removeProgressBar(id); + } @Override public void registerHandler(final long id,