diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationParser.java b/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationParser.java index c4418e2267847af84f1b5e25379c2326e5a73e94..4fbe752ff0ef1bdf738506e0166160e29c988855 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationParser.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationParser.java @@ -1,5 +1,6 @@ package de.tudresden.inf.mci.brailleplot.configparser; +import de.tudresden.inf.mci.brailleplot.util.UrlHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -265,11 +266,7 @@ public abstract class ConfigurationParser { * @return The String representation of the path of a URL where the leading {@literal "}file:{@literal "} prefix is stripped. */ private static String getPath(final URL url) throws ConfigurationParsingException { - try { - String urlString = URLDecoder.decode(url.getPath(), "UTF-8"); - return urlString.replaceAll("^file:", ""); - } catch (UnsupportedEncodingException e) { - throw new ConfigurationParsingException("Could not decode URL", e); - } + String urlString = UrlHelper.getPathString(url); + return urlString.replaceAll("^file:", ""); } } diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/util/GeneralResource.java b/src/main/java/de/tudresden/inf/mci/brailleplot/util/GeneralResource.java index 7d36ea2d3064ae68c1502058cef33165007f7a16..fb3c9b371f090a02e1ea3a5a666fa22896f43623 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/util/GeneralResource.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/util/GeneralResource.java @@ -190,7 +190,7 @@ public final class GeneralResource { throw new IllegalStateException("Not running from jar."); } URL jarUrl = getClassRef().getProtectionDomain().getCodeSource().getLocation(); - String jarPath = URLDecoder.decode(jarUrl.getPath(), "UTF-8"); + String jarPath = UrlHelper.getPathString(jarUrl); File jarFile = new File(jarPath); return new JarFile(jarFile); } catch (Exception e) {