From 234c981911c7442e933cb945c3ce6053b476c317 Mon Sep 17 00:00:00 2001 From: Mateusz Warowny Date: Wed, 15 Mar 2023 12:47:51 +0100 Subject: [PATCH] JAL-4146 Change occurrences of
to
--- src/jalview/io/SequenceAnnotationReport.java | 10 ++++----- test/jalview/io/SequenceAnnotationReportTest.java | 24 ++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java index d2e8aba..7eb32bd 100644 --- 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("
"); + sb.append("
"); } sb.append(feature.getType()).append(" ").append(begin).append(":") .append(end); @@ -266,7 +266,7 @@ public class SequenceAnnotationReport if (sb0.length() > 6) { - sb.append("
"); + sb.append("
"); } // 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("
\n"); + sb.append("
\n"); } if (countForSource <= MAX_REFS_PER_SOURCE || !summary) { @@ -651,11 +651,11 @@ public class SequenceAnnotationReport } if (moreSources) { - sb.append("
\n").append(source).append(COMMA).append(ELLIPSIS); + sb.append("
\n").append(source).append(COMMA).append(ELLIPSIS); } if (ellipsis) { - sb.append("
\n("); + sb.append("
\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 --- 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 = "SeqDesc\n" + "\n" - + "
Type1 ; Nonpos Score=1.0
"; + + "
Type1 ; Nonpos Score=1.0"; assertEquals(expected, sb.toString()); /* @@ -326,7 +326,7 @@ public class SequenceAnnotationReportTest sb.setLength(0); sar.createSequenceAnnotationReport(sb, seq, true, true, fr); expected = "SeqDesc\n" + "\n" - + "
Metal ; Desc
Type1 ; Nonpos
"; + + "
Metal ; Desc
Type1 ; Nonpos"; assertEquals(expected, sb.toString()); /* @@ -352,7 +352,7 @@ public class SequenceAnnotationReportTest sb.setLength(0); sar.createSequenceAnnotationReport(sb, seq, true, true, fr); expected = "SeqDesc\n" + "\n" - + "
Metal ; Desc
Type1 ; Nonpos
Variant ; Havana
"; + + "
Metal ; Desc
Type1 ; Nonpos
Variant ; Havana"; 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 = "SeqDesc\n" + "
\n" + "UNIPROT P30419
\n" + expected = "SeqDesc\n" + "
\n" + "UNIPROT P30419
\n" + "PDB 3iu1\n" - + "
Metal ; Desc
Type1 ; Nonpos
Variant ; Havana; clinical_significance=benign
"; + + "
Metal ; Desc
Type1 ; Nonpos
Variant ; Havana; clinical_significance=benign
"; assertEquals(expected, sb.toString()); // with showNonPositionalFeatures = false sb.setLength(0); sar.createSequenceAnnotationReport(sb, seq, true, false, fr); - expected = "SeqDesc\n" + "
\n" + "UNIPROT P30419
\n" + expected = "SeqDesc\n" + "
\n" + "UNIPROT P30419
\n" + "PDB 3iu1\n" + "
"; 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 = "SeqDesc\n" + "\n" - + "
Metal ; Desc
Type1 ; Nonpos
Variant ; This is a very long description which sh...; clinical_significance=benign
"; + + "
Metal ; Desc
Type1 ; Nonpos
Variant ; This is a very long description which sh...; clinical_significance=benign
"; 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("\n" + "
\n" + "UNIPROT P30410,\n" - + " P30411,\n" + " P30412,\n" + " P30413,...
\n" - + "PDB0 3iu1
\n" + "PDB1 3iu1
")); - assertTrue(report.endsWith("PDB5 3iu1
\n" + "PDB6 3iu1
\n" - + "PDB7 3iu1
\n" + "PDB8,...
\n" + assertTrue(report.startsWith("\n" + "
\n" + "UNIPROT P30410,\n" + + " P30411,\n" + " P30412,\n" + " P30413,...
\n" + + "PDB0 3iu1
\n" + "PDB1 3iu1
")); + assertTrue(report.endsWith("PDB5 3iu1
\n" + "PDB6 3iu1
\n" + + "PDB7 3iu1
\n" + "PDB8,...
\n" + "(Output Sequence Details to list all database references)\n" + "
")); } -- 1.7.10.2