From 2edf3f1a4c6144f9bac6e0974bad73344f6a322d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 3 Dec 2018 11:22:19 +0100 Subject: [PATCH] Make scheme more consistent for conversion to URI --- org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java index b75189ade..a2080c546 100644 --- a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java +++ b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java @@ -259,10 +259,10 @@ public class JcrPath implements Path { if (other.startsWith(this)) { String p1 = toString(); String p2 = other.toString(); - String relative = p2.substring(p1.length(), p2.length()); - if(relative.charAt(0)=='/') + String relative = p2.substring(p1.length(), p2.length()); + if (relative.charAt(0) == '/') relative = relative.substring(1); - return new JcrPath(fs,relative); + return new JcrPath(fs, relative); } throw new IllegalArgumentException(other + " cannot be relativized against " + this); } @@ -270,7 +270,7 @@ public class JcrPath implements Path { @Override public URI toUri() { try { - return new URI("jcr", toString(), null); + return new URI(fs.provider().getScheme(), toString(), null); } catch (URISyntaxException e) { throw new JcrFsException("Cannot create URI for " + toString(), e); } -- 2.30.2