[Jtidy-cvs] SF.net SVN: jtidy:[1153] branches/CodeUpdateAndJava5

[<fg...@us...>]

Revision: 1153
          http://jtidy.svn.sourceforge.net/jtidy/?rev=1153&view=rev
Author:   fgiust
Date:     2010-11-01 11:55:40 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
Merged revisions 1144-1146,1148-1151 via svnmerge from 
https://jtidy.svn.sourceforge.net/svnroot/jtidy/trunk/jtidy

........
  r1144 | fgiust | 2010-11-01 12:11:50 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fixed expected message
........
  r1145 | fgiust | 2010-11-01 12:13:07 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fix expected message
........
  r1146 | fgiust | 2010-11-01 12:13:38 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fixed expected message
........
  r1148 | fgiust | 2010-11-01 12:14:18 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fixed expected message
........
  r1149 | fgiust | 2010-11-01 12:14:38 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fixed expected message
........
  r1150 | fgiust | 2010-11-01 12:15:08 +0100 (Mon, 01 Nov 2010) | 1 line
  
  fixed expected message
........
  r1151 | fgiust | 2010-11-01 12:22:45 +0100 (Mon, 01 Nov 2010) | 1 line
  
  update expectations (messages are changed due to a different way of detecting a missing title. The position of the message and the line number is now different but it looks ok)
........

Modified Paths:
--------------
    branches/CodeUpdateAndJava5/src/test/resources/1003994.msg
    branches/CodeUpdateAndJava5/src/test/resources/1403105.msg
    branches/CodeUpdateAndJava5/src/test/resources/427664.msg
    branches/CodeUpdateAndJava5/src/test/resources/431956.msg
    branches/CodeUpdateAndJava5/src/test/resources/433604.msg
    branches/CodeUpdateAndJava5/src/test/resources/438956.msg
    branches/CodeUpdateAndJava5/src/test/resources/480406.msg
    branches/CodeUpdateAndJava5/src/test/resources/480701.msg
    branches/CodeUpdateAndJava5/src/test/resources/616744.msg
    branches/CodeUpdateAndJava5/src/test/resources/676156.msg
    branches/CodeUpdateAndJava5/src/test/resources/788031.msg
    branches/CodeUpdateAndJava5/src/test/resources/991469.msg
    branches/CodeUpdateAndJava5/src/test/resources/991471.msg

Property Changed:
----------------
    branches/CodeUpdateAndJava5/


Property changes on: branches/CodeUpdateAndJava5
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/jtidy:1-821,1143
   + /trunk/jtidy:1-872,874-879,881-898,900-906,908-909,911,913-914,917,920,922,924,926,928-929,931,933,935,937,939-1032,1034-1093,1098,1101-1102,1105,1108-1115,1119,1124,1126-1127,1130,1133-1139,1142-1152
Modified: svn:mergeinfo
   - /trunk/jtidy:1143
   + /trunk/jtidy:1143-1151

Modified: branches/CodeUpdateAndJava5/src/test/resources/1003994.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/1003994.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/1003994.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -13,7 +13,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[1 warning, no errors were found!
-]]></text>
+    <text><![CDATA[1 warning, no errors were found!]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/1403105.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/1403105.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/1403105.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -9,13 +9,6 @@
     <text><![CDATA[missing <!DOCTYPE> declaration]]></text>
   </message>
   <message>
-    <code>17</code>
-    <level>2</level>
-    <line>1</line>
-    <column>1</column>
-    <text><![CDATA[inserting missing 'title' element]]></text>
-  </message>
-  <message>
     <code>7</code>
     <level>2</level>
     <line>1</line>
@@ -65,6 +58,13 @@
     <text><![CDATA[trimming empty <div>]]></text>
   </message>
   <message>
+    <code>17</code>
+    <level>2</level>
+    <line>1</line>
+    <column>13</column>
+    <text><![CDATA[inserting missing 'title' element]]></text>
+  </message>
+  <message>
     <code>111</code>
     <level>0</level>
     <line>1</line>

Modified: branches/CodeUpdateAndJava5/src/test/resources/427664.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/427664.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/427664.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -34,7 +34,7 @@
     <level>2</level>
     <line>5</line>
     <column>1</column>
-    <text><![CDATA[<body> attribute "width" has invalid value "align="]]></text>
+    <text><![CDATA[<body> attribute "width" has invalid value "align="""]]></text>
   </message>
   <message>
     <code>111</code>

Modified: branches/CodeUpdateAndJava5/src/test/resources/431956.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/431956.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/431956.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/433604.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/433604.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/433604.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/438956.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/438956.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/438956.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -34,7 +34,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[2 warnings, no errors were found!
-]]></text>
+    <text><![CDATA[2 warnings, no errors were found!]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/480406.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/480406.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/480406.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/480701.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/480701.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/480701.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/616744.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/616744.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/616744.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/676156.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/676156.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/676156.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -16,13 +16,6 @@
     <text><![CDATA[plain text isn't allowed in <head> elements]]></text>
   </message>
   <message>
-    <code>17</code>
-    <level>2</level>
-    <line>1</line>
-    <column>1</column>
-    <text><![CDATA[inserting missing 'title' element]]></text>
-  </message>
-  <message>
     <code>29</code>
     <level>2</level>
     <line>3</line>
@@ -30,6 +23,13 @@
     <text><![CDATA[adjacent hyphens within comment]]></text>
   </message>
   <message>
+    <code>17</code>
+    <level>2</level>
+    <line>6</line>
+    <column>1</column>
+    <text><![CDATA[inserting missing 'title' element]]></text>
+  </message>
+  <message>
     <code>111</code>
     <level>0</level>
     <line>1</line>

Modified: branches/CodeUpdateAndJava5/src/test/resources/788031.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/788031.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/788031.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -16,13 +16,6 @@
     <text><![CDATA[<body> isn't allowed in <head> elements]]></text>
   </message>
   <message>
-    <code>17</code>
-    <level>2</level>
-    <line>2</line>
-    <column>1</column>
-    <text><![CDATA[inserting missing 'title' element]]></text>
-  </message>
-  <message>
     <code>52</code>
     <level>3</level>
     <line>3</line>
@@ -30,6 +23,13 @@
     <text><![CDATA[<body> missing '>' for end of tag]]></text>
   </message>
   <message>
+    <code>17</code>
+    <level>2</level>
+    <line>7</line>
+    <column>1</column>
+    <text><![CDATA[inserting missing 'title' element]]></text>
+  </message>
+  <message>
     <code>111</code>
     <level>0</level>
     <line>1</line>

Modified: branches/CodeUpdateAndJava5/src/test/resources/991469.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/991469.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/991469.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>

Modified: branches/CodeUpdateAndJava5/src/test/resources/991471.msg
===================================================================
--- branches/CodeUpdateAndJava5/src/test/resources/991471.msg	2010-11-01 11:36:19 UTC (rev 1152)
+++ branches/CodeUpdateAndJava5/src/test/resources/991471.msg	2010-11-01 11:55:40 UTC (rev 1153)
@@ -6,7 +6,6 @@
     <level>0</level>
     <line>0</line>
     <column>0</column>
-    <text><![CDATA[no warnings or errors were found
-]]></text>
+    <text><![CDATA[no warnings or errors were found]]></text>
   </message>
 </messages>


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