You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/07/06 21:48:08 UTC
svn commit: r554016 -
/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
Author: alally
Date: Fri Jul 6 12:48:07 2007
New Revision: 554016
URL: http://svn.apache.org/viewvc?view=rev&rev=554016
Log:
Fix problem with spaces in component descriptor file paths
UIMA-491: https://issues.apache.org/jira/browse/UIMA-491
Modified:
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java?view=diff&rev=554016&r1=554015&r2=554016
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java Fri Jul 6 12:48:07 2007
@@ -981,7 +981,7 @@
//don't touch URLs with protocol other than file:
if ("file".equals(descUrl.getProtocol())) {
- File descFile = new File(new URI(descUrl.toString()));
+ File descFile = urlToFile(descUrl);
//try to find relative path from cpeDescSaveFile to descFile
String relPath = FileUtils.findRelativePath(descFile, cpeDescSaveFile.getParentFile());
if (relPath != null) {
@@ -994,6 +994,17 @@
}
}
+ /**
+ * Utility method for convertion a URL to a File name, taking care of
+ * proper escaping.
+ * @param url a URL
+ * @return File corresponding to that URL
+ */
+ private File urlToFile(URL url) throws URISyntaxException {
+ String urlString = url.toString().replaceAll(" ", "%20");
+ return new File(new URI(urlString));
+ }
+
private void displayProgress() {
if (mCPE != null) {
try {
@@ -1238,7 +1249,7 @@
return false;
}
try {
- specifierFile = new File(new URI(specifierUrl.toString())).toString();
+ specifierFile = urlToFile(specifierUrl).toString();
} catch (URISyntaxException e) {
displayError(e);
return false;
@@ -1298,7 +1309,7 @@
return false;
}
try {
- specifierFile = new File(new URI(specifierUrl.toString())).toString();
+ specifierFile = urlToFile(specifierUrl).toString();
} catch (URISyntaxException e) {
displayError(e);
return false;
@@ -1372,7 +1383,7 @@
}
File f;
try {
- f = new File(new URI(aeSpecifierUrl.toString()));
+ f = urlToFile(aeSpecifierUrl);
} catch (URISyntaxException e) {
displayError(e);
return false;
@@ -1428,7 +1439,7 @@
}
File f;
try {
- f = new File(new URI(consumerSpecifierUrl.toString()));
+ f = urlToFile(consumerSpecifierUrl);
} catch (URISyntaxException e) {
displayError(e);
return false;