send rotCanvas sequence and viewport

[jalview.git] / src / jalview / io / HTMLOutput.java

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index d48c068..fd51823 100755 (executable)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -19,11 +19,14 @@ public class HTMLOutput
   {\r
     this.av = av;\r
     sr = new SequenceRenderer(av);\r
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
+        , new String[]{"html"}, "HTML files");\r
+\r
+    chooser.setFileView(new JalviewFileView());\r
     chooser.setDialogTitle("Save as HTML");\r
     chooser.setToolTipText("Save");\r
     int value = chooser.showSaveDialog(null);\r
-    if(value == JFileChooser.APPROVE_OPTION)\r
+    if(value == JalviewFileChooser.APPROVE_OPTION)\r
     {\r
       String choice =  chooser.getSelectedFile().getPath();\r
       jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);\r
@@ -89,7 +92,11 @@ public class HTMLOutput
     {\r
       seq = alignment.getSequenceAt(i);\r
       groups = alignment.findAllGroups( seq );\r
-      out.println("<tr><td nowrap>"+seq.getDisplayId()+"&nbsp;&nbsp;</td>");\r
+      if(av.getShowFullId())\r
+        out.println("<tr><td nowrap>"+seq.getDisplayId()+"&nbsp;&nbsp;</td>");\r
+      else\r
+        out.println("<tr><td nowrap>"+seq.getName()+"&nbsp;&nbsp;</td>");\r
+\r
 \r
 \r
       for (int res = 0; res < seq.getLength(); res++)\r
@@ -171,7 +178,10 @@ public class HTMLOutput
          out.println("<tr>");\r
          seq = al.getSequenceAt(s);\r
          groups = al.findAllGroups( seq );\r
-         out.println("<td nowrap>"+seq.getDisplayId()+"&nbsp;&nbsp;</td>");\r
+         if(av.getShowFullId())\r
+           out.println("<td nowrap>"+seq.getDisplayId()+"&nbsp;&nbsp;</td>");\r
+         else\r
+           out.println("<td nowrap>"+seq.getName()+"&nbsp;&nbsp;</td>");\r
 \r
          for (int res = startRes; res < endRes; res++)\r
               {\r