X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=c0e8592d097e2f64cc1147bb49bfc8ddfef11329;hb=96d1dabfb3cf7a879ef9f1b3bfce3d2fe8c46954;hp=2fc08e16d44a6383995c9b08a5ad46a0372cc9db;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index 2fc08e1..c0e8592 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -22,30 +22,35 @@ package jalview.gui; import jalview.jbgui.GWebserviceInfo; import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.util.ChannelProperties; import jalview.ws.WSClientI; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Font; +import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GridLayout; import java.awt.Image; 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; import javax.swing.JEditorPane; import javax.swing.JInternalFrame; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; 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 +87,7 @@ public class WebserviceInfo extends GWebserviceInfo Image image; - int angle = 0; + float angle = 0f; String title = ""; @@ -99,7 +104,7 @@ public class WebserviceInfo extends GWebserviceInfo { super.setVisible(aFlag); frame.setVisible(aFlag); - }; + } JTabbedPane subjobs = null; @@ -257,6 +262,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 +326,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 +334,7 @@ public class WebserviceInfo extends GWebserviceInfo this.title = title; setInfoText(info); - java.net.URL url = getClass() - .getResource("/images/Jalview_Logo_small.png"); - image = java.awt.Toolkit.getDefaultToolkit().createImage(url); + image = ChannelProperties.getImage("rotatable_logo.48"); MediaTracker mt = new MediaTracker(this); mt.addImage(image, 0); @@ -343,16 +347,23 @@ public class WebserviceInfo extends GWebserviceInfo } AnimatedPanel ap = new AnimatedPanel(); - titlePanel.add(ap, BorderLayout.CENTER); + 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() { - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) + @Override + public void internalFrameClosed(InternalFrameEvent evt) { // System.out.println("Shutting down webservice client"); WSClientI service = thisinfo.getthisService(); @@ -360,7 +371,7 @@ public class WebserviceInfo extends GWebserviceInfo { service.cancelJob(); } - }; + } }); frame.validate(); @@ -375,6 +386,36 @@ public class WebserviceInfo extends GWebserviceInfo public void setStatus(int status) { currentStatus = status; + + String message = null; + switch (currentStatus) + { + case STATE_QUEUING: + message = MessageManager.getString("label.state_queueing"); + break; + + case STATE_RUNNING: + message = MessageManager.getString("label.state_running"); + break; + + case STATE_STOPPED_OK: + message = MessageManager.getString("label.state_completed"); + break; + + case STATE_CANCELLED_OK: + message = MessageManager.getString("label.state_job_cancelled"); + break; + + case STATE_STOPPED_ERROR: + message = MessageManager.getString("label.state_job_error"); + break; + + case STATE_STOPPED_SERVERERROR: + message = MessageManager.getString("label.server_error_try_later"); + break; + } + titleText.setText(title + (message == null ? "" : " - " + message)); + titleText.repaint(); } /** @@ -512,7 +553,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; } @@ -786,85 +843,66 @@ public class WebserviceInfo extends GWebserviceInfo 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(); + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, + RenderingHints.VALUE_INTERPOLATION_BICUBIC); + g.setRenderingHint(RenderingHints.KEY_RENDERING, + RenderingHints.VALUE_RENDER_QUALITY); + g.setColor(Color.white); g.fillRect(0, 0, getWidth(), getHeight()); - g.setFont(new Font("Arial", Font.BOLD, 12)); - g.setColor(Color.black); - - switch (currentStatus) - { - case STATE_QUEUING: - g.drawString( - title.concat(" - ").concat( - MessageManager.getString("label.state_queueing")), - 60, 30); - - break; - - case STATE_RUNNING: - g.drawString( - title.concat(" - ").concat( - MessageManager.getString("label.state_running")), - 60, 30); - - break; - - case STATE_STOPPED_OK: - g.drawString( - title.concat(" - ").concat( - MessageManager.getString("label.state_completed")), - 60, 30); - - break; - - case STATE_CANCELLED_OK: - g.drawString( - title.concat(" - ") - .concat(MessageManager - .getString("label.state_job_cancelled")), - 60, 30); - - break; - - case STATE_STOPPED_ERROR: - g.drawString( - title.concat(" - ").concat( - MessageManager.getString("label.state_job_error")), - 60, 30); - - break; - - case STATE_STOPPED_SERVERERROR: - g.drawString( - title.concat(" - ") - .concat(MessageManager - .getString("label.server_error_try_later")), - 60, 30); - - break; - } - if (image != null) { int x = image.getWidth(this) / 2, y = image.getHeight(this) / 2; - g.rotate(Math.toRadians(angle), 10 + x, 10 + y); - g.drawImage(image, 10, 10, this); - g.rotate(-Math.toRadians(angle), 10 + x, 10 + y); + g.rotate(3.14159 / 180 * (angle), x, y); + g.drawImage(image, 0, 0, this); + g.rotate(-3.14159 / 180 * (angle), x, y); } } + @Override public void paintComponent(Graphics g1) { drawPanel(); @@ -880,6 +918,7 @@ public class WebserviceInfo extends GWebserviceInfo renderAsHtml = b; } + @Override public void hyperlinkUpdate(HyperlinkEvent e) { Desktop.hyperlinkUpdate(e); @@ -895,6 +934,18 @@ public class WebserviceInfo extends GWebserviceInfo { progressBar.setProgressBar(message, id); } + + @Override + public void addProgressBar(long id, String message) + { + progressBar.addProgressBar(id, message); + } + + @Override + public void removeProgressBar(long id) + { + progressBar.removeProgressBar(id); + } @Override public void registerHandler(final long id,