From 189882ce916008146ba0532d4b02b138345657d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20Gra=C3=9Fnick?=
<georg.grassnick@mailbox.tu-dresden.de>
Date: Fri, 27 Sep 2019 21:10:30 +0200
Subject: [PATCH] Use static helper method for all space character issues
---
.../brailleplot/configparser/ConfigurationParser.java | 9 +++------
.../inf/mci/brailleplot/util/GeneralResource.java | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
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 c4418e22..4fbe752f 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 7d36ea2d..fb3c9b37 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) {
--
GitLab