git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added clustalW 'realignment' (primitive)
[jalview.git] / src / jalview / io / HTMLOutput.java
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index fd51823..50f7471 100755 (executable)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -19,8 +19,11 @@ public class HTMLOutput
   {\r
     this.av = av;\r
     sr = new SequenceRenderer(av);\r
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
-        , new String[]{"html"}, "HTML files");\r
+    JalviewFileChooser chooser = new JalviewFileChooser(\r
+      jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
+      new String[]{"html"},\r
+      new String[]{"HTML files"},\r
+      "HTML files");\r
 \r
     chooser.setFileView(new JalviewFileView());\r
     chooser.setDialogTitle("Save as HTML");\r
@@ -29,7 +32,7 @@ public class HTMLOutput
     if(value == JalviewFileChooser.APPROVE_OPTION)\r
     {\r
       String choice =  chooser.getSelectedFile().getPath();\r
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile().getParent());\r
       try{\r
         PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(choice));\r
         out.println("<HTML>");\r
@@ -118,16 +121,9 @@ public class HTMLOutput
 \r
         if(color.getRGB()<-1)\r
         {\r
-          r = Integer.toHexString(color.getRed());\r
-          if(r.length()<2)\r
-            r = "0"+r;\r
-          g = Integer.toHexString(color.getGreen());\r
-          if(g.length()<2)\r
-            g = "0"+g;\r
-          b = Integer.toHexString(color.getBlue());\r
-          if(b.length()<2)\r
-            b = "0"+b;\r
-          out.println("<td bgcolor=\"#"+ r + g + b + "\">"+seq.getCharAt(res)+"</td>");\r
+          out.println("<td bgcolor=\"#"\r
+                      + jalview.util.Format.getHexString(color)\r
+                      + "\">"+seq.getCharAt(res)+"</td>");\r
         }\r
         else\r
           out.println("<td>"+seq.getCharAt(res)+"</td>");\r