Menu
▾
▴
jtidy-cvs
|
From: <ad...@us...> - 2010-11-06 13:05:00
|
Revision: 1170
http://jtidy.svn.sourceforge.net/jtidy/?rev=1170&view=rev
Author: aditsu
Date: 2010-11-06 13:04:54 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
changed all formerly null message levels to SUMMARY, and modified message processing methods to treat it as before (not outputting the level name and line/column numbers), to keep compatibility with Tidy
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-06 12:47:21 UTC (rev 1169)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-06 13:04:54 UTC (rev 1170)
@@ -292,7 +292,7 @@
boolean go = updateCount(lexer, level);
if (go) {
String position = line > 0 && col > 0 ? getPosition(lexer, line, col) : "";
- String prefix = level == null ? "" : (level + ": ");
+ String prefix = level == Level.SUMMARY ? "" : (level + ": ");
String messageString = MessageFormat.format(res.getString(messageKey), args);
if (listener != null) {
TidyMessage msg = new TidyMessage(errorCode, line, col, level, messageString);
@@ -342,7 +342,7 @@
private void messageLexer(final int errorCode, final Lexer lexer, final Level level, final String messageKey,
final Object... params) {
- final boolean b = lexer != null && level != null;
+ final boolean b = lexer != null && level != Level.SUMMARY;
messagePos(errorCode, lexer, level, b ? lexer.lines : 0, b ? lexer.columns : 0, messageKey, params);
}
@@ -936,27 +936,27 @@
{
if ((lexer.badAccess & MISSING_SUMMARY) != 0)
{
- messageLexer(MISSING_SUMMARY, lexer, Level.WARNING, "badaccess_missing_summary");
+ messageLexer(MISSING_SUMMARY, lexer, Level.SUMMARY, "badaccess_missing_summary");
}
if ((lexer.badAccess & MISSING_IMAGE_ALT) != 0)
{
- messageLexer(MISSING_IMAGE_ALT, lexer, Level.WARNING, "badaccess_missing_image_alt");
+ messageLexer(MISSING_IMAGE_ALT, lexer, Level.SUMMARY, "badaccess_missing_image_alt");
}
if ((lexer.badAccess & MISSING_IMAGE_MAP) != 0)
{
- messageLexer(MISSING_IMAGE_MAP, lexer, Level.WARNING, "badaccess_missing_image_map");
+ messageLexer(MISSING_IMAGE_MAP, lexer, Level.SUMMARY, "badaccess_missing_image_map");
}
if ((lexer.badAccess & MISSING_LINK_ALT) != 0)
{
- messageLexer(MISSING_LINK_ALT, lexer, Level.WARNING, "badaccess_missing_link_alt");
+ messageLexer(MISSING_LINK_ALT, lexer, Level.SUMMARY, "badaccess_missing_link_alt");
}
if (((lexer.badAccess & USING_FRAMES) != 0) && ((lexer.badAccess & USING_NOFRAMES) == 0))
{
- messageLexer(USING_FRAMES, lexer, Level.WARNING, "badaccess_frames");
+ messageLexer(USING_FRAMES, lexer, Level.SUMMARY, "badaccess_frames");
}
messageLexer(lexer, Level.SUMMARY, lexer.configuration.isTidyCompat() ? BADACCESS_SUMMARY_BAD
@@ -1018,7 +1018,7 @@
*/
public void needsAuthorIntervention(PrintWriter errout)
{
- printMessage(errout, Level.INFO, "needs_author_intervention");
+ printMessage(errout, Level.SUMMARY, "needs_author_intervention");
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-07 17:19:44
|
Revision: 1182
http://jtidy.svn.sourceforge.net/jtidy/?rev=1182&view=rev
Author: aditsu
Date: 2010-11-07 17:19:38 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
fixed test 473490 - process warnings even if showWarnings is false, to update the count
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-07 17:03:12 UTC (rev 1181)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-07 17:19:38 UTC (rev 1182)
@@ -690,136 +690,132 @@
return;
}
- if (lexer.configuration.isShowWarnings())
- {
- switch (code)
- {
- case MISSING_ENDTAG_FOR :
- messageNode(lexer, Level.WARNING, rpt, code, element.element);
- break;
+ switch (code) {
+ case MISSING_ENDTAG_FOR :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element);
+ break;
- case MISSING_ENDTAG_BEFORE :
- messageNode(lexer, Level.WARNING, rpt, code, element.element, nodedesc);
- break;
+ case MISSING_ENDTAG_BEFORE :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element, nodedesc);
+ break;
- case DISCARDING_UNEXPECTED :
- if (lexer.badForm == 0)
- {
- // the case for when this is an error not a warning, is handled later
- messageLexer(
- lexer,
- Level.WARNING,
- code,
- getTagName(node));
- }
- break;
-
- case NESTED_EMPHASIS :
- messageLexer(lexer, Level.INFO, code, getTagName(node));
- break;
-
- case COERCE_TO_ENDTAG :
- messageNode(lexer, Level.WARNING, rpt, code, element.element);
- break;
-
- case NON_MATCHING_ENDTAG :
+ case DISCARDING_UNEXPECTED :
+ if (lexer.badForm == 0)
+ {
+ // the case for when this is an error not a warning, is handled later
messageLexer(
lexer,
Level.WARNING,
code,
- getTagName(node), element.element);
- break;
+ getTagName(node));
+ }
+ break;
- case TAG_NOT_ALLOWED_IN :
- messageNode(lexer, Level.WARNING, node, code, nodedesc, element.element);
- if (lexer.configuration.isShowWarnings()) {
- messageNode(lexer, Level.INFO, element, PREVIOUS_LOCATION, element.element);
- }
- break;
+ case NESTED_EMPHASIS :
+ messageLexer(lexer, Level.INFO, code, getTagName(node));
+ break;
- case DOCTYPE_AFTER_TAGS :
- messageLexer(lexer, Level.WARNING, code);
- break;
+ case COERCE_TO_ENDTAG :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element);
+ break;
- case MISSING_STARTTAG :
- case UNEXPECTED_ENDTAG :
- case TOO_MANY_ELEMENTS :
- case INSERTING_TAG :
- messageNode(lexer, Level.WARNING, node, code, node.element);
- break;
+ case NON_MATCHING_ENDTAG :
+ messageLexer(
+ lexer,
+ Level.WARNING,
+ code,
+ getTagName(node), element.element);
+ break;
- case USING_BR_INPLACE_OF :
- case CANT_BE_NESTED :
- case PROPRIETARY_ELEMENT :
- messageNode(lexer, Level.WARNING, node, code, nodedesc);
- break;
+ case TAG_NOT_ALLOWED_IN :
+ messageNode(lexer, Level.WARNING, node, code, nodedesc, element.element);
+ if (lexer.configuration.isShowWarnings()) {
+ messageNode(lexer, Level.INFO, element, PREVIOUS_LOCATION, element.element);
+ }
+ break;
- case OBSOLETE_ELEMENT :
- messageLexer(lexer, Level.WARNING, code,
- getTagName(element),
- getTagName(node));
- break;
+ case DOCTYPE_AFTER_TAGS :
+ messageLexer(lexer, Level.WARNING, code);
+ break;
- case UNESCAPED_ELEMENT :
- messageLexer(lexer, Level.WARNING, code, getTagName(element));
- break;
+ case MISSING_STARTTAG :
+ case UNEXPECTED_ENDTAG :
+ case TOO_MANY_ELEMENTS :
+ case INSERTING_TAG :
+ messageNode(lexer, Level.WARNING, node, code, node.element);
+ break;
- case TRIM_EMPTY_ELEMENT :
- messageNode(lexer, Level.WARNING, element, code, getTagName(element));
- break;
+ case USING_BR_INPLACE_OF :
+ case CANT_BE_NESTED :
+ case PROPRIETARY_ELEMENT :
+ messageNode(lexer, Level.WARNING, node, code, nodedesc);
+ break;
- case ILLEGAL_NESTING :
- messageLexer(lexer, Level.WARNING, code, getTagName(element));
- break;
+ case OBSOLETE_ELEMENT :
+ messageLexer(lexer, Level.WARNING, code,
+ getTagName(element),
+ getTagName(node));
+ break;
- case NOFRAMES_CONTENT :
- messageLexer(lexer, Level.WARNING, code, getTagName(node));
- break;
+ case UNESCAPED_ELEMENT :
+ messageLexer(lexer, Level.WARNING, code, getTagName(element));
+ break;
- case MISSING_TITLE_ELEMENT :
- case INCONSISTENT_VERSION :
- case MALFORMED_DOCTYPE :
- case CONTENT_AFTER_BODY :
- case MALFORMED_COMMENT :
- case BAD_COMMENT_CHARS :
- case BAD_XML_COMMENT :
- case BAD_CDATA_CONTENT :
- case INCONSISTENT_NAMESPACE :
- case DTYPE_NOT_UPPER_CASE :
- messageNode(lexer, Level.WARNING, rpt, code);
- break;
+ case TRIM_EMPTY_ELEMENT :
+ messageNode(lexer, Level.WARNING, element, code, getTagName(element));
+ break;
- case UNEXPECTED_END_OF_FILE :
- // on end of file adjust reported position to end of input
- lexer.lines = lexer.in.getCurline();
- lexer.columns = lexer.in.getCurcol();
- messageLexer(
- lexer,
- Level.WARNING,
- code,
- getTagName(element));
- break;
+ case ILLEGAL_NESTING :
+ messageLexer(lexer, Level.WARNING, code, getTagName(element));
+ break;
- case NESTED_QUOTATION :
- messageNode(lexer, Level.WARNING, rpt, code);
- break;
+ case NOFRAMES_CONTENT :
+ messageLexer(lexer, Level.WARNING, code, getTagName(node));
+ break;
- case ELEMENT_NOT_EMPTY :
- messageLexer(lexer, Level.WARNING, code, getTagName(element));
- break;
+ case MISSING_TITLE_ELEMENT :
+ case INCONSISTENT_VERSION :
+ case MALFORMED_DOCTYPE :
+ case CONTENT_AFTER_BODY :
+ case MALFORMED_COMMENT :
+ case BAD_COMMENT_CHARS :
+ case BAD_XML_COMMENT :
+ case BAD_CDATA_CONTENT :
+ case INCONSISTENT_NAMESPACE :
+ case DTYPE_NOT_UPPER_CASE :
+ messageNode(lexer, Level.WARNING, rpt, code);
+ break;
- case MISSING_DOCTYPE :
- messageLexer(lexer, Level.WARNING, code);
- break;
-
- case REPLACING_ELEMENT:
- case REPLACING_UNEX_ELEMENT:
- messageNode(lexer, Level.WARNING, rpt, code, getTagName(element), nodedesc);
- break;
+ case UNEXPECTED_END_OF_FILE :
+ // on end of file adjust reported position to end of input
+ lexer.lines = lexer.in.getCurline();
+ lexer.columns = lexer.in.getCurcol();
+ messageLexer(
+ lexer,
+ Level.WARNING,
+ code,
+ getTagName(element));
+ break;
- default :
- break;
- }
+ case NESTED_QUOTATION :
+ messageNode(lexer, Level.WARNING, rpt, code);
+ break;
+
+ case ELEMENT_NOT_EMPTY :
+ messageLexer(lexer, Level.WARNING, code, getTagName(element));
+ break;
+
+ case MISSING_DOCTYPE :
+ messageLexer(lexer, Level.WARNING, code);
+ break;
+
+ case REPLACING_ELEMENT:
+ case REPLACING_UNEX_ELEMENT:
+ messageNode(lexer, Level.WARNING, rpt, code, getTagName(element), nodedesc);
+ break;
+
+ default :
+ break;
}
if ((code == DISCARDING_UNEXPECTED) && lexer.badForm != 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-13 20:45:04
|
Revision: 1186
http://jtidy.svn.sourceforge.net/jtidy/?rev=1186&view=rev
Author: aditsu
Date: 2010-11-13 20:44:58 +0000 (Sat, 13 Nov 2010)
Log Message:
-----------
rearranged cases in the warning method to match the C code
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-13 20:18:23 UTC (rev 1185)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-13 20:44:58 UTC (rev 1186)
@@ -692,58 +692,23 @@
}
switch (code) {
- case MISSING_ENDTAG_FOR :
- messageNode(lexer, Level.WARNING, rpt, code, element.element);
+ case NESTED_QUOTATION :
+ messageNode(lexer, Level.WARNING, rpt, code);
break;
- case MISSING_ENDTAG_BEFORE :
- messageNode(lexer, Level.WARNING, rpt, code, element.element, nodedesc);
+ case OBSOLETE_ELEMENT :
+ messageLexer(lexer, Level.WARNING, code, getTagName(element), getTagName(node));
break;
- case DISCARDING_UNEXPECTED :
- if (lexer.badForm == 0)
- {
- // the case for when this is an error not a warning, is handled later
- messageLexer(
- lexer,
- Level.WARNING,
- code,
- getTagName(node));
- }
- break;
-
case NESTED_EMPHASIS :
messageLexer(lexer, Level.INFO, code, getTagName(node));
break;
- case COERCE_TO_ENDTAG :
- messageNode(lexer, Level.WARNING, rpt, code, element.element);
- break;
-
- case NON_MATCHING_ENDTAG :
- messageLexer(
- lexer,
- Level.WARNING,
- code,
- getTagName(node), element.element);
- break;
-
- case TAG_NOT_ALLOWED_IN :
- messageNode(lexer, Level.WARNING, node, code, nodedesc, element.element);
- if (lexer.configuration.isShowWarnings()) {
- messageNode(lexer, Level.INFO, element, PREVIOUS_LOCATION, element.element);
- }
- break;
-
- case DOCTYPE_AFTER_TAGS :
- messageLexer(lexer, Level.WARNING, code);
- break;
-
case MISSING_STARTTAG :
case UNEXPECTED_ENDTAG :
case TOO_MANY_ELEMENTS :
case INSERTING_TAG :
- messageNode(lexer, Level.WARNING, node, code, node.element);
+ messageNode(lexer, Level.WARNING, node, code, node.element);
break;
case USING_BR_INPLACE_OF :
@@ -752,24 +717,10 @@
messageNode(lexer, Level.WARNING, node, code, nodedesc);
break;
- case OBSOLETE_ELEMENT :
- messageLexer(lexer, Level.WARNING, code,
- getTagName(element),
- getTagName(node));
- break;
-
case UNESCAPED_ELEMENT :
messageLexer(lexer, Level.WARNING, code, getTagName(element));
break;
- case TRIM_EMPTY_ELEMENT :
- messageNode(lexer, Level.WARNING, element, code, getTagName(element));
- break;
-
- case ILLEGAL_NESTING :
- messageLexer(lexer, Level.WARNING, code, getTagName(element));
- break;
-
case NOFRAMES_CONTENT :
messageLexer(lexer, Level.WARNING, code, getTagName(node));
break;
@@ -787,30 +738,64 @@
messageNode(lexer, Level.WARNING, rpt, code);
break;
+ case DOCTYPE_AFTER_TAGS :
+ messageLexer(lexer, Level.WARNING, code);
+ break;
+
+ case COERCE_TO_ENDTAG :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element);
+ break;
+
+ case NON_MATCHING_ENDTAG :
+ messageLexer(lexer, Level.WARNING, code, getTagName(node), element.element);
+ break;
+
+ case MISSING_DOCTYPE:
+ case SPACE_PRECEDING_XMLDECL:
+ messageLexer(lexer, Level.WARNING, code);
+ break;
+
+ case TRIM_EMPTY_ELEMENT :
+ messageNode(lexer, Level.WARNING, element, code, getTagName(element));
+ break;
+
+ case ILLEGAL_NESTING :
+ messageLexer(lexer, Level.WARNING, code, getTagName(element));
+ break;
+
case UNEXPECTED_END_OF_FILE :
// on end of file adjust reported position to end of input
lexer.lines = lexer.in.getCurline();
lexer.columns = lexer.in.getCurcol();
- messageLexer(
- lexer,
- Level.WARNING,
- code,
- getTagName(element));
+ messageLexer(lexer, Level.WARNING, code, getTagName(element));
break;
- case NESTED_QUOTATION :
- messageNode(lexer, Level.WARNING, rpt, code);
- break;
-
case ELEMENT_NOT_EMPTY :
messageLexer(lexer, Level.WARNING, code, getTagName(element));
break;
- case MISSING_DOCTYPE:
- case SPACE_PRECEDING_XMLDECL:
- messageLexer(lexer, Level.WARNING, code);
+ case MISSING_ENDTAG_FOR :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element);
break;
-
+
+ case MISSING_ENDTAG_BEFORE :
+ messageNode(lexer, Level.WARNING, rpt, code, element.element, nodedesc);
+ break;
+
+ case DISCARDING_UNEXPECTED :
+ if (lexer.badForm == 0) {
+ // the case for when this is an error not a warning, is handled later
+ messageLexer(lexer, Level.WARNING, code, getTagName(node));
+ }
+ break;
+
+ case TAG_NOT_ALLOWED_IN :
+ messageNode(lexer, Level.WARNING, node, code, nodedesc, element.element);
+ if (lexer.configuration.isShowWarnings()) {
+ messageNode(lexer, Level.INFO, element, PREVIOUS_LOCATION, element.element);
+ }
+ break;
+
case REPLACING_ELEMENT:
case REPLACING_UNEX_ELEMENT:
messageNode(lexer, Level.WARNING, rpt, code, getTagName(element), nodedesc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-15 08:58:44
|
Revision: 1188
http://jtidy.svn.sourceforge.net/jtidy/?rev=1188&view=rev
Author: aditsu
Date: 2010-11-15 08:58:38 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
fixed test 1062511 - adjusted NON_MATCHING_ENDTAG handling (only in Tidy compatibility mode, because it looks wrong)
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-13 21:24:53 UTC (rev 1187)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 08:58:38 UTC (rev 1188)
@@ -746,8 +746,13 @@
messageNode(lexer, Level.WARNING, rpt, code, element.element);
break;
- case NON_MATCHING_ENDTAG :
- messageLexer(lexer, Level.WARNING, code, getTagName(node), element.element);
+ case NON_MATCHING_ENDTAG:
+ if (lexer.configuration.isTidyCompat()) {
+ messageNode(lexer, Level.WARNING, rpt, code, node.element, node.element);
+ }
+ else {
+ messageLexer(lexer, Level.WARNING, code, nodedesc, element.element);
+ }
break;
case MISSING_DOCTYPE:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-15 11:08:25
|
Revision: 1189
http://jtidy.svn.sourceforge.net/jtidy/?rev=1189&view=rev
Author: aditsu
Date: 2010-11-15 09:49:08 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
restored the old position for NESTED_EMPHASIS when not in Tidy compatibility mode (it looks more appropriate)
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 08:58:38 UTC (rev 1188)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 09:49:08 UTC (rev 1189)
@@ -700,8 +700,13 @@
messageLexer(lexer, Level.WARNING, code, getTagName(element), getTagName(node));
break;
- case NESTED_EMPHASIS :
- messageNode(lexer, Level.WARNING, rpt, code, nodedesc);
+ case NESTED_EMPHASIS:
+ if (lexer.configuration.isTidyCompat()) {
+ messageNode(lexer, Level.WARNING, rpt, code, nodedesc);
+ }
+ else {
+ messageLexer(lexer, Level.WARNING, code, nodedesc);
+ }
break;
case MISSING_STARTTAG :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-15 12:31:27
|
Revision: 1192
http://jtidy.svn.sourceforge.net/jtidy/?rev=1192&view=rev
Author: aditsu
Date: 2010-11-15 12:31:20 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
replaced null with Level.SUMMARY in the remaining places
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 11:32:45 UTC (rev 1191)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 12:31:20 UTC (rev 1192)
@@ -373,7 +373,7 @@
* @param p printWriter
*/
public void showVersion(final PrintWriter p) {
- printMessage(p, null, "version_summary", RELEASE_DATE_STRING);
+ printMessage(p, Level.SUMMARY, "version_summary", RELEASE_DATE_STRING);
}
/**
@@ -1035,7 +1035,7 @@
*/
public void generalInfo(PrintWriter errout)
{
- printMessage(errout, null, "general_info");
+ printMessage(errout, Level.SUMMARY, "general_info");
}
/**
@@ -1095,7 +1095,7 @@
*/
public void helpText(PrintWriter out)
{
- printMessage(out, null, "help_text", "Tidy", RELEASE_DATE_STRING);
+ printMessage(out, Level.SUMMARY, "help_text", "Tidy", RELEASE_DATE_STRING);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-15 13:11:43
|
Revision: 1195
http://jtidy.svn.sourceforge.net/jtidy/?rev=1195&view=rev
Author: aditsu
Date: 2010-11-15 13:11:37 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
fixed test 1014993 - using "NULL" for null attribute names/values in attrError
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 12:59:54 UTC (rev 1194)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-15 13:11:37 UTC (rev 1195)
@@ -551,8 +551,8 @@
}
final String tagdesc = getTagName(node);
- final String name = attribute == null ? null : attribute.attribute;
- final String value = attribute == null ? null : attribute.value;
+ final String name = attribute == null || attribute.attribute == null ? "NULL" : attribute.attribute;
+ final String value = attribute == null || attribute.value == null ? "NULL" : attribute.value;
switch (code)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2010-11-25 04:00:33
|
Revision: 1234
http://jtidy.svn.sourceforge.net/jtidy/?rev=1234&view=rev
Author: aditsu
Date: 2010-11-25 04:00:26 +0000 (Thu, 25 Nov 2010)
Log Message:
-----------
corrected node description for UNESCAPED_ELEMENT
Modified Paths:
--------------
branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-24 02:39:29 UTC (rev 1233)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/Report.java 2010-11-25 04:00:26 UTC (rev 1234)
@@ -703,7 +703,7 @@
break;
case UNESCAPED_ELEMENT :
- messageLexer(lexer, Level.WARNING, code, getTagName(element));
+ messageLexer(lexer, Level.WARNING, code, nodedesc);
break;
case NOFRAMES_CONTENT :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X