From: jprocter Date: Tue, 14 Dec 2010 18:01:39 +0000 (+0000) Subject: render of html job logs and link opening JAL-720 X-Git-Tag: Release_2_7~352 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8a1017e676ae8a3ae7f0900a7023c4ad598a0ad5;p=jalview.git render of html job logs and link opening JAL-720 --- diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index bd06547..0bf0fa6 100755 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -23,17 +23,24 @@ import java.awt.*; import java.awt.event.*; import java.awt.image.*; import javax.swing.*; +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.jbgui.*; import jalview.ws.WSClientI; /** - * Base class for web service client thread and gui + * 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 * * @author $author$ * @version $Revision$ */ -public class WebserviceInfo extends GWebserviceInfo +public class WebserviceInfo extends GWebserviceInfo implements + HyperlinkListener { /** Job is Queued */ @@ -77,8 +84,11 @@ public class WebserviceInfo extends GWebserviceInfo private boolean viewResultsImmediatly = true; /** - * Get - * @param flag to indicate if results will be shown in a new window as soon as they are available. + * Get + * + * @param flag + * to indicate if results will be shown in a new window as soon as + * they are available. */ public boolean isViewResultsImmediatly() { @@ -87,26 +97,80 @@ public class WebserviceInfo extends GWebserviceInfo /** * Set - * @param flag to indicate if results will be shown in a new window as soon as they are available. + * + * @param flag + * to indicate if results will be shown in a new window as soon as + * they are available. */ public void setViewResultsImmediatly(boolean viewResultsImmediatly) { this.viewResultsImmediatly = viewResultsImmediatly; } + private StyleSheet getStyleSheet(HTMLEditorKit editorKit) + { + + // Copied blatantly from + // http://www.velocityreviews.com/forums/t132265-string-into-htmldocument.html + StyleSheet myStyleSheet = new StyleSheet(); + + myStyleSheet.addStyleSheet(editorKit.getStyleSheet()); + + editorKit.setStyleSheet(myStyleSheet); + + /* + * Set the style sheet rules here by reading them from the constants + * interface. + */ + /* + * for (int ix=0; ix

WS Job

"); + } + else + { + JTextArea progressText = new JTextArea(); + _progressText = progressText; + + progressText.setFont(new java.awt.Font("Verdana", 0, 10)); + progressText.setBorder(null); + progressText.setEditable(false); + progressText.setText("WS Job"); + progressText.setLineWrap(true); + progressText.setWrapStyleWord(true); + } jobpane.setName("JobPane"); - jobpane.getViewport().add(progressText, null); + jobpane.getViewport().add(_progressText, null); jobpane.setBorder(null); if (jobPanes == null) { @@ -359,8 +423,16 @@ public class WebserviceInfo extends GWebserviceInfo { addJobPane(); } - return ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() - .getComponent(0)).getText(); + if (renderAsHtml) + { + return ((JEditorPane) ((JScrollPane) jobPanes.get(which)) + .getViewport().getComponent(0)).getText(); + } + else + { + return ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).getText(); + } } /** @@ -375,8 +447,92 @@ public class WebserviceInfo extends GWebserviceInfo { addJobPane(); } - ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() - .getComponent(0)).setText(text); + if (renderAsHtml) + { + ((JEditorPane) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).setText(ensureHtmlTagged(text)); + } + else + { + ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).setText(text); + } + } + + /** + * extract content from <body> content </body> + * + * @param text + * @param leaveFirst + * - set to leave the initial html tag intact + * @param leaveLast + * - set to leave the final html tag intact + * @return + */ + private String getHtmlFragment(String text, boolean leaveFirst, + boolean leaveLast) + { + if (text == null) + { + return null; + } + String lowertxt = text.toLowerCase(); + int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("", htmlpos), htmlende = lowertxt + .indexOf(">", htmlend); + if (htmlend == -1 && htmlpos == -1) + { + return text; + } + if (htmlend > -1) + { + return text.substring((htmlpos == -1 ? 0 : htmlpose + 1), htmlend); + } + return text.substring(htmlpos == -1 ? 0 : htmlpose + 1); + } + + /** + * very simple routine for adding/ensuring html tags are present in text. + * + * @param text + * @return properly html tag enclosed text + */ + private String ensureHtmlTagged(String text) + { + if (text == null) + { + return ""; + } + String lowertxt = text.toLowerCase(); + int htmlpos = lowertxt.indexOf(""; + } + if (htmlpos > -1) + { + if ((doctype > -1 && htmlpos > doctype) + || (xmltype > -1 && htmlpos > xmltype)) + { + text = "\n" + text.substring(htmlpos - 1); + } + } + else + { + text = "\n" + text; + } + if (text.indexOf(" -1) + { + System.err.println("HTML COntent: \n" + text + + "<< END HTML CONTENT\n"); + + } + return text; } /** @@ -391,8 +547,21 @@ public class WebserviceInfo extends GWebserviceInfo { addJobPane(); } - ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() - .getComponent(0)).append(text); + if (renderAsHtml) + { + String txt = getHtmlFragment( + ((JEditorPane) ((JScrollPane) jobPanes.get(which)) + .getViewport().getComponent(0)).getText(), true, + false); + ((JEditorPane) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).setText(ensureHtmlTagged(txt + + getHtmlFragment(text, false, true))); + } + else + { + ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).append(text); + } } /** @@ -642,4 +811,27 @@ public class WebserviceInfo extends GWebserviceInfo g1.drawImage(offscreen, 0, 0, this); } } + + boolean renderAsHtml = false; + + public void setRenderAsHtml(boolean b) + { + renderAsHtml = b; + } + + public void hyperlinkUpdate(HyperlinkEvent e) + { + if (e.getEventType() == EventType.ACTIVATED) + { + try + { + final String url = e.getURL().toString(); + Desktop.showUrl(url); + } catch (Exception x) + { + // ignore any exceptions due to dud links. + } + + } + } }