diff options
| author | Javen O'Neal <onealj@apache.org> | 2017-10-18 08:10:36 +0000 |
|---|---|---|
| committer | Javen O'Neal <onealj@apache.org> | 2017-10-18 08:10:36 +0000 |
| commit | 8300528aada54923365f5fa085ad37698f380972 (patch) | |
| tree | dcf6511b96d82cc2702f8e267ba33807f03de7fd | |
| parent | 129db08b912aa4bbf6b4083844673f8df4daaba9 (diff) | |
| download | poi-8300528aada54923365f5fa085ad37698f380972.tar.gz poi-8300528aada54923365f5fa085ad37698f380972.zip | |
simplfy PackagingURIHelper#combine boolean logic using xor and replacing +FORWARD_SLASH_CHAR with FORWARD_SLASH_STRING
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1812468 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java index fc745a6c51..397e579ab3 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java @@ -250,13 +250,9 @@ public final class PackagingURIHelper { * Combine a string URI with a prefix and a suffix. */ public static String combine(String prefix, String suffix) { - if (!prefix.endsWith("" + FORWARD_SLASH_CHAR) - && !suffix.startsWith("" + FORWARD_SLASH_CHAR)) + if (!prefix.endsWith(FORWARD_SLASH_STRING) && !suffix.startsWith(FORWARD_SLASH_STRING)) return prefix + FORWARD_SLASH_CHAR + suffix; - else if ((!prefix.endsWith("" + FORWARD_SLASH_CHAR) - && suffix.startsWith("" + FORWARD_SLASH_CHAR) || (prefix - .endsWith("" + FORWARD_SLASH_CHAR) && !suffix.startsWith("" - + FORWARD_SLASH_CHAR)))) + else if (prefix.endsWith(FORWARD_SLASH_STRING) ^ suffix.startsWith(FORWARD_SLASH_STRING)) return prefix + suffix; else return ""; |