From: Nick Clarke <memorius@gmail.com>
Date: Mon, 19 Jul 2010 15:02:04 +0000 (+1200)
Subject: Change generation of files/paths in xml dir to use FileManager
X-Git-Tag: version0.1.1~443
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=77a42db3804daa3199c0b7e4ab8fe612396c93a3

Change generation of files/paths in xml dir to use FileManager
---

diff --git a/src/cx/fbn/nevernote/evernote/EnmlConverter.java b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
index 29b4ef7..a6359a1 100644
--- a/src/cx/fbn/nevernote/evernote/EnmlConverter.java
+++ b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
@@ -135,7 +135,7 @@ public class EnmlConverter {
 		// fail if the user doesn't have internet connectivity.  The local copy
 		// also contains the 3 other PUBLIC definitions at the beginning of the dtd.
 		newContent = v.getValue();
-		File dtdFile = new File(Global.getDirectoryPath()+"xml/enml2.dtd");
+		File dtdFile = Global.getFileManager().getXMLDirFile("enml2.dtd");
 		String dtd = dtdFile.toURI().toString();
 		newContent = newContent.replace("<!DOCTYPE en-note SYSTEM \'http://xml.evernote.com/pub/enml2.dtd'>", 
 				"<!DOCTYPE en-note SYSTEM \"" +dtd +"\">");
diff --git a/src/cx/fbn/nevernote/xml/XMLNoteRepair.java b/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
index 0818de8..8fec2bc 100644
--- a/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
+++ b/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
@@ -42,7 +42,7 @@ public class XMLNoteRepair {
 		XMLNoteRepairHandler handler = new XMLNoteRepairHandler();
 		
 		// Replace DTD with local copy in case we are not connected
-		File dtdFile = new File(Global.getDirectoryPath()+"xml/enml2.dtd");
+		File dtdFile = Global.getFileManager().getXMLDirFile("enml2.dtd");
 		String dtd = dtdFile.toURI().toString();
 		xmlData = xmlData.replace("<!DOCTYPE en-note SYSTEM \'http://xml.evernote.com/pub/enml2.dtd'>", 
 				"<!DOCTYPE en-note SYSTEM \"" +dtd +"\">");