Skip to content
This repository was archived by the owner on Jun 18, 2026. It is now read-only.

Commit e6027fa

Browse files
Merge pull request #128 from sauravbhattacharya001/refactor/deduplicate-escapeXml
refactor: deduplicate escapeXml across 5 layout/animator classes
2 parents 1124c77 + 6e0d263 commit e6027fa

5 files changed

Lines changed: 6 additions & 17 deletions

File tree

Gvisual/src/gvisual/CircularLayout.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,7 @@ public String toSvg() {
515515
}
516516

517517
private String escapeXml(String s) {
518-
return s.replace("&", "&amp;").replace("<", "&lt;")
519-
.replace(">", "&gt;").replace("\"", "&quot;");
518+
return ExportUtils.escapeXml(s);
520519
}
521520

522521
private void ensureComputed() {

Gvisual/src/gvisual/ForceDirectedLayout.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -974,12 +974,8 @@ void applyRepulsion(int i, double px, double py,
974974
* Escapes special XML characters.
975975
*/
976976
private static String escapeXml(String s) {
977-
if (s == null) return "";
978-
return s.replace("&", "&amp;")
979-
.replace("<", "&lt;")
980-
.replace(">", "&gt;")
981-
.replace("\"", "&quot;")
982-
.replace("'", "&apos;");
977+
return ExportUtils.escapeXml(s);
978+
}
983979
}
984980

985981
}

Gvisual/src/gvisual/GraphAlgorithmAnimator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,7 @@ private static String fmt(double v) {
824824
}
825825

826826
private static String escapeXml(String s) {
827-
if (s == null) return "";
828-
return s.replace("&", "&amp;").replace("<", "&lt;")
829-
.replace(">", "&gt;").replace("\"", "&quot;");
827+
return ExportUtils.escapeXml(s);
830828
}
831829

832830
private static String escapeJS(String s) {

Gvisual/src/gvisual/HierarchicalLayout.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -900,9 +900,6 @@ private void ensureComputed() {
900900
}
901901

902902
private static String escapeXml(String s) {
903-
return s.replace("&", "&amp;")
904-
.replace("<", "&lt;")
905-
.replace(">", "&gt;")
906-
.replace("\"", "&quot;");
903+
return ExportUtils.escapeXml(s);
907904
}
908905
}

Gvisual/src/gvisual/SpectralLayout.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ public String toSvg(Graph<String, Edge> graph) {
345345
}
346346

347347
private String escapeXml(String s) {
348-
return s.replace("&", "&amp;").replace("<", "&lt;")
349-
.replace(">", "&gt;").replace("\"", "&quot;");
348+
return ExportUtils.escapeXml(s);
350349
}
351350

352351
// ═════════════════════════════════════════════════════════════════

0 commit comments

Comments
 (0)