X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FDefaultImageManager.java;h=6c4a870c49752f26731be354a492e49d7260d7da;hp=c9a3e2291eb1f828a63d14bb30cb9a3d20ef232e;hb=ecf8ab7382eadecab5a93261f261d0fd2168ffa8;hpb=061371ee55c9593b16be0f589d9772802ebdd102 diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java index c9a3e2291..6c4a870c4 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java @@ -11,11 +11,8 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.StringTokenizer; import javax.jcr.Binary; import javax.jcr.Node; @@ -155,22 +152,7 @@ public class DefaultImageManager implements CmsImageManager { /** @return null if not available */ @Override public String getImageUrl(Node node) throws RepositoryException { - return getCleanDataPath(node); - } - - /** Clean special character from the URL. */ - protected String getCleanDataPath(Node node) throws RepositoryException { - String path = CmsUiUtils.getDataPath(node); - StringTokenizer st = new StringTokenizer(path, "/"); - StringBuilder sb = new StringBuilder(); - while (st.hasMoreElements()) { - sb.append('/'); - String encoded = URLEncoder.encode(st.nextToken(), StandardCharsets.UTF_8); - encoded = encoded.replace("+", "%20"); - sb.append(encoded); - - } - return sb.toString(); + return CmsUiUtils.getDataPathForUrl(node); } protected String getResourceName(Node node) throws RepositoryException {