From f7759a47067afc709383b42043c57f70744f2029 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 27 Jan 2018 17:57:33 +0000
Subject: Extract ZipPaths for splitting and joining zip paths

---
 .../java/org/zwobble/mammoth/internal/docx/DocumentReader.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java')

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 727731e..b506d99 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -1,6 +1,7 @@
 package org.zwobble.mammoth.internal.docx;
 
 import org.zwobble.mammoth.internal.archives.Archive;
+import org.zwobble.mammoth.internal.archives.ZipPaths;
 import org.zwobble.mammoth.internal.documents.Comment;
 import org.zwobble.mammoth.internal.documents.Document;
 import org.zwobble.mammoth.internal.documents.Notes;
@@ -16,7 +17,6 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 
 import static org.zwobble.mammoth.internal.util.Lists.*;
-import static org.zwobble.mammoth.internal.util.Strings.split;
 import static org.zwobble.mammoth.internal.util.Strings.trimLeft;
 
 public class DocumentReader {
@@ -126,11 +126,8 @@ public class DocumentReader {
     }
 
     private static String findRelationshipsPathFor(String name) {
-        List<String> parts = split(name, "/");
-        return String.join("/", eagerConcat(
-            parts.subList(0, parts.size() - 1),
-            list("_rels/" + parts.get(parts.size() - 1) + ".rels")
-        ));
+        ZipPaths.SplitPath parts = ZipPaths.splitPath(name);
+        return ZipPaths.joinPath(parts.getDirname(), "_rels", parts.getBasename() + ".rels");
     }
 
     private static Optional<XmlElement> tryParseOfficeXml(Archive zipFile, String name) {
-- 
cgit v1.2.3