aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2017-02-19 21:11:41 +0000
committerMichael Williamson <mike@zwobble.org>2017-02-19 21:11:41 +0000
commitfb8e50884dc5742817a6f2f81f8e3db0a5186dfb (patch)
tree87f04bc26e5b482708861e9889f0e1cf0f1dee38 /src
parentaaeb4a388ea8a650c2004c58d0b0f4839b8a64ad (diff)
Clarify that complexFields is a stack
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
index f02a2e1..e15c14c 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -39,7 +39,7 @@ class StatefulBodyXmlReader {
private final Archive file;
private final FileReader fileReader;
private final StringBuilder currentInstrText;
- private final Queue<ComplexField> complexFields;
+ private final Queue<ComplexField> complexFieldStack;
private interface ComplexField {
ComplexField UNKNOWN = new ComplexField() {};
@@ -73,7 +73,7 @@ class StatefulBodyXmlReader {
this.file = file;
this.fileReader = fileReader;
this.currentInstrText = new StringBuilder();
- this.complexFields = Collections.asLifoQueue(new ArrayDeque<>());
+ this.complexFieldStack = Collections.asLifoQueue(new ArrayDeque<>());
}
ReadResult readElement(XmlElement element) {
@@ -186,7 +186,7 @@ class StatefulBodyXmlReader {
}
private Optional<String> currentHyperlinkHref() {
- return tryGetLast(lazyFilter(this.complexFields, HyperlinkComplexField.class))
+ return tryGetLast(lazyFilter(this.complexFieldStack, HyperlinkComplexField.class))
.map(field -> field.href);
}
@@ -249,13 +249,13 @@ class StatefulBodyXmlReader {
if (type.equals("begin")) {
currentInstrText.setLength(0);
} else if (type.equals("end")) {
- complexFields.remove();
+ complexFieldStack.remove();
} else if (type.equals("separate")) {
String instrText = currentInstrText.toString();
ComplexField complexField = parseHyperlinkFieldCode(instrText)
.map(href -> ComplexField.hyperlink(href))
.orElse(ComplexField.UNKNOWN);
- complexFields.add(complexField);
+ complexFieldStack.add(complexField);
}
return ReadResult.EMPTY_SUCCESS;
}