Skip to content

Commit 066a483

Browse files
committed
Refactor pretty-printing MARC record leader. (#556)
1 parent cdbde42 commit 066a483

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,17 @@ private void writeEscaped(final String str) {
437437
private void writeLeader() {
438438
final String leader = leaderBuilder.toString();
439439
if (leaderBuilder.length() > 0) {
440-
prettyPrintIndentationLeader();
440+
if (formatted) {
441+
writeRawLeader(getIndentationPrefix());
442+
}
443+
441444
writeTagLeader(Tag.leader::open);
442445
writeRawLeader(leader);
443446
writeTagLeader(Tag.leader::close);
444-
prettyPrintNewLineLeader();
447+
448+
if (formatted) {
449+
writeRawLeader(NEW_LINE);
450+
}
445451
}
446452
}
447453

@@ -455,17 +461,13 @@ private void writeTagLeader(final Function<Object[], String> function) {
455461
writeRawLeader(function.apply(namespacePrefix));
456462
}
457463

458-
private void prettyPrintIndentation() {
459-
if (formatted) {
460-
final String prefix = String.join("", Collections.nCopies(indentationLevel, INDENT));
461-
builder.append(prefix);
462-
}
464+
private String getIndentationPrefix() {
465+
return String.join("", Collections.nCopies(indentationLevel, INDENT));
463466
}
464467

465-
private void prettyPrintIndentationLeader() {
468+
private void prettyPrintIndentation() {
466469
if (formatted) {
467-
final String prefix = String.join("", Collections.nCopies(indentationLevel, INDENT));
468-
writeRawLeader(prefix);
470+
builder.append(getIndentationPrefix());
469471
}
470472
}
471473

@@ -475,12 +477,6 @@ private void prettyPrintNewLine() {
475477
}
476478
}
477479

478-
private void prettyPrintNewLineLeader() {
479-
if (formatted) {
480-
writeRawLeader(NEW_LINE);
481-
}
482-
}
483-
484480
private void sendAndClearData() {
485481
getReceiver().process(builder.toString());
486482
builder.delete(0, builder.length());

0 commit comments

Comments
 (0)