Output HTML DOCTYPE correctly from HtmlAssetTranslator

marcuswangyb · Mar 13, 2014 · a63638a · a63638a
1 parent 0de9db4
commit a63638a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java b/javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java
@@ -30,13 +30,15 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -200,7 +202,10 @@ private static void translateOneFile(String language,
 
     DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
     LSSerializer writer = impl.createLSSerializer();
-    writer.writeToURI(document, destFile.toUri().toString());
+    String fileAsString = writer.writeToString(document);
+    // Replace default XML header with HTML DOCTYPE
+    fileAsString = fileAsString.replaceAll("<\\?xml[^>]+>", "<!DOCTYPE HTML>");
+    Files.write(destFile, Collections.singleton(fileAsString), StandardCharsets.UTF_8);
   }
 
   private static boolean shouldTranslate(Node node) {