[132898] Many Java files have illegal UTF-8 characters in them
diff --git a/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..6f0f54e
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+#Thu Mar 23 02:41:04 EST 2006
+eclipse.preferences.version=1
+encoding//src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java=ISO-8859-1
+encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
index 330480c..32d20db 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
@@ -171,15 +171,13 @@
 			IDOMNode eachAttr = (IDOMNode) attributes.item(i);
 			String oldAttrName = eachAttr.getNodeName();
 			String newAttrName = oldAttrName;
-			// 254961 - all HTML tag names and attribute names should be in
-			// English
-			// even for HTML files in other languages like Japanese or
-			// Turkish.
-			// English locale should be used to convert between uppercase and
-			// lowercase
-			// (otherwise "link" would be converted to "L�NK" in Turkish,
-			// where '?' in "L�NK"
-			// is the "I Overdot Capital" in Turkish).
+			/*
+			 * 254961 - all HTML tag names and attribute names should be in
+			 * English even for HTML files in other languages like Japanese or
+			 * Turkish. English locale should be used to convert between
+			 * uppercase and lowercase (otherwise "link" would be converted to
+			 * Turkish "I Overdot Capital").
+			 */
 			if (attrNameCase == HTMLCorePreferenceNames.LOWER)
 				newAttrName = oldAttrName.toLowerCase(Locale.US);
 			else if (attrNameCase == HTMLCorePreferenceNames.UPPER)
@@ -214,14 +212,13 @@
 		String newTagName = oldTagName;
 		IDOMNode newNode = node;
 
-		// 254961 - all HTML tag names and attribute names should be in
-		// English
-		// even for HTML files in other languages like Japanese or Turkish.
-		// English locale should be used to convert between uppercase and
-		// lowercase
-		// (otherwise "link" would be converted to "L�NK" in Turkish, where
-		// '?' in "L�NK"
-		// is the "I Overdot Capital" in Turkish).
+		/*
+		 * 254961 - all HTML tag names and attribute names should be in
+		 * English even for HTML files in other languages like Japanese or
+		 * Turkish. English locale should be used to convert between uppercase
+		 * and lowercase (otherwise "link" would be converted to Turkish "I
+		 * Overdot Capital").
+		 */
 		if (tagNameCase == HTMLCorePreferenceNames.LOWER)
 			newTagName = oldTagName.toLowerCase(Locale.US);
 		else if (tagNameCase == HTMLCorePreferenceNames.UPPER)
@@ -661,12 +658,14 @@
 
 
 	protected ModelQuery getModelQuery(Node node) {
+		ModelQuery result = null;
 		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			return ModelQueryUtil.getModelQuery((Document) node);
+			result = ModelQueryUtil.getModelQuery((Document) node);
 		}
 		else {
-			return ModelQueryUtil.getModelQuery(node.getOwnerDocument());
+			result = ModelQueryUtil.getModelQuery(node.getOwnerDocument());
 		}
+		return result;
 	}
 
 	protected List getRequiredAttrs(Node node) {