commit b90f6fd9f0e406e8cf5efd8d28ad67535b04b4c7
author Kentarou Fukuda <kentarou@jp.ibm.com> Sun Mar 27 23:52:54 2016 +0900
committer Kentarou Fukuda <kentarou@jp.ibm.com> Sun Mar 27 23:52:54 2016 +0900
tree 1a9f488ce51b6d429e6579a527ab4e2e3b331db5
parent 5a9f71f3dac635e056f17ef19fc8d28f6f250e23

Bug 489096 - HTML5 support 

plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/dom/DomPrintUtil.java

diff --git a/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/dom/DomPrintUtil.java b/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/dom/DomPrintUtil.java
index 9cd80c1..224bfe9 100644
--- a/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/dom/DomPrintUtil.java
+++ b/plugins/org.eclipse.actf.core/src/org/eclipse/actf/util/dom/DomPrintUtil.java
@@ -49,7 +49,8 @@
 	private static final String ESC_GT = ">";
 	private static final String ESC_AMP = "&";
 
-	private Document document;
+	private Document document = null;
+	private Node rootNode = null;
 	private int whatToShow = NodeFilter.SHOW_ALL;
 	private NodeFilter nodeFilter = null;
 	private boolean entityReferenceExpansion = false;
@@ -88,6 +89,16 @@
 		this.document = document;
 	}
 
+	/**
+	 * Constructor of DOM print utility.
+	 * 
+	 * @param root
+	 *            Node the target root Node
+	 */
+	public DomPrintUtil(Node rootNode) {
+		this.rootNode = rootNode;
+	}
+
 	private String getXMLString(String targetS) {
 		return targetS.replaceAll(AMP, ESC_AMP).replaceAll(LT, ESC_LT).replaceAll(GT, ESC_GT);
 	}
@@ -123,7 +134,12 @@
 	public String toXMLString() {
 		StringBuffer tmpSB = new StringBuffer(8192);
 
-		TreeWalkerImpl treeWalker = new TreeWalkerImpl(document, whatToShow, nodeFilter, entityReferenceExpansion);
+		TreeWalkerImpl treeWalker;
+		if (document != null) {
+			treeWalker = new TreeWalkerImpl(document, whatToShow, nodeFilter, entityReferenceExpansion);
+		} else {
+			treeWalker = new TreeWalkerImpl(rootNode, whatToShow, nodeFilter, entityReferenceExpansion);
+		}
 
 		String lt = escapeTagBracket ? ESC_LT : LT;
 		String gt = escapeTagBracket ? ESC_GT : GT;
@@ -416,7 +432,14 @@
 	 * @throws IOException
 	 */
 	public void writeToFile(File file, String encode) throws IOException {
-		PrintWriter tmpPW = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), encode));
+		FileOutputStream FOS = new FileOutputStream(file);
+		PrintWriter tmpPW = new PrintWriter(new OutputStreamWriter(FOS, encode));
+		//BOM
+		if (isHTML5 && encode.equals(UTF8)) {
+			FOS.write(0xef);
+			FOS.write(0xbb);
+			FOS.write(0xbf);
+		}
 		tmpPW.println(toXMLString());
 		tmpPW.flush();
 		tmpPW.close();