[DL-Learner SVN] SF.net SVN: dl-learner:[3436] trunk

[<lor...@us...>]

Revision: 3436
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3436&view=rev
Author:   lorenz_b
Date:     2011-11-24 12:19:01 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Changes to be able to load conf files under. Windows .

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
    trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
    trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserConfiguration.java

Modified: trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java	2011-11-24 12:17:25 UTC (rev 3435)
+++ trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java	2011-11-24 12:19:01 UTC (rev 3436)
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.LinkedList;
 
@@ -100,7 +101,7 @@
                     /** Leave it as is */
                     kb = KBParser.parseKBFile(getUrl());
                 } else {
-                    File f = new File(baseDir, getUrl());
+                    File f = new File(new URI(baseDir + File.separator + getUrl()));
                     setUrl(f.toURI().toString());
                     kb = KBParser.parseKBFile(f);
                 }
@@ -114,7 +115,9 @@
             throw new ComponentInitException("KB file " + getUrl() + " could not be parsed correctly.", e);
         }catch (FileNotFoundException e) {
             throw new ComponentInitException("KB file " + getUrl() + " could not be found.", e);
-        }
+        } catch (URISyntaxException e) {
+        	throw new ComponentInitException("KB file " + getUrl() + " could not be found.", e);
+		}
     }
 
 	/*

Modified: trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java	2011-11-24 12:17:25 UTC (rev 3435)
+++ trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java	2011-11-24 12:19:01 UTC (rev 3436)
@@ -127,7 +127,8 @@
 
         } else if (url == null) {
             try {
-                url = new URL("file://" + baseDir + "/" + fileName);
+//              url = new URL("file://" + baseDir + "/" + fileName);
+          	 url = new URL(baseDir + "/" + fileName);
             } catch (MalformedURLException e) {
                 throw new RuntimeException(e);
             }

Modified: trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserConfiguration.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserConfiguration.java	2011-11-24 12:17:25 UTC (rev 3435)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserConfiguration.java	2011-11-24 12:19:01 UTC (rev 3436)
@@ -29,7 +29,8 @@
 
     public ConfParserConfiguration(Resource source) {
         try {
-            baseDir = source.getFile().getAbsoluteFile().getParent();
+//          baseDir = source.getFile().getAbsoluteFile().getParent();
+        	baseDir = source.getFile().getParentFile().toURI().toString();
             parser = new ConfParser(source.getInputStream());
             parser.Start();
         } catch (ParseException e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.