JAL-4146 Change occurrences of <br/> to <br>

diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java
index d2e8aba..7eb32bd 100644 (file)
--- a/src/jalview/io/SequenceAnnotationReport.java
+++ b/src/jalview/io/SequenceAnnotationReport.java
@@ -256,7 +256,7 @@ public class SequenceAnnotationReport
       {
         if (sb0.length() > 6)
         {
-          sb.append("<br/>");
+          sb.append("<br>");
         }
         sb.append(feature.getType()).append(" ").append(begin).append(":")
                 .append(end);
@@ -266,7 +266,7 @@ public class SequenceAnnotationReport
 
     if (sb0.length() > 6)
     {
-      sb.append("<br/>");
+      sb.append("<br>");
     }
     // TODO: remove this hack to display link only features
     boolean linkOnly = feature.getValue("linkonly") != null;
@@ -625,7 +625,7 @@ public class SequenceAnnotationReport
       countForSource++;
       if (countForSource == 1 || !summary)
       {
-        sb.append("<br/>\n");
+        sb.append("<br>\n");
       }
       if (countForSource <= MAX_REFS_PER_SOURCE || !summary)
       {
@@ -651,11 +651,11 @@ public class SequenceAnnotationReport
     }
     if (moreSources)
     {
-      sb.append("<br/>\n").append(source).append(COMMA).append(ELLIPSIS);
+      sb.append("<br>\n").append(source).append(COMMA).append(ELLIPSIS);
     }
     if (ellipsis)
     {
-      sb.append("<br/>\n(");
+      sb.append("<br>\n(");
       sb.append(MessageManager.getString("label.output_seq_details"));
       sb.append(")");
     }

diff --git a/test/jalview/io/SequenceAnnotationReportTest.java b/test/jalview/io/SequenceAnnotationReportTest.java
index 270de2d..90aca66 100644 (file)
--- a/test/jalview/io/SequenceAnnotationReportTest.java
+++ b/test/jalview/io/SequenceAnnotationReportTest.java
@@ -300,7 +300,7 @@ public class SequenceAnnotationReportTest
     sb.setLength(0);
     sar.createSequenceAnnotationReport(sb, seq, true, true, null);
     String expected = "<i>SeqDesc\n" + "\n"
-            + "<br/>Type1 ; Nonpos Score=1.0</i>";
+            + "<br>Type1 ; Nonpos Score=1.0</i>";
     assertEquals(expected, sb.toString());
 
     /*
@@ -326,7 +326,7 @@ public class SequenceAnnotationReportTest
     sb.setLength(0);
     sar.createSequenceAnnotationReport(sb, seq, true, true, fr);
     expected = "<i>SeqDesc\n" + "\n"
-            + "<br/>Metal ; Desc<br/>Type1 ; Nonpos</i>";
+            + "<br>Metal ; Desc<br>Type1 ; Nonpos</i>";
     assertEquals(expected, sb.toString());
     
     /*
@@ -352,7 +352,7 @@ public class SequenceAnnotationReportTest
     sb.setLength(0);
     sar.createSequenceAnnotationReport(sb, seq, true, true, fr);
     expected = "<i>SeqDesc\n" + "\n"
-            + "<br/>Metal ; Desc<br/>Type1 ; Nonpos<br/>Variant ; Havana</i>";
+            + "<br>Metal ; Desc<br>Type1 ; Nonpos<br>Variant ; Havana</i>";
     assertEquals(expected, sb.toString());
 
     /*
@@ -373,14 +373,14 @@ public class SequenceAnnotationReportTest
     fc.setAttributeName("clinical_significance");
     fr.setColour("Variant", fc);
     sar.createSequenceAnnotationReport(sb, seq, true, true, fr);
-    expected = "<i>SeqDesc\n" + "<br/>\n" + "UNIPROT P30419<br/>\n"
+    expected = "<i>SeqDesc\n" + "<br>\n" + "UNIPROT P30419<br>\n"
             + "PDB 3iu1\n"
-            + "<br/>Metal ; Desc<br/>Type1 ; Nonpos<br/>Variant ; Havana; clinical_significance=benign</i>";
+            + "<br>Metal ; Desc<br>Type1 ; Nonpos<br>Variant ; Havana; clinical_significance=benign</i>";
     assertEquals(expected, sb.toString());
     // with showNonPositionalFeatures = false
     sb.setLength(0);
     sar.createSequenceAnnotationReport(sb, seq, true, false, fr);
-    expected = "<i>SeqDesc\n" + "<br/>\n" + "UNIPROT P30419<br/>\n"
+    expected = "<i>SeqDesc\n" + "<br>\n" + "UNIPROT P30419<br>\n"
             + "PDB 3iu1\n" + "</i>";
     assertEquals(expected, sb.toString());
 
@@ -392,7 +392,7 @@ public class SequenceAnnotationReportTest
             "This is a very long description which should be truncated");
     sar.createSequenceAnnotationReport(sb, seq, false, true, fr);
     expected = "<i>SeqDesc\n" + "\n"
-            + "<br/>Metal ; Desc<br/>Type1 ; Nonpos<br/>Variant ; This is a very long description which sh...; clinical_significance=benign</i>";
+            + "<br>Metal ; Desc<br>Type1 ; Nonpos<br>Variant ; This is a very long description which sh...; clinical_significance=benign</i>";
     assertEquals(expected, sb.toString());
 
     // see other tests for treatment of status and html
@@ -425,11 +425,11 @@ public class SequenceAnnotationReportTest
   
     sar.createSequenceAnnotationReport(sb, seq, true, true, null, true);
     String report = sb.toString();
-    assertTrue(report.startsWith("<i>\n" + "<br/>\n" + "UNIPROT P30410,\n"
-            + " P30411,\n" + " P30412,\n" + " P30413,...<br/>\n"
-            + "PDB0 3iu1<br/>\n" + "PDB1 3iu1<br/>"));
-    assertTrue(report.endsWith("PDB5 3iu1<br/>\n" + "PDB6 3iu1<br/>\n"
-            + "PDB7 3iu1<br/>\n" + "PDB8,...<br/>\n"
+    assertTrue(report.startsWith("<i>\n" + "<br>\n" + "UNIPROT P30410,\n"
+            + " P30411,\n" + " P30412,\n" + " P30413,...<br>\n"
+            + "PDB0 3iu1<br>\n" + "PDB1 3iu1<br>"));
+    assertTrue(report.endsWith("PDB5 3iu1<br>\n" + "PDB6 3iu1<br>\n"
+            + "PDB7 3iu1<br>\n" + "PDB8,...<br>\n"
             + "(Output Sequence Details to list all database references)\n"
             + "</i>"));
   }