git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'develop' into features/filetypeEnum
[jalview.git] / src / jalview / io / HTMLOutput.java
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index df0dc06..2e4a781 100755 (executable)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -20,16 +20,20 @@
  */
 package jalview.io;
 
+import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignViewport;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.FeatureRenderer;
 import jalview.gui.SequenceRenderer;
+import jalview.util.BrowserLauncher;
+import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.io.FileWriter;
 import java.io.PrintWriter;
 
 public class HTMLOutput
@@ -52,9 +56,8 @@ public class HTMLOutput
     fr.transferSettings(fr1);
 
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-            new String[] { "html" }, new String[] { "HTML files" },
-            "HTML files");
+            Cache.getProperty("LAST_DIRECTORY"), ImageMaker.HTML_EXTENSION,
+            "HTML files", "HTML files");
 
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.save_as_html"));
@@ -65,13 +68,12 @@ public class HTMLOutput
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
+      Cache.setProperty("LAST_DIRECTORY", chooser
               .getSelectedFile().getParent());
 
       try
       {
-        PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
-                choice));
+        PrintWriter out = new PrintWriter(new FileWriter(choice));
         out.println("<HTML>");
         out.println("<style type=\"text/css\">");
         out.println("<!--");
@@ -106,7 +108,7 @@ public class HTMLOutput
 
         out.println("\n</body>\n</html>");
         out.close();
-        jalview.util.BrowserLauncher.openURL("file:///" + choice);
+        BrowserLauncher.openURL("file:///" + choice);
       } catch (Exception ex)
       {
         ex.printStackTrace();