Author: pkluegl
Date: Fri Mar 28 09:15:58 2014
New Revision: 1582646
URL: http://svn.apache.org/r1582646
Log:
UIMA-3269
- fixed workaround that actually did not work at all
Modified:
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
Modified:
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java?rev=1582646&r1=1582645&r2=1582646&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
Fri Mar 28 09:15:58 2014
@@ -162,11 +162,15 @@ public class RutaSimpleBuilder {
String absoluteLocation = each.getSourceUrlString();
import_impl.setLocation(absoluteLocation);
} else {
- if (!url.getPath().substring(0,
2).equals(typeSystemOutput.substring(0, 2))) {
+ String path = url.getPath();
+ String relativeLocation = getRelativeLocation(path,
typeSystemOutput);
+ File parentFile = new File(typeSystemOutput).getParentFile();
+ File targetFile = new File(parentFile, relativeLocation);
+ boolean ableToFindFile = targetFile.exists();
+ if (!ableToFindFile) {
// hotfix for different partitions making trouble for the
relative path
import_impl.setName(eachName);
} else {
- String relativeLocation = getRelativeLocation(url.getPath(),
typeSystemOutput);
import_impl.setLocation(relativeLocation);
}
}