[Jtidy-cvs] SF.net SVN: jtidy:[1185] branches/CodeUpdateAndJava5/src/main

[<ad...@us...>]

Revision: 1185
          http://jtidy.svn.sourceforge.net/jtidy/?rev=1185&view=rev
Author:   aditsu
Date:     2010-11-13 20:18:23 +0000 (Sat, 13 Nov 2010)

Log Message:
-----------
fixed test 655338 - added checks for xml declaration, and SPACE_PRECEDING_XMLDECL message

Modified Paths:
--------------
    branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Lexer.java
    branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java
    branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
    branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties

Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Lexer.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Lexer.java	2010-11-13 19:56:05 UTC (rev 1184)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Lexer.java	2010-11-13 20:18:23 UTC (rev 1185)
@@ -3813,4 +3813,12 @@
         report.error(this, null, null, ErrorCode.MALFORMED_DOCTYPE);
         return null;
     }
+
+	public Node findXmlDecl() {
+		Node node = root.content;
+	    while (node != null && node.type != NodeType.XmlDecl) {
+	    	node = node.next;
+	    }
+	    return node;
+	}
 }

Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java	2010-11-13 19:56:05 UTC (rev 1184)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java	2010-11-13 20:18:23 UTC (rev 1185)
@@ -3503,6 +3503,16 @@
 
         while ((node = lexer.getToken(Lexer.IGNORE_WHITESPACE)) != null)
         {
+        	if (node.type == NodeType.XmlDecl) {
+                if (lexer.findXmlDecl() != null && lexer.root.content != null) {
+                    lexer.report.warning(lexer, lexer.root, node, ErrorCode.DISCARDING_UNEXPECTED);
+                    continue;
+                }
+                if (node.line != 1 || node.column != 1) {
+                	lexer.report.warning(lexer, lexer.root, node, ErrorCode.SPACE_PRECEDING_XMLDECL);
+                }
+            }
+        	
             // deal with comments etc.
             if (Node.insertMisc(document, node))
             {

Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java	2010-11-13 19:56:05 UTC (rev 1184)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java	2010-11-13 20:18:23 UTC (rev 1185)
@@ -806,7 +806,8 @@
                 messageLexer(lexer, Level.WARNING, code, getTagName(element));
                 break;
 
-            case MISSING_DOCTYPE :
+            case MISSING_DOCTYPE:
+            case SPACE_PRECEDING_XMLDECL:
                 messageLexer(lexer, Level.WARNING, code);
                 break;
                 

Modified: branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties
===================================================================
--- branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties	2010-11-13 19:56:05 UTC (rev 1184)
+++ branches/CodeUpdateAndJava5/src/main/resources/org/w3c/tidy/TidyMessages.properties	2010-11-13 20:18:23 UTC (rev 1185)
@@ -97,6 +97,7 @@
 replacing_unex_element=replacing unexpected {0} by {1}
 report_version=Document content looks like {0}
 slides_found={0,number} Slides found
+space_preceding_xmldecl = removing whitespace preceding XML Declaration
 suspected_missing_quote=missing quotemark for attribute value
 tag_not_allowed_in={0} isn''t allowed in <{1}> elements
 too_many_elements=too many {0} elements


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.