X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=c6137ccf3fb0e7268c385596564e04e55bb53e40;hb=8fa69554edf6aeb278b4a4afd8e2b60264fdccd8;hp=82257ff94e00562c804b2384ee06f015dc120668;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 82257ff..c6137cc 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.9)
- * Copyright (C) 2015 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.
  * 
@@ -39,7 +39,6 @@ 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;
@@ -56,8 +55,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 */
@@ -328,8 +327,8 @@ public class WebserviceInfo extends GWebserviceInfo implements
     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);
@@ -348,19 +347,21 @@ 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()
+            {
+              @Override
+              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();
 
   }
@@ -387,8 +388,8 @@ 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() }));
+              "error.setstatus_called_non_existent_job_pane", new String[]
+              { Integer.valueOf(jobpane).toString() }));
     }
     switch (status)
     {
@@ -515,8 +516,8 @@ public class WebserviceInfo extends GWebserviceInfo implements
     int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("<body");
 
     int htmlend = leaveLast ? -1 : lowertxt.indexOf("</body");
-    int htmlpose = lowertxt.indexOf(">", htmlpos), htmlende = lowertxt
-            .indexOf(">", htmlend);
+    int htmlpose = lowertxt.indexOf(">", htmlpos),
+            htmlende = lowertxt.indexOf(">", htmlend);
     if (htmlend == -1 && htmlpos == -1)
     {
       return text;
@@ -563,8 +564,8 @@ public class WebserviceInfo extends GWebserviceInfo implements
     }
     if (text.indexOf("<meta") > -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;
@@ -586,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
     {
@@ -674,6 +676,7 @@ public class WebserviceInfo extends GWebserviceInfo implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   protected void cancel_actionPerformed(ActionEvent e)
   {
     if (!serviceIsCancellable)
@@ -683,8 +686,8 @@ public class WebserviceInfo extends GWebserviceInfo implements
       // 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"),
+              MessageManager.getString(
+                      "warn.job_cannot_be_cancelled_close_window"),
               MessageManager.getString("action.cancel_job"));
     }
     else
@@ -705,10 +708,11 @@ public class WebserviceInfo extends GWebserviceInfo implements
   {
     javax.swing.SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
-        JOptionPane.showInternalMessageDialog(Desktop.desktop, message,
-                title, JOptionPane.WARNING_MESSAGE);
+        JvOptionPane.showInternalMessageDialog(Desktop.desktop, message,
+                title, JvOptionPane.WARNING_MESSAGE);
 
       }
     });
@@ -754,6 +758,7 @@ public class WebserviceInfo extends GWebserviceInfo implements
 
     BufferedImage offscreen;
 
+    @Override
     public void run()
     {
       startTime = System.currentTimeMillis();
@@ -764,7 +769,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();
@@ -828,8 +834,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);
 
@@ -845,8 +851,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);
 
@@ -862,6 +868,7 @@ public class WebserviceInfo extends GWebserviceInfo implements
       }
     }
 
+    @Override
     public void paintComponent(Graphics g1)
     {
       drawPanel();
@@ -877,6 +884,7 @@ public class WebserviceInfo extends GWebserviceInfo implements
     renderAsHtml = b;
   }
 
+  @Override
   public void hyperlinkUpdate(HyperlinkEvent e)
   {
     Desktop.hyperlinkUpdate(e);