[400752] Adjust validation rules to align with WAIC's guideline
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
index 12747dd..115be80 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- Copyright (c) 2005, 2011 IBM Corporation and others.
+ Copyright (c) 2005, 2013 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -919,6 +919,18 @@
<desc>Avoid use of obsolete language features if possible. (Use the PRE element.)</desc>
</description>
</checkitem>
+ <checkitem type="user" id="C_48.6">
+ <guideline>
+ <gItem techniques="H49" id="7.1.3.1" name="JIS"/>
+ <gItem techniques="H49" id="1.3.1" name="WCAG 2.0"/>
+ </guideline>
+ <metrics>
+ <mItem name="Perceivable"/>
+ </metrics>
+ <description>
+ <desc>Use strong or em tags to emphasize text instead of b or i tags.</desc>
+ </description>
+ </checkitem>
<checkitem type="info" id="C_49.0">
<guideline>
<gItem id="11.3" name="WCAG"/>
@@ -1624,7 +1636,7 @@
<desc>Make sure that instruction (or sample) of edit box is placed before the edit box.</desc>
</description>
</checkitem>
- <checkitem type="warning" id="C_79.0">
+ <checkitem type="error" id="C_79.0">
<guideline>
<gItem id="12.4" name="WCAG"/>
<gItem id="n" name="Section508"/>
@@ -1639,9 +1651,9 @@
<gItem techniques="H44" id="4.1.2" name="WCAG 2.0"/>
</guideline>
<metrics>
- <mItem score="2" name="Perceivable"/>
- <mItem score="2" name="Understandable"/>
- <mItem score="2" name="Robust"/>
+ <mItem score="5" name="Perceivable"/>
+ <mItem score="5" name="Understandable"/>
+ <mItem score="5" name="Robust"/>
</metrics>
<description>
<desc>There is no label element for the form control.</desc>
@@ -2094,14 +2106,14 @@
</checkitem>
<checkitem type="error" id="C_79.6">
<guideline>
- <gItem techniques="H65" id="7.1.1.1" name="JIS"/>
- <gItem techniques="H65" id="7.1.3.1" name="JIS"/>
- <gItem techniques="H65" id="7.3.3.2" name="JIS"/>
- <gItem techniques="H65" id="7.4.1.2" name="JIS"/>
- <gItem techniques="H65" id="1.1.1" name="WCAG 2.0"/>
- <gItem techniques="H65" id="1.3.1" name="WCAG 2.0"/>
- <gItem techniques="H65" id="3.3.2" name="WCAG 2.0"/>
- <gItem techniques="H65" id="4.1.2" name="WCAG 2.0"/>
+ <gItem techniques="H44,H65" id="7.1.1.1" name="JIS"/>
+ <gItem techniques="H44,H65" id="7.1.3.1" name="JIS"/>
+ <gItem techniques="H44,H65" id="7.3.3.2" name="JIS"/>
+ <gItem techniques="H44,H65" id="7.4.1.2" name="JIS"/>
+ <gItem techniques="H44,H65" id="1.1.1" name="WCAG 2.0"/>
+ <gItem techniques="H44,H65" id="1.3.1" name="WCAG 2.0"/>
+ <gItem techniques="H44,H65" id="3.3.2" name="WCAG 2.0"/>
+ <gItem techniques="H44,H65" id="4.1.2" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem score="5" name="Perceivable"/>
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
index 55aaf51..e9f2b7e 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
+# Copyright (c) 2005, 2013 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -84,6 +84,7 @@
C_48.3 = Avoid use of obsolete language features if possible. (obsolete tag: {0} exists) Use other list elements such as ul or ol, and use style sheets to refine the formatting.
C_48.4 = Avoid use of obsolete language features if possible. (obsolete tag: {0} exists) Use an input element within a form.
C_48.5 = Avoid use of obsolete language features if possible. (obsolete tag: {0} exists) Use the pre element.
+C_48.6 = Use strong or em tags to emphasize text instead of {0} tag.
C_49.0 = Do you allow users to customize their experience of the Web page?
C_50.0 = If you can't make a page accessible, provide an alternate accessible version.
C_51.0 = The frame element does not have title attribute. Provide nonempty title attribute to the frame element that contains text that identifies the frame.
@@ -135,7 +136,7 @@
C_77.1 = When an HTML document is rendered without associated style sheets, it must still be readable and usable. (style tag exists)
C_77.2 = When an HTML document is rendered without associated style sheets, it must still be readable and usable. (style attribute exists)
C_78.2 = Provide text instructions at the beginning of a form or set of fields that describes the necessary input.
-C_79.0 = There is no label element for the form control.
+C_79.0 = There is no label element for the form control and title attribute of the form control is empty. Provide nonempty title attribute that contains text that identifies the form control.
C_79.1 = Make sure that the label element in the form control is properly placed. {0}
C_79.2 = Do not use implicit labels.
C_79.3 = Check that labels are visible.
@@ -220,11 +221,11 @@
C_500.18= Background color might be specified alone. Please specify appropriate text color together. In addition, if you use color to convey information, make sure the information is also represented another way.{0}
C_500.19= Use measurements that are relative to other measurements in the content for the font size.{0}
C_500.20= Use measurements that are relative to other measurements in the content for the font size.{0}
-C_300.0 = "{0}" may be inappropriate as an alt attribute for an image button.
-C_300.1 = "{0}" may be inappropriate as an alt attribute for an area element.
-C_300.2 = "{0}" may be inappropriate as an alt attribute for an applet element.
+C_300.0 = "{0}" may be inappropriate as an alt attribute for an image button. Provide an appropirate alternative text.
+C_300.1 = "{0}" may be inappropriate as an alt attribute for an area element. Provide an appropirate alternative text.
+C_300.2 = "{0}" may be inappropriate as an alt attribute for an applet element. Provide an appropirate alternative text.
C_300.3 = The alt attribute "{0}" of the input element has inappropriate spaces within a word.
-C_300.4 = A string containing only whitespace characters ("{0}") is inappropriate as an alt attribute of an image button.
+C_300.4 = A string containing only whitespace characters ("{0}") is inappropriate as an alt attribute of an image button. Provide an appropirate alternative text.
C_600.0 = Check that all non-text content that is presented to the user has a text alternative that serves the equivalent purpose.
C_600.1 = For prerecorded video-only content, check that either an alternative for time-based media or an audio track is provided that presents equivalent information. For prerecorded audio-only content, check that an alternative for time-based media is provided. (Except when the media is a media alternative for text and is clearly labeled as such.)
C_600.2 = Check that an alternative for time-based media or audio description of the prerecorded video content is provided for synchronized media. (Except when the media is a media alternative for text and is clearly labeled as such.)
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
index fa2c287..d30a257 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
+# Copyright (c) 2005, 2013 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -84,6 +84,7 @@
C_48.3 = \u53ef\u80fd\u306a\u9650\u308a\u3001\u53e4\u3044\u8868\u73fe\u3092\u7528\u3044\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044 (\u53e4\u3044\u30bf\u30b0\uff1a {0} \u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059) ul\u30fbol\u3084\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u7528\u3044\u3066\u304f\u3060\u3055\u3044
C_48.4 = \u53ef\u80fd\u306a\u9650\u308a\u3001\u53e4\u3044\u8868\u73fe\u3092\u7528\u3044\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044 (\u53e4\u3044\u30bf\u30b0\uff1a {0} \u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059) form\u3068input\u3092\u7528\u3044\u3066\u304f\u3060\u3055\u3044
C_48.5 = \u53ef\u80fd\u306a\u9650\u308a\u3001\u53e4\u3044\u8868\u73fe\u3092\u7528\u3044\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044 (\u53e4\u3044\u30bf\u30b0\uff1a {0} \u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059) pre\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044
+C_48.6 = \u30c6\u30ad\u30b9\u30c8\u3092\u5f37\u8abf\u3059\u308b\u969b\u306f {0} \u30bf\u30b0\u3067\u306f\u306a\u304f strong \u3082\u3057\u304f\u306f em \u3092\u7528\u3044\u3066\u304f\u3060\u3055\u3044
C_49.0 = \u30e6\u30fc\u30b6\u304c\u81ea\u5206\u306e\u597d\u307f\u306b\u5408\u308f\u305b\u3066\u3001\u3053\u306e\u30da\u30fc\u30b8\u306e\u8868\u73fe\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3059\u308b\u3053\u3068\u304c\u53ef\u80fd\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
C_50.0 = \u3082\u3057\u3001\u3053\u306e\u30da\u30fc\u30b8\u3092\u30a2\u30af\u30bb\u30b7\u30d6\u30eb\u306b\u3059\u308b\u3053\u3068\u304c\u4e0d\u53ef\u80fd\u3067\u3042\u308c\u3070\u3001\u4ee3\u66ff\u3068\u306a\u308b\u30a2\u30af\u30bb\u30b7\u30d6\u30eb\u306a\u30da\u30fc\u30b8\u3092\u63d0\u4f9b\u3057\u3066\u304f\u3060\u3055\u3044
C_51.0 = frame\u8981\u7d20\u306btitle\u5c5e\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002frame\u8981\u7d20\u306b\u306f\u3001\u30d5\u30ec\u30fc\u30e0\u306e\u5185\u5bb9\u3092\u8aac\u660e\u3059\u308b\u305f\u3081\u306e\u7a7a\u3067\u306a\u3044title\u5c5e\u6027\u3092\u63d0\u4f9b\u3057\u3066\u304f\u3060\u3055\u3044
@@ -134,7 +135,7 @@
C_77.0 = HTML\u6587\u66f8\u306f\u3001\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u7121\u52b9\u306b\u3057\u3066\u3082\u8aad\u3093\u3060\u308a\u5229\u7528\u3057\u305f\u308a\u51fa\u6765\u308b\u3088\u3046\u306b\u30c7\u30b6\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044 (\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u5229\u7528\u3059\u308b\u305f\u3081\u306elink\u8981\u7d20\u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059)
C_77.1 = HTML\u6587\u66f8\u306f\u3001\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u7121\u52b9\u306b\u3057\u3066\u3082\u8aad\u3093\u3060\u308a\u5229\u7528\u3057\u305f\u308a\u51fa\u6765\u308b\u3088\u3046\u306b\u30c7\u30b6\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044 (style\u8981\u7d20\u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059)
C_77.2 = HTML\u6587\u66f8\u306f\u3001\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u7121\u52b9\u306b\u3057\u3066\u3082\u8aad\u3093\u3060\u308a\u5229\u7528\u3057\u305f\u308a\u51fa\u6765\u308b\u3088\u3046\u306b\u30c7\u30b6\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044 (style\u5c5e\u6027\u3092\u6301\u3064\u8981\u7d20\u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059)
-C_79.0 = \u30d5\u30a9\u30fc\u30e0\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u306b\u95a2\u9023\u4ed8\u3051\u3089\u308c\u305flabel\u8981\u7d20\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+C_79.0 = \u30d5\u30a9\u30fc\u30e0\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u306b\u95a2\u9023\u4ed8\u3051\u3089\u308c\u305flabel\u8981\u7d20\u304c\u5b58\u5728\u305b\u305a\u3001title\u5c5e\u6027\u306e\u5024\u304c\u7a7a\u307e\u305f\u306f\u7a7a\u767d\u6587\u5b57\u3060\u3051\u3067\u3059\u3002\u30d5\u30a9\u30fc\u30e0\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u306e\u76ee\u7684\u3092\u8868\u308f\u3059title\u5c5e\u6027\u3092\u4ed8\u4e0e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
C_79.1 = \u30d5\u30a9\u30fc\u30e0\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u306b\u5bfe\u3059\u308blabel\u8981\u7d20\u304c\u6b63\u3057\u304f\u914d\u7f6e\u3055\u308c\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30e9\u30b8\u30aa\u30dc\u30bf\u30f3\u304a\u3088\u3073\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3067\u306f\u305d\u306e\u5f8c\u3001\u305d\u308c\u4ee5\u5916\u306e\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u3067\u306f\u305d\u308c\u3089\u306e\u524d\u306b\u7f6e\u304f\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002{0}
C_79.2 = \u30d5\u30a9\u30fc\u30e0\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u3092label\u8981\u7d20\u3067\u56f2\u3080\u3053\u3068\u306b\u3088\u308a\u30e9\u30d9\u30eb\u4ed8\u3051\u3059\u308b\u65b9\u6cd5\u3092\u4f7f\u7528\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
C_79.3 = \u30e9\u30d9\u30eb\u304c\u8996\u899a\u7684\u306b\u8a8d\u8b58\u3067\u304d\u308b\u72b6\u614b\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044
@@ -220,11 +221,11 @@
C_500.18= \u80cc\u666f\u8272\u306e\u307f\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u5341\u5206\u306a\u30b3\u30f3\u30c8\u30e9\u30b9\u30c8\u6bd4\u3068\u306a\u308b\u6587\u5b57\u8272\u3092\u6307\u5b9a\u3059\u308b\u3088\u3046\u306b\u3057\u3066\u4e0b\u3055\u3044\u3002 \u307e\u305f\u3001\u3082\u3057\u914d\u8272\u306b\u4f55\u3089\u304b\u306e\u60c5\u5831\u3092\u6301\u305f\u305b\u3066\u3044\u308b\u5834\u5408\u3001\u30c6\u30ad\u30b9\u30c8\u3084\u4ed6\u306e\u8996\u899a\u7684\u306a\u8868\u73fe\u304b\u3089\u3082\u305d\u306e\u60c5\u5831\u3092\u53d6\u5f97\u3067\u304d\u308b\u3088\u3046\u914d\u616e\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}
C_500.19= \u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba\u306f\u76f8\u5bfe\u7684\u306a\u5927\u304d\u3055\u3067\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}
C_500.20= \u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba\u306f\u76f8\u5bfe\u7684\u306a\u5927\u304d\u3055\u3067\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}
-C_300.0 = "{0}" \u306f\u753b\u50cf\u30dc\u30bf\u30f3\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
-C_300.1 = "{0}" \u306farea\u8981\u7d20\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
-C_300.2 = "{0}"\u306fapplet\u8981\u7d20\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
+C_300.0 = "{0}" \u306f\u753b\u50cf\u30dc\u30bf\u30f3\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u9069\u5207\u306a\u4ee3\u66ff\u30c6\u30ad\u30b9\u30c8\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
+C_300.1 = "{0}" \u306farea\u8981\u7d20\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u9069\u5207\u306a\u4ee3\u66ff\u30c6\u30ad\u30b9\u30c8\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
+C_300.2 = "{0}"\u306fapplet\u8981\u7d20\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u9069\u5207\u306a\u4ee3\u66ff\u30c6\u30ad\u30b9\u30c8\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
C_300.3 = \u753b\u50cf\u30dc\u30bf\u30f3\u306ealt\u5c5e\u6027\u201d{0}\u201d\u306f\u6587\u5b57\u9593\u306b\u7a7a\u767d\u3092\u542b\u3093\u3067\u3044\u308b\u305f\u3081\u3001\u97f3\u58f0\u3067\u6b63\u78ba\u306b\u8aad\u307f\u4e0a\u3052\u308b\u3053\u3068\u304c\u51fa\u6765\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
-C_300.4 = \u7a7a\u767d\u6587\u5b57\u306e\u307f\u304b\u3089\u306a\u308b\u6587\u5b57\u5217 "{0}" \u306f\u753b\u50cf\u30dc\u30bf\u30f3\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3059\u3002
+C_300.4 = \u7a7a\u767d\u6587\u5b57\u306e\u307f\u304b\u3089\u306a\u308b\u6587\u5b57\u5217 "{0}" \u306f\u753b\u50cf\u30dc\u30bf\u30f3\u306ealt\u5c5e\u6027\u3068\u3057\u3066\u4e0d\u9069\u5207\u3067\u3059\u3002\u9069\u5207\u306a\u4ee3\u66ff\u30c6\u30ad\u30b9\u30c8\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
C_600.0 = \u5229\u7528\u8005\u306b\u63d0\u793a\u3055\u308c\u308b\u3059\u3079\u3066\u306e\u975e\u30c6\u30ad\u30b9\u30c8\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u5bfe\u3057\u3066\u3001\u72b6\u6cc1\u306b\u5fdc\u3058\u3066\u3001\u540c\u7b49\u306e\u76ee\u7684\u3092\u679c\u305f\u3059\u4ee3\u66ff\u30c6\u30ad\u30b9\u30c8\u3092\u63d0\u4f9b\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002
C_600.1 = \u53ce\u9332\u6e08\u306e\u6620\u50cf\u3057\u304b\u542b\u307e\u306a\u3044\u30b3\u30f3\u30c6\u30f3\u30c4\u3067\u3042\u308b\u5834\u5408\u3001\u4ee3\u66ff\u30b3\u30f3\u30c6\u30f3\u30c4\u53c8\u306f\u97f3\u58f0\u30c8\u30e9\u30c3\u30af\u304c\u63d0\u4f9b\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u307e\u305f\u3001\u53ce\u9332\u6e08\u306e\u97f3\u58f0\u3057\u304b\u542b\u307e\u306a\u3044\u30b3\u30f3\u30c6\u30f3\u30c4\u3067\u3042\u308b\u5834\u5408\u3001\u4ee3\u66ff\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u63d0\u4f9b\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\uff08\u305d\u306e\u30e1\u30c7\u30a3\u30a2\u304c\u30c6\u30ad\u30b9\u30c8\u306e\u4ee3\u66ff\u30e1\u30c7\u30a3\u30a2\u3067\u3042\u308a\u3001\u4ee3\u66ff\u30e1\u30c7\u30a3\u30a2\u3067\u3042\u308b\u3053\u3068\u304c\u660e\u78ba\u306b\u30e9\u30d9\u30eb\u4ed8\u3051\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306f\u9664\u304f\u3002\uff09
C_600.2 = \u540c\u671f\u3057\u305f\u30e1\u30c7\u30a3\u30a2\u306b\u542b\u307e\u308c\u3066\u3044\u308b\u53ce\u9332\u6e08\u306e\u6620\u50cf\u30b3\u30f3\u30c6\u30f3\u30c4\u3067\u3042\u308b\u5834\u5408\u3001\u4ee3\u66ff\u30b3\u30f3\u30c6\u30f3\u30c4\u53c8\u306f\u97f3\u58f0\u30ac\u30a4\u30c9\u3092\u63d0\u4f9b\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\uff08\u305d\u306e\u30e1\u30c7\u30a3\u30a2\u304c\u30c6\u30ad\u30b9\u30c8\u306e\u4ee3\u66ff\u30e1\u30c7\u30a3\u30a2\u3067\u3042\u308a\u3001\u4ee3\u66ff\u30e1\u30c7\u30a3\u30a2\u3067\u3042\u308b\u3053\u3068\u304c\u660e\u78ba\u306b\u30e9\u30d9\u30eb\u4ed8\u3051\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306f\u9664\u304f\u3002\uff09
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/CheckEngine.java b/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/CheckEngine.java
index 09d6b32..c96d4e0 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/CheckEngine.java
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/CheckEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and Others
+ * Copyright (c) 2004, 2013 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1290,13 +1290,12 @@
// TODO check if these two items should be shown
addCheckerProblem("C_500.0", "(" + Messages.Dynamic + tmpS + ")");
addCheckerProblem("C_500.1", "(" + Messages.Dynamic + tmpS + ")");
-
+
addCheckerProblem("C_600.1", "(" + Messages.Dynamic + tmpS + ")");
addCheckerProblem("C_600.2", "(" + Messages.Dynamic + tmpS + ")");
addCheckerProblem("C_600.6", "(" + Messages.Dynamic + tmpS + ")");
addCheckerProblem("C_600.7", "(" + Messages.Dynamic + tmpS + ")");
-
addCheckerProblem("C_600.16", "(" + Messages.Dynamic + tmpS + ")"); //$NON-NLS-1$
}
@@ -1886,7 +1885,6 @@
checkObsoluteEle("C_48.2", "strike"); //$NON-NLS-1$
checkObsoluteEle("C_48.2", "u"); //$NON-NLS-1$
checkObsoluteEle("C_48.2", "s"); //$NON-NLS-1$
- checkObsoluteEle("C_48.2", "i"); //$NON-NLS-1$
// DIR, MENU
checkObsoluteEle("C_48.3", "dir"); //$NON-NLS-1$
checkObsoluteEle("C_48.3", "menu"); //$NON-NLS-1$
@@ -1896,6 +1894,9 @@
checkObsoluteEle("C_48.5", "listing"); //$NON-NLS-1$
checkObsoluteEle("C_48.5", "plaintext"); //$NON-NLS-1$
checkObsoluteEle("C_48.5", "xmp"); //$NON-NLS-1$
+ //em/strong
+ checkObsoluteEle("C_48.6", "b"); //$NON-NLS-1$
+ checkObsoluteEle("C_48.6", "i"); //$NON-NLS-1$
}
private void item_49() {
@@ -2675,33 +2676,34 @@
if (labelList == null)
labelList = edu.getElementsList(target, "label"); //$NON-NLS-1$
Vector<Node> noTitleControls = new Vector<Node>();
- Vector<Node> noLabelControls = new Vector<Node>();
+ Vector<Node> noLabelEmptyTitleControls = new Vector<Node>();
Vector<Node> implicitLabelControls = new Vector<Node>();
- for (Element form : formList) { //$NON-NLS-1$
- // checks for each form element
- for (Element el : getFormControl(form)) {
+ for (Element body : body_elements) { //$NON-NLS-1$
+ for (Element el : getFormControl(body)) {
// checks for each input controls
TitleCheckResult res = item_79_title(el);
if (res == TitleCheckResult.NO_TITLE)
noTitleControls.add(el);
- item_79_label(el, res, noLabelControls, implicitLabelControls);
+ item_79_label(el, res, noLabelEmptyTitleControls,
+ implicitLabelControls);
}
}
+
if (noTitleControls.size() > 0)
addCheckerProblem("C_79.6", "", noTitleControls);
- if (noLabelControls.size() > 0)
- addCheckerProblem("C_79.0", "", noLabelControls);
+ if (noLabelEmptyTitleControls.size() > 0)
+ addCheckerProblem("C_79.0", "", noLabelEmptyTitleControls);
if (implicitLabelControls.size() > 0)
addCheckerProblem("C_79.2", "", implicitLabelControls);
}
private void item_79_label(Element ctrl, TitleCheckResult res,
- Vector<Node> noLabelControls, Vector<Node> implicitLabelControls) {
+ Vector<Node> noLabelEmptyTitleControls,
+ Vector<Node> implicitLabelControls) {
String elType = getFormControlType(ctrl);
Element l;
if ((l = hasImplicitLabel(ctrl)) != null) {
implicitLabelControls.add(l);
- // addCheckerProblem("C_79.2", l);
return;
}
if (!isLabelable(elType)) {
@@ -2713,8 +2715,9 @@
boolean bHasTitle = this.hasTitle(ctrl);
if (!bHasLabel && !(res == TitleCheckResult.G167)) {
- noLabelControls.add(ctrl);
- // addCheckerProblem("C_79.0", ctrl); //$NON-NLS-1$
+ if (res == TitleCheckResult.EMPTY_TITLE) {
+ noLabelEmptyTitleControls.add(ctrl);
+ }
} else {
// TODO highlight the label as well
if (!hasProperLabel(ctrl)) {
@@ -2739,6 +2742,9 @@
*/
private TitleCheckResult item_79_title(Element ctrl) {
if (hasTitle(ctrl)) {
+ if (hasBlankTitle(ctrl)) {
+ return TitleCheckResult.EMPTY_TITLE;
+ }
addCheckerProblem("C_79.4", ctrl.getAttribute(ATTR_TITLE), ctrl);
return TitleCheckResult.OK;
} else {
@@ -3400,17 +3406,16 @@
addCheckerProblem("C_600.0");
- //moved into mediaCheck
-// addCheckerProblem("C_600.1");
-// addCheckerProblem("C_600.2");
-// addCheckerProblem("C_600.6");
-// addCheckerProblem("C_600.7");
-
+ // moved into mediaCheck
+ // addCheckerProblem("C_600.1");
+ // addCheckerProblem("C_600.2");
+ // addCheckerProblem("C_600.6");
+ // addCheckerProblem("C_600.7");
+
addCheckerProblem("C_600.3");
addCheckerProblem("C_600.4");
addCheckerProblem("C_600.5");
-
addCheckerProblem("C_600.8");
addCheckerProblem("C_600.9");
addCheckerProblem("C_600.10");
@@ -3570,9 +3575,9 @@
}
}
- //Special check for body element
- //http://www.w3.org/TR/html4/sgml/loosedtd.html#bodycolors
-
+ // Special check for body element
+ // http://www.w3.org/TR/html4/sgml/loosedtd.html#bodycolors
+
if (body_elements.length > 0) {
Element bodyEl = body_elements[0];
boolean color = bodyEl.getAttribute("text").length() > 0;
@@ -3587,11 +3592,11 @@
} else if (!color && bgColor) {
addCheckerProblem("C_500.18", "", bodyEl);
}
-
- if(linkColor){
+
+ if (linkColor) {
addCheckerProblem("C_500.18", "(link)", bodyEl);
}
-
+
}
}
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/TitleCheckResult.java b/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/TitleCheckResult.java
index 9b1c9a9..29e607d 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/TitleCheckResult.java
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/src/org/eclipse/actf/examples/adesigner/eval/html/internal/TitleCheckResult.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and Others
+ * Copyright (c) 2011, 2013 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,5 +11,5 @@
package org.eclipse.actf.examples.adesigner.eval.html.internal;
public enum TitleCheckResult {
- OK, G167, NO_TITLE;
+ OK, G167, NO_TITLE, EMPTY_TITLE;
}
