summaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java b/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java
index 980b88c..3a6432d 100644
--- a/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java
+++ b/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java
@@ -4,6 +4,7 @@ import org.zwobble.mammoth.documents.Paragraph;
import org.zwobble.mammoth.documents.Style;
import java.util.Optional;
+import java.util.function.BiPredicate;
public class ParagraphMatcher {
public static final ParagraphMatcher ANY = new ParagraphMatcher(Optional.empty(), Optional.empty());
@@ -29,16 +30,16 @@ public class ParagraphMatcher {
}
private boolean matchesStyleId(Paragraph paragraph) {
- return matches(styleId, paragraph.getStyle().map(Style::getStyleId));
+ return matches(styleId, paragraph.getStyle().map(Style::getStyleId), Object::equals);
}
private boolean matchesStyleName(Paragraph paragraph) {
- return matches(styleName, paragraph.getStyle().flatMap(Style::getName));
+ return matches(styleName, paragraph.getStyle().flatMap(Style::getName), String::equalsIgnoreCase);
}
- private boolean matches(Optional<String> required, Optional<String> actual) {
+ private boolean matches(Optional<String> required, Optional<String> actual, BiPredicate<String, String> areEqual) {
return required
- .map(requiredValue -> actual.map(requiredValue::equals).orElse(false))
+ .map(requiredValue -> actual.map(actualValue -> areEqual.test(requiredValue, actualValue)).orElse(false))
.orElse(true);
}
}