X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=0773a7b3d84cf8674cb0c6b9fc81914e68d726bb;hb=bed0c230be450b16213e30ee1dcaf3e76ddfc669;hp=e0090bee5642d265c38c8e53f224e658dd417674;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
old mode 100755
new mode 100644
index e0090be..0773a7b
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -1,39 +1,66 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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 java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import javax.swing.*;
-
-import jalview.jbgui.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+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.Vector;
+
+import javax.swing.JComponent;
+import javax.swing.JEditorPane;
+import javax.swing.JInternalFrame;
+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;
+
+import jalview.jbgui.GWebserviceInfo;
+import jalview.util.ChannelProperties;
+import jalview.util.MessageManager;
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
+ implements HyperlinkListener, IProgressIndicator
{
/** Job is Queued */
@@ -58,7 +85,7 @@ public class WebserviceInfo extends GWebserviceInfo
Image image;
- int angle = 0;
+ float angle = 0f;
String title = "";
@@ -68,6 +95,15 @@ public class WebserviceInfo extends GWebserviceInfo
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;
@@ -76,19 +112,94 @@ 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.
+ */
+ 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