X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=2fc08e16d44a6383995c9b08a5ad46a0372cc9db;hb=90ae01c1c1504e0ae42817f78116f1d35b317c47;hp=aaaca20f0cd7979a4130309e44db78ff244d9317;hpb=9702a30021c1387018378b61948b639358213942;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index aaaca20..2fc08e1 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -33,19 +33,14 @@ import java.awt.GridLayout; import java.awt.Image; import java.awt.MediaTracker; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.image.BufferedImage; -import java.util.Hashtable; import java.util.Vector; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JEditorPane; import javax.swing.JInternalFrame; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JProgressBar; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextArea; @@ -61,8 +56,8 @@ import javax.swing.text.html.StyleSheet; * @author $author$ * @version $Revision$ */ -public class WebserviceInfo extends GWebserviceInfo implements - HyperlinkListener, IProgressIndicator +public class WebserviceInfo extends GWebserviceInfo + implements HyperlinkListener, IProgressIndicator { /** Job is Queued */ @@ -97,6 +92,8 @@ public class WebserviceInfo extends GWebserviceInfo implements JInternalFrame frame; + private IProgressIndicator progressBar; + @Override public void setVisible(boolean aFlag) { @@ -236,6 +233,9 @@ 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, boolean makeVisible) { @@ -323,11 +323,13 @@ public class WebserviceInfo extends GWebserviceInfo implements 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/Jalview_Logo_small.png"); + java.net.URL url = getClass() + .getResource("/images/Jalview_Logo_small.png"); image = java.awt.Toolkit.getDefaultToolkit().createImage(url); MediaTracker mt = new MediaTracker(this); @@ -346,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(); } @@ -384,7 +387,9 @@ public class WebserviceInfo extends GWebserviceInfo implements { if (jobpane < 0 || jobpane >= jobPanes.size()) { - throw new Error(MessageManager.formatMessage("error.setstatus_called_non_existent_job_pane", new String[]{Integer.valueOf(jobpane).toString()})); + throw new Error(MessageManager.formatMessage( + "error.setstatus_called_non_existent_job_pane", new String[] + { Integer.valueOf(jobpane).toString() })); } switch (status) { @@ -511,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; @@ -559,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; @@ -582,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 { @@ -678,7 +684,9 @@ 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(MessageManager.getString("warn.job_cannot_be_cancelled_close_window"), + warnUser( + MessageManager.getString( + "warn.job_cannot_be_cancelled_close_window"), MessageManager.getString("action.cancel_job")); } else @@ -701,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); } }); @@ -758,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(); @@ -822,8 +831,8 @@ public class WebserviceInfo extends GWebserviceInfo implements case STATE_CANCELLED_OK: g.drawString( - title.concat(" - ").concat( - MessageManager + title.concat(" - ") + .concat(MessageManager .getString("label.state_job_cancelled")), 60, 30); @@ -839,8 +848,8 @@ public class WebserviceInfo extends GWebserviceInfo implements case STATE_STOPPED_SERVERERROR: g.drawString( - title.concat(" - ").concat( - MessageManager + title.concat(" - ") + .concat(MessageManager .getString("label.server_error_try_later")), 60, 30); @@ -876,10 +885,6 @@ public class WebserviceInfo extends GWebserviceInfo implements Desktop.hyperlinkUpdate(e); } - // methods for implementing IProgressIndicator - // need to refactor to a reusable stub class - Hashtable progressBars, progressBarHandlers; - /* * (non-Javadoc) * @@ -888,78 +893,14 @@ public class WebserviceInfo extends GWebserviceInfo implements @Override public void setProgressBar(String message, long id) { - if (progressBars == null) - { - progressBars = new Hashtable(); - progressBarHandlers = new Hashtable(); - } - - JPanel progressPanel; - Long lId = new Long(id); - GridLayout layout = (GridLayout) statusPanel.getLayout(); - if (progressBars.get(lId) != null) - { - progressPanel = (JPanel) progressBars.get(new Long(id)); - statusPanel.remove(progressPanel); - progressBars.remove(lId); - progressPanel = null; - if (message != null) - { - statusBar.setText(message); - } - if (progressBarHandlers.contains(lId)) - { - progressBarHandlers.remove(lId); - } - layout.setRows(layout.getRows() - 1); - } - else - { - progressPanel = new JPanel(new BorderLayout(10, 5)); - - JProgressBar progressBar = new JProgressBar(); - progressBar.setIndeterminate(true); - - progressPanel.add(new JLabel(message), BorderLayout.WEST); - progressPanel.add(progressBar, BorderLayout.CENTER); - - layout.setRows(layout.getRows() + 1); - statusPanel.add(progressPanel); - - progressBars.put(lId, progressPanel); - } - // update GUI - // setMenusForViewport(); - validate(); + progressBar.setProgressBar(message, id); } @Override public void registerHandler(final long id, final IProgressIndicatorHandler handler) { - if (progressBarHandlers == null || !progressBars.contains(new Long(id))) - { - throw new Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler")); - } - progressBarHandlers.put(new Long(id), handler); - final JPanel progressPanel = (JPanel) progressBars.get(new Long(id)); - if (handler.canCancel()) - { - JButton cancel = new JButton( - MessageManager.getString("action.cancel")); - final IProgressIndicator us = this; - cancel.addActionListener(new ActionListener() - { - - @Override - public void actionPerformed(ActionEvent e) - { - handler.cancelActivity(id); - us.setProgressBar(MessageManager.formatMessage("label.cancelled_params", new String[]{((JLabel) progressPanel.getComponent(0)).getText()}), id); - } - }); - progressPanel.add(cancel, BorderLayout.EAST); - } + progressBar.registerHandler(id, handler); } /** @@ -969,10 +910,6 @@ public class WebserviceInfo extends GWebserviceInfo implements @Override public boolean operationInProgress() { - if (progressBars != null && progressBars.size() > 0) - { - return true; - } - return false; + return progressBar.operationInProgress(); } }