X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;h=948578ada34bfa4acef21b0353c48dd5fb38965b;hb=b2eb64f196223039a95348a4026f0453693ee0e7;hp=1ec3a4e6483f68d9e9ab2af7d4eb0b0fb9b3e17f;hpb=6168111321deafec25337c6c59210f14f857041d;p=jalview.git

diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index 1ec3a4e..948578a 100644
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -39,7 +39,6 @@ import org.jfree.graphics2d.svg.SVGHints;
 public class HtmlSvgOutput extends HTMLOutput
 {
 
-
   public HtmlSvgOutput(AlignmentPanel ap)
   {
     super(ap);
@@ -63,24 +62,14 @@ public class HtmlSvgOutput extends HTMLOutput
       return;
     } catch (Exception e)
     {
-      setProgressMessage(MessageManager.formatMessage(
-              "info.error_creating_file", "HTML"));
+      setProgressMessage(MessageManager
+              .formatMessage("info.error_creating_file", "HTML"));
       e.printStackTrace();
       return;
     }
     new Thread(this).start();
   }
 
-
-  static JalviewFileChooser getHTMLChooser()
-  {
-    return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-            new String[] { "html" },
-            new String[] { "Hypertext Markup Language" },
-            "Hypertext Markup Language");
-  }
-
   public int printUnwrapped(int pwidth, int pheight, int pi,
           Graphics idGraphics, Graphics alignmentGraphics)
           throws PrinterException
@@ -102,10 +91,13 @@ public class HtmlSvgOutput extends HTMLOutput
     htmlSvg.append("<html>\n");
     if (jsonData != null)
     {
-      htmlSvg.append("<button onclick=\"javascipt:openJalviewUsingCurrentUrl();\">Launch in Jalview</button> &nbsp;");
-      htmlSvg.append("<input type=\"submit\" value=\"View raw BioJSON Data\" onclick=\"jQuery.facebox({ div:'#seqData' }); return false;\" />");
-      htmlSvg.append("<div style=\"display: none;\" name=\"seqData\" id=\"seqData\" >"
-              + jsonData + "</div>");
+      htmlSvg.append(
+              "<button onclick=\"javascipt:openJalviewUsingCurrentUrl();\">Launch in Jalview</button> &nbsp;");
+      htmlSvg.append(
+              "<input type=\"submit\" value=\"View raw BioJSON Data\" onclick=\"jQuery.facebox({ div:'#seqData' }); return false;\" />");
+      htmlSvg.append(
+              "<div style=\"display: none;\" name=\"seqData\" id=\"seqData\" >"
+                      + jsonData + "</div>");
       htmlSvg.append("<br/>&nbsp;");
     }
     htmlSvg.append("\n<style type=\"text/css\"> "
@@ -118,72 +110,80 @@ public class HtmlSvgOutput extends HTMLOutput
     if (jsonData != null)
     {
       // facebox style sheet for displaying raw BioJSON data
-      htmlSvg.append("#facebox { position: absolute;  top: 0;   left: 0; z-index: 100; text-align: left; }\n"
-              + "#facebox .popup{ position:relative; border:3px solid rgba(0,0,0,0); -webkit-border-radius:5px;"
-              + "-moz-border-radius:5px; border-radius:5px; -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4); -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);"
-              + "box-shadow:0 0 18px rgba(0,0,0,0.4); }\n"
-              + "#facebox .content { display:table; width: 98%; padding: 10px; background: #fff; -webkit-border-radius:4px; -moz-border-radius:4px;"
-              + " border-radius:4px; }\n"
-              + "#facebox .content > p:first-child{ margin-top:0; }\n"
-              + "#facebox .content > p:last-child{ margin-bottom:0; }\n"
-              + "#facebox .close{ position:absolute; top:5px; right:5px; padding:2px; background:#fff; }\n"
-              + "#facebox .close img{ opacity:0.3; }\n"
-              + "#facebox .close:hover img{ opacity:1.0; }\n"
-              + "#facebox .loading { text-align: center; }\n"
-              + "#facebox .image { text-align: center;}\n"
-              + "#facebox img { border: 0;  margin: 0; }\n"
-              + "#facebox_overlay { position: fixed; top: 0px; left: 0px; height:100%; width:100%; }\n"
-              + ".facebox_hide { z-index:-100; }\n"
-              + ".facebox_overlayBG { background-color: #000;  z-index: 99;  }");
+      htmlSvg.append(
+              "#facebox { position: absolute;  top: 0;   left: 0; z-index: 100; text-align: left; }\n"
+                      + "#facebox .popup{ position:relative; border:3px solid rgba(0,0,0,0); -webkit-border-radius:5px;"
+                      + "-moz-border-radius:5px; border-radius:5px; -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4); -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);"
+                      + "box-shadow:0 0 18px rgba(0,0,0,0.4); }\n"
+                      + "#facebox .content { display:table; width: 98%; padding: 10px; background: #fff; -webkit-border-radius:4px; -moz-border-radius:4px;"
+                      + " border-radius:4px; }\n"
+                      + "#facebox .content > p:first-child{ margin-top:0; }\n"
+                      + "#facebox .content > p:last-child{ margin-bottom:0; }\n"
+                      + "#facebox .close{ position:absolute; top:5px; right:5px; padding:2px; background:#fff; }\n"
+                      + "#facebox .close img{ opacity:0.3; }\n"
+                      + "#facebox .close:hover img{ opacity:1.0; }\n"
+                      + "#facebox .loading { text-align: center; }\n"
+                      + "#facebox .image { text-align: center;}\n"
+                      + "#facebox img { border: 0;  margin: 0; }\n"
+                      + "#facebox_overlay { position: fixed; top: 0px; left: 0px; height:100%; width:100%; }\n"
+                      + ".facebox_hide { z-index:-100; }\n"
+                      + ".facebox_overlayBG { background-color: #000;  z-index: 99;  }");
     }
     htmlSvg.append("</style>");
     if (!wrapped)
     {
-    htmlSvg.append("<div class=\"main-container\" \n>");
-    htmlSvg.append("<div class=\"titlex\">\n");
-    htmlSvg.append("<div class=\"sub-category-container\"> \n");
-    htmlSvg.append(titleSvg);
-    htmlSvg.append("</div>");
-    htmlSvg.append("</div>\n\n<!-- ========================================================================================== -->\n\n");
-    htmlSvg.append("<div class=\"align\" >");
-    htmlSvg.append(
-            "<div class=\"sub-category-container\"> <div style=\"overflow-x: scroll;\">")
-            .append(alignmentSvg).append("</div></div>").append("</div>");
-    htmlSvg.append("</div>");
+      htmlSvg.append("<div class=\"main-container\" \n>");
+      htmlSvg.append("<div class=\"titlex\">\n");
+      htmlSvg.append("<div class=\"sub-category-container\"> \n");
+      htmlSvg.append(titleSvg);
+      htmlSvg.append("</div>");
+      htmlSvg.append(
+              "</div>\n\n<!-- ========================================================================================== -->\n\n");
+      htmlSvg.append("<div class=\"align\" >");
+      htmlSvg.append(
+              "<div class=\"sub-category-container\"> <div style=\"overflow-x: scroll;\">")
+              .append(alignmentSvg).append("</div></div>").append("</div>");
+      htmlSvg.append("</div>");
 
-    htmlSvg.append("<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
-            + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n"
-            + "<script>\n"
-            + "var subCatContainer = $(\".sub-category-container\");\n"
-            + "subCatContainer.scroll(\nfunction() {\n"
-            + "subCatContainer.scrollTop($(this).scrollTop());\n});\n");
+      htmlSvg.append(
+              "<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
+                      + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n"
+                      + "<script>\n"
+                      + "var subCatContainer = $(\".sub-category-container\");\n"
+                      + "subCatContainer.scroll(\nfunction() {\n"
+                      + "subCatContainer.scrollTop($(this).scrollTop());\n});\n");
 
-    htmlSvg.append("</script>\n");
+      htmlSvg.append("</script>\n");
     }
     else
     {
-      htmlSvg.append("<div>\n")
-              .append(alignmentSvg).append("</div>");
-      htmlSvg.append("<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
-              + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n");
+      htmlSvg.append("<div>\n").append(alignmentSvg).append("</div>");
+      htmlSvg.append(
+              "<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
+                      + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n");
     }
 
     // javascript for launching file in Jalview
     htmlSvg.append("<script language=\"JavaScript\">\n");
     htmlSvg.append("function openJalviewUsingCurrentUrl(){\n");
-    htmlSvg.append("    var json = JSON.parse(document.getElementById(\"seqData\").innerHTML);\n");
-    htmlSvg.append("    var jalviewVersion = json['appSettings'].version;\n");
+    htmlSvg.append(
+            "    var json = JSON.parse(document.getElementById(\"seqData\").innerHTML);\n");
+    htmlSvg.append(
+            "    var jalviewVersion = json['appSettings'].version;\n");
     htmlSvg.append("    var url = json['appSettings'].webStartUrl;\n");
-    htmlSvg.append("    var myForm = document.createElement(\"form\");\n\n");
+    htmlSvg.append(
+            "    var myForm = document.createElement(\"form\");\n\n");
     htmlSvg.append("    var heap = document.createElement(\"input\");\n");
     htmlSvg.append("    heap.setAttribute(\"name\", \"jvm-max-heap\") ;\n");
     htmlSvg.append("    heap.setAttribute(\"value\", \"2G\");\n\n");
     htmlSvg.append("    var target = document.createElement(\"input\");\n");
     htmlSvg.append("    target.setAttribute(\"name\", \"open\");\n");
     htmlSvg.append("    target.setAttribute(\"value\", document.URL);\n\n");
-    htmlSvg.append("    var jvVersion = document.createElement(\"input\");\n");
+    htmlSvg.append(
+            "    var jvVersion = document.createElement(\"input\");\n");
     htmlSvg.append("    jvVersion.setAttribute(\"name\", \"version\") ;\n");
-    htmlSvg.append("    jvVersion.setAttribute(\"value\", jalviewVersion);\n\n");
+    htmlSvg.append(
+            "    jvVersion.setAttribute(\"value\", jalviewVersion);\n\n");
     htmlSvg.append("    myForm.action = url;\n");
     htmlSvg.append("    myForm.appendChild(heap);\n");
     htmlSvg.append("    myForm.appendChild(target);\n");
@@ -214,8 +214,8 @@ public class HtmlSvgOutput extends HTMLOutput
   @Override
   public boolean isEmbedData()
   {
-    return Boolean.valueOf(jalview.bin.Cache.getDefault(
-            "EXPORT_EMBBED_BIOJSON", "true"));
+    return Boolean.valueOf(
+            jalview.bin.Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
   }
 
   @Override
@@ -283,14 +283,14 @@ public class HtmlSvgOutput extends HTMLOutput
       String idPanelSvgData = idPanelGraphics.getSVGDocument();
       String alignPanelSvgData = alignPanelGraphics.getSVGDocument();
       String jsonData = getBioJSONData();
-      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData,
-              jsonData, ap.av.getWrapAlignment());
+      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData, jsonData,
+              ap.av.getWrapAlignment());
       FileOutputStream out = new FileOutputStream(generatedFile);
       out.write(htmlData.getBytes());
       out.flush();
       out.close();
-      setProgressMessage(MessageManager.formatMessage(
-              "status.export_complete", "HTML"));
+      setProgressMessage(MessageManager
+              .formatMessage("status.export_complete", "HTML"));
       exportCompleted();
     } catch (OutOfMemoryError err)
     {
@@ -300,8 +300,8 @@ public class HtmlSvgOutput extends HTMLOutput
     } catch (Exception e)
     {
       e.printStackTrace();
-      setProgressMessage(MessageManager.formatMessage(
-              "info.error_creating_file", "HTML"));
+      setProgressMessage(MessageManager
+              .formatMessage("info.error_creating_file", "HTML"));
     }
   }
 }
