X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=598c4afcac5db8f7ff901f0bd54763ec547f0d94;hb=65a4ec4dee935394e57a2af5a9daa2f6ecc4aef3;hp=6696a3a4bc6324c424ac77ce4cfb9647a3bba006;hpb=7daa9e81a5e0c71271c1b135ff47cfa7bd367635;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java old mode 100755 new mode 100644 index 6696a3a..598c4af --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -1,38 +1,54 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.util.*; +import jalview.jbgui.GWebserviceInfo; +import jalview.util.MessageManager; +import jalview.ws.WSClientI; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.MediaTracker; +import java.awt.event.ActionEvent; +import java.awt.image.BufferedImage; +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.HyperlinkEvent.EventType; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.StyleSheet; -import jalview.bin.Cache; -import jalview.jbgui.*; -import jalview.ws.WSClientI; - /** * Base class for web service client thread and gui TODO: create StAX parser to * extract html body content reliably when preparing html formatted job statuses @@ -40,8 +56,8 @@ import jalview.ws.WSClientI; * @author $author$ * @version $Revision$ */ -public class WebserviceInfo extends GWebserviceInfo implements - HyperlinkListener +public class WebserviceInfo extends GWebserviceInfo + implements HyperlinkListener, IProgressIndicator { /** Job is Queued */ @@ -76,6 +92,15 @@ public class WebserviceInfo extends GWebserviceInfo implements JInternalFrame frame; + private IProgressIndicator progressBar; + + @Override + public void setVisible(boolean aFlag) + { + super.setVisible(aFlag); + frame.setVisible(aFlag); + }; + JTabbedPane subjobs = null; java.util.Vector jobPanes = null; @@ -191,7 +216,7 @@ public class WebserviceInfo extends GWebserviceInfo implements // revert to a tabbed pane. JScrollPane firstpane; this.remove(firstpane = (JScrollPane) jobPanes.get(0)); - subjobs = new JTabbedPane(); + subjobs = jalview.jbgui.swing.JTabbedPane.createTabbedPane(); this.add(subjobs, BorderLayout.CENTER); subjobs.add(firstpane); subjobs.setTitleAt(0, firstpane.getName()); @@ -208,10 +233,13 @@ public class WebserviceInfo extends GWebserviceInfo implements * short name and job type * @param info * reference or other human readable description + * @param makeVisible + * true to display the webservices window immediatly (otherwise need + * to call setVisible(true)) */ - public WebserviceInfo(String title, String info) + public WebserviceInfo(String title, String info, boolean makeVisible) { - init(title, info, 520, 500); + init(title, info, 520, 500, makeVisible); } /** @@ -226,9 +254,10 @@ public class WebserviceInfo extends GWebserviceInfo implements * @param height * DOCUMENT ME! */ - public WebserviceInfo(String title, String info, int width, int height) + public WebserviceInfo(String title, String info, int width, int height, + boolean makeVisible) { - init(title, info, width, height); + init(title, info, width, height, makeVisible); } /** @@ -286,17 +315,21 @@ public class WebserviceInfo extends GWebserviceInfo implements * @param height * DOCUMENT ME! */ - void init(String title, String info, int width, int height) + void init(String title, String info, int width, int height, + boolean makeVisible) { frame = new JInternalFrame(); frame.setContentPane(this); - Desktop.addInternalFrame(frame, title, width, height); + Desktop.addInternalFrame(frame, title, makeVisible, width, height); frame.setClosable(false); + progressBar = new ProgressBar(statusPanel, statusBar); + this.title = title; setInfoText(info); - java.net.URL url = getClass().getResource("/images/logo_v2_square.jpg"); + java.net.URL url = getClass() + .getResource("/images/Jalview_Logo_small.png"); image = java.awt.Toolkit.getDefaultToolkit().createImage(url); MediaTracker mt = new MediaTracker(this); @@ -315,19 +348,20 @@ public class WebserviceInfo extends GWebserviceInfo implements Thread thread = new Thread(ap); thread.start(); final WebserviceInfo thisinfo = this; - frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() - { - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) - { - // System.out.println("Shutting down webservice client"); - WSClientI service = thisinfo.getthisService(); - if (service != null && service.isCancellable()) - { - service.cancelJob(); - } - }; - }); + frame.addInternalFrameListener( + new javax.swing.event.InternalFrameAdapter() + { + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) + { + // System.out.println("Shutting down webservice client"); + WSClientI service = thisinfo.getthisService(); + if (service != null && service.isCancellable()) + { + service.cancelJob(); + } + }; + }); frame.validate(); } @@ -353,8 +387,9 @@ public class WebserviceInfo extends GWebserviceInfo implements { if (jobpane < 0 || jobpane >= jobPanes.size()) { - throw new Error("setStatus called for non-existent job pane." - + jobpane); + throw new Error(MessageManager.formatMessage( + "error.setstatus_called_non_existent_job_pane", new String[] + { Integer.valueOf(jobpane).toString() })); } switch (status) { @@ -481,8 +516,8 @@ public class WebserviceInfo extends GWebserviceInfo implements int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("", htmlpos), htmlende = lowertxt - .indexOf(">", htmlend); + int htmlpose = lowertxt.indexOf(">", htmlpos), + htmlende = lowertxt.indexOf(">", htmlend); if (htmlend == -1 && htmlpos == -1) { return text; @@ -529,8 +564,8 @@ public class WebserviceInfo extends GWebserviceInfo implements } if (text.indexOf(" -1) { - System.err.println("HTML COntent: \n" + text - + "<< END HTML CONTENT\n"); + System.err + .println("HTML COntent: \n" + text + "<< END HTML CONTENT\n"); } return text; @@ -552,11 +587,12 @@ public class WebserviceInfo extends GWebserviceInfo implements { String txt = getHtmlFragment( ((JEditorPane) ((JScrollPane) jobPanes.get(which)) - .getViewport().getComponent(0)).getText(), true, - false); + .getViewport().getComponent(0)).getText(), + true, false); ((JEditorPane) ((JScrollPane) jobPanes.get(which)).getViewport() - .getComponent(0)).setText(ensureHtmlTagged(txt - + getHtmlFragment(text, false, true))); + .getComponent(0)) + .setText(ensureHtmlTagged( + txt + getHtmlFragment(text, false, true))); } else { @@ -648,8 +684,10 @@ public class WebserviceInfo extends GWebserviceInfo implements // anyhow - it has to stop threads and clean up // JBPNote : TODO: Instead of a warning, we should have an optional 'Are // you sure?' prompt - warnUser("This job cannot be cancelled.\nJust close the window.", - "Cancel job"); + warnUser( + MessageManager.getString( + "warn.job_cannot_be_cancelled_close_window"), + MessageManager.getString("action.cancel_job")); } else { @@ -671,8 +709,8 @@ public class WebserviceInfo extends GWebserviceInfo implements { public void run() { - JOptionPane.showInternalMessageDialog(Desktop.desktop, message, - title, JOptionPane.WARNING_MESSAGE); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, message, + title, JvOptionPane.WARNING_MESSAGE); } }); @@ -728,7 +766,8 @@ public class WebserviceInfo extends GWebserviceInfo implements { Thread.sleep(50); - int units = (int) ((System.currentTimeMillis() - startTime) / 10f); + int units = (int) ((System.currentTimeMillis() - startTime) + / 10f); angle += units; angle %= 360; startTime = System.currentTimeMillis(); @@ -767,42 +806,62 @@ public class WebserviceInfo extends GWebserviceInfo implements switch (currentStatus) { case STATE_QUEUING: - g.drawString(title.concat(" - queuing"), 60, 30); + g.drawString( + title.concat(" - ").concat( + MessageManager.getString("label.state_queueing")), + 60, 30); break; case STATE_RUNNING: - g.drawString(title.concat(" - running"), 60, 30); + g.drawString( + title.concat(" - ").concat( + MessageManager.getString("label.state_running")), + 60, 30); break; case STATE_STOPPED_OK: - g.drawString(title.concat(" - complete"), 60, 30); + g.drawString( + title.concat(" - ").concat( + MessageManager.getString("label.state_completed")), + 60, 30); break; case STATE_CANCELLED_OK: - g.drawString(title.concat(" - job cancelled!"), 60, 30); + g.drawString( + title.concat(" - ") + .concat(MessageManager + .getString("label.state_job_cancelled")), + 60, 30); break; case STATE_STOPPED_ERROR: - g.drawString(title.concat(" - job error!"), 60, 30); + g.drawString( + title.concat(" - ").concat( + MessageManager.getString("label.state_job_error")), + 60, 30); break; case STATE_STOPPED_SERVERERROR: - g.drawString(title.concat(" - Server Error! (try later)"), 60, 30); + 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); + 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(-Math.toRadians(angle), 10 + x, 10 + y); } } @@ -825,4 +884,32 @@ public class WebserviceInfo extends GWebserviceInfo implements { Desktop.hyperlinkUpdate(e); } + + /* + * (non-Javadoc) + * + * @see jalview.gui.IProgressIndicator#setProgressBar(java.lang.String, long) + */ + @Override + public void setProgressBar(String message, long id) + { + progressBar.setProgressBar(message, id); + } + + @Override + public void registerHandler(final long id, + final IProgressIndicatorHandler handler) + { + progressBar.registerHandler(id, handler); + } + + /** + * + * @return true if any progress bars are still active + */ + @Override + public boolean operationInProgress() + { + return progressBar.operationInProgress(); + } }