Author: onealj
Date: Wed Oct 18 08:10:36 2017
New Revision: 1812468
URL: http://svn.apache.org/viewvc?rev=1812468&view=rev
Log:
simplfy PackagingURIHelper#combine boolean logic using xor and replacing
+FORWARD_SLASH_CHAR with FORWARD_SLASH_STRING
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1812468&r1=1812467&r2=1812468&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Wed Oct 18 08:10:36 2017
@@ -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 "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
