Merge pull request #13 from bargru/master

convert windows string filepaths to java compatible string filepaths
xmlet · Oct 1, 2019 · 22b0310 · 22b0310
2 parents 778c9a5 + 8474d28
commit 22b0310
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/xmlet/xsdparser/core/XsdParser.java b/src/main/java/org/xmlet/xsdparser/core/XsdParser.java
@@ -79,14 +79,14 @@ private void parseFile(String filePath) {
                     filePath  = parentFile.substring(0, parentFile.lastIndexOf('/') + 1).concat(filePath);
 
                     if (!new File(filePath).exists()) {
-                        throw new FileNotFoundException();
+                        throw new FileNotFoundException(filePath);
                     }
                 } else {
-                    throw new FileNotFoundException();
+                    throw new FileNotFoundException(filePath);
                 }
             }
 
-            this.currentFile = filePath;
+            this.currentFile = filePath.replace("\\", "/");
 
             XsdSchema.parse(this, getSchemaNode(filePath));
         } catch (SAXException | IOException | ParserConfigurationException e) {

diff --git a/src/main/java/org/xmlet/xsdparser/core/XsdParserJar.java b/src/main/java/org/xmlet/xsdparser/core/XsdParserJar.java
@@ -65,7 +65,7 @@ private void parse(String jarPath, String filePath){
      */
     private void parseJarFile(String filePath) {
         //https://www.mkyong.com/java/how-to-read-xml-file-in-java-dom-parser/
-        this.currentFile = filePath;
+        this.currentFile = filePath.replace("\\", "/");
         InputStream inputStream = classLoader.getResourceAsStream(filePath);
 
         try {