X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=9f8a8a87879f2088f044767c4485457fdb448715;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=df18a628bcb42822ce6f677d9ec13bdac9683c25;hpb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;p=jalview.git
diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index df18a62..9f8a8a8 100755
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -1,20 +1,19 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * 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
+ *
+ * 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.
+ *
+ * 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 .
*/
package jalview.gui;
@@ -24,17 +23,25 @@ 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.bin.Cache;
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 */
@@ -54,30 +61,117 @@ public class WebserviceInfo
/** job has failed because of some unavoidable service interruption */
public static final int STATE_STOPPED_SERVERERROR = 5;
+
int currentStatus = STATE_QUEUING;
+
Image image;
+
int angle = 0;
+
String title = "";
+
jalview.ws.WSClientI thisService;
+
boolean serviceIsCancellable;
+
JInternalFrame frame;
+
JTabbedPane subjobs = null;
+
java.util.Vector jobPanes = null;
+
private boolean serviceCanMergeResults = false;
+
private boolean viewResultsImmediatly = true;
+
+ /**
+ * Get
+ *
+ * @param flag
+ * to indicate if results will be shown in a new window as soon as
+ * they are available.
+ */
+ public boolean isViewResultsImmediatly()
+ {
+ return viewResultsImmediatly;
+ }
+
+ /**
+ * Set
+ *
+ * @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; ixWS Job