X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=257e9fa26e7a874969745eb5b360a3b1b9c84723;hb=f1671000d7556b46d63e676b83b3f7b6e9179849;hp=e4dc83e9d35912535e26518c3aeba827f38e93e3;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index e4dc83e..257e9fa 100755
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -114,9 +114,6 @@ public class HTMLOutput
     SequenceI seq;
     ColourSchemeI cs = null;
     AlignmentI alignment = av.getAlignment();
-    String r;
-    String g;
-    String b;
 
     // draws the top row, the measure rule
     out.println("<tr><td colspan=\"6\"></td>");
@@ -137,16 +134,11 @@ public class HTMLOutput
       seq = alignment.getSequenceAt(i);
       groups = alignment.findAllGroups(seq);
 
-      if (av.getShowFullId())
-      {
-        out.println("<tr><td nowrap>" + seq.getDisplayId() +
-                    "&nbsp;&nbsp;</td>");
-      }
-      else
-      {
-        out.println("<tr><td nowrap>" + seq.getName() +
+      String id = seq.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
+
+      out.println("<tr><td nowrap>" + id +
                     "&nbsp;&nbsp;</td>");
-      }
+
 
       for (int res = 0; res < seq.getLength(); res++)
       {
@@ -205,9 +197,9 @@ public class HTMLOutput
         "<table border=\"0\"  cellpadding=\"0\" cellspacing=\"0\">\n");
 
     for (int startRes = 0; startRes < al.getWidth();
-         startRes += av.getChunkWidth())
+         startRes += av.getWrappedWidth())
     {
-      int endRes = startRes + av.getChunkWidth();
+      int endRes = startRes + av.getWrappedWidth();
 
       if (endRes > al.getWidth())
       {
@@ -232,16 +224,11 @@ public class HTMLOutput
         seq = al.getSequenceAt(s);
         groups = al.findAllGroups(seq);
 
-        if (av.getShowFullId())
-        {
-          out.println("<td nowrap>" + seq.getDisplayId() +
-                      "&nbsp;&nbsp;</td>");
-        }
-        else
-        {
-          out.println("<td nowrap>" + seq.getName() +
+        String id = seq.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
+
+          out.println("<td nowrap>" + id +
                       "&nbsp;&nbsp;</td>");
-        }
+
 
         for (int res = startRes; res < endRes; res++)
         {