Bug 489096, Bug 490310
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 c124c4c..8f4fee8 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
@@ -130,8 +130,8 @@
<checkitem type="error" id="C_14.0">
<guideline>
<gItem id="3.5" name="WCAG"/>
- <gItem techniques="G141" id="2.4.10" name="JIS"/>
- <gItem techniques="G141" id="2.4.10" name="WCAG 2.0"/>
+ <gItem techniques="G141,ARIA12" id="2.4.10" name="JIS"/>
+ <gItem techniques="G141,ARIA12" id="2.4.10" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem score="5" name="Operable"/>
@@ -1565,15 +1565,15 @@
<guideline>
<gItem id="5.2" name="WCAG"/>
<gItem id="h" name="Section508"/>
- <gItem techniques="H63" id="1.3.1" name="JIS"/>
+ <gItem techniques="H43,H63" id="1.3.1" name="JIS"/>
<gItem id="10" name="IBMGuideline"/>
- <gItem techniques="H63" id="1.3.1" name="WCAG 2.0"/>
+ <gItem techniques="H43,H63" id="1.3.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
</metrics>
<description>
- <desc>There are some combined table cells (COLSPAN/ROWSPAN). Use structural markup (e.g. SCOPE) to identify their hierarchy and relationship. If possible, avoid using COLSPAN/ROWSPAN in data table.</desc>
+ <desc>There are some combined table cells (COLSPAN/ROWSPAN). Use structural markup (e.g. scope or id/headers) to identify their hierarchy and relationship. If possible, avoid using COLSPAN/ROWSPAN in data table.</desc>
</description>
</checkitem>
<checkitem type="info" id="C_77.0">
@@ -1664,8 +1664,8 @@
<gItem id="2.1" name="WCAG"/>
<gItem id="c" name="Section508"/>
<gItem id="12" name="IBMGuideline"/>
- <gItem techniques="G14,G182,G205,H92" id="1.4.1" name="JIS"/>
- <gItem techniques="G14,G182,G205,H92" id="1.4.1" name="WCAG 2.0"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="JIS"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -2318,10 +2318,10 @@
</checkitem>
<checkitem type="user" id="C_388.0">
<guideline>
- <gItem techniques="G131" id="2.4.6" name="JIS"/>
- <gItem techniques="G131" id="3.3.2" name="JIS"/>
- <gItem techniques="G131" id="2.4.6" name="WCAG 2.0"/>
- <gItem techniques="G131" id="3.3.2" name="WCAG 2.0"/>
+ <gItem techniques="G131,H90" id="2.4.6" name="JIS"/>
+ <gItem techniques="G131,H90" id="3.3.2" name="JIS"/>
+ <gItem techniques="G131,H90" id="2.4.6" name="WCAG 2.0"/>
+ <gItem techniques="G131,H90" id="3.3.2" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Operable"/>
@@ -2445,7 +2445,7 @@
<mItem score="5" name="Perceivable"/>
</metrics>
<description>
- <desc>Appropriately use the scope attribute to associate header cells and data cells in the data table.</desc>
+ <desc>No scope attribute for th element. Appropriately use the scope attribute to associate header cells and data cells in the data table.</desc>
</description>
</checkitem>
<checkitem type="error" id="C_331.1">
@@ -2457,7 +2457,7 @@
<mItem score="5" name="Perceivable"/>
</metrics>
<description>
- <desc>Appropriately use the scope attribute to associate header cells and data cells in the data table.</desc>
+ <desc>Invalid value for scope attribute of th element. Appropriately use the scope attribute to associate header cells and data cells in the data table.</desc>
</description>
</checkitem>
<checkitem type="error" id="C_332.0">
@@ -2988,8 +2988,8 @@
</checkitem>
<checkitem type="info" id="C_600.3">
<guideline>
- <gItem techniques="G115,G117,G138,G140,H48,H49,H51,SCR21" id="1.3.1" name="JIS"/>
- <gItem techniques="G115,G117,G138,G140,H48,H49,H51,SCR21" id="1.3.1" name="WCAG 2.0"/>
+ <gItem techniques="G115,G117,G138,G140,G205,H48,H49,H51,SCR21" id="1.3.1" name="JIS"/>
+ <gItem techniques="G115,G117,G138,G140,G205,H48,H49,H51,SCR21" id="1.3.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem 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 8f48c0f..e42cdf4 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
@@ -132,7 +132,7 @@
C_74.2 = If a timed response is required in processing forms, the user shall be alerted and given sufficient time to indicate more time is required.
C_75.0 = If this is a data table, provide headers (th) for the table. For layout tables, use style sheets to control layout.
C_76.0 = If a table has two or more rows or columns that serve as headers, use structural markup (e.g. axis and scope) to identify their hierarchy and relationship.
-C_76.1 = There are some combined table cells (colspan/rowspan). Use structural markup (e.g. scope) to identify their hierarchy and relationship. If possible, avoid using colspan/rowspan in data table.
+C_76.1 = There are some combined table cells (colspan/rowspan). Use structural markup (e.g. scope and/or id/headers) to identify their hierarchy and relationship. If possible, avoid using colspan/rowspan in data table.
C_77.0 = When an HTML document is rendered without associated style sheets, it must still be readable and usable. (link tag for include stylesheet)
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)
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 f374e56..a6e240d 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
@@ -131,7 +131,7 @@
C_74.2 = \u3082\u3057\u30e6\u30fc\u30b6\u306b\u5236\u9650\u6642\u9593\u5185\u3067\u30d5\u30a9\u30fc\u30e0\u306e\u5165\u529b\u306a\u3069\u3092\u8981\u6c42\u3059\u308b\u5834\u5408\u3001\u30e6\u30fc\u30b6\u306b\u5236\u9650\u6642\u9593\u304c\u3042\u308b\u3053\u3068\u3092\u8b66\u544a\u3057\u3001\u6642\u9593\u5ef6\u9577\u3092\u3059\u308b\u305f\u3081\u306e\u5341\u5206\u306a\u6642\u9593\u304c\u4e0e\u3048\u3089\u308c\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
C_75.0 = \u3082\u3057\u3001\u3053\u306e\u30c6\u30fc\u30d6\u30eb\u304c\u30c7\u30fc\u30bf\u30c6\u30fc\u30d6\u30eb\u306a\u3089\u3001\u30c6\u30fc\u30d6\u30eb\u30d8\u30c3\u30c0(th)\u3092\u63d0\u4f9b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3082\u3057\u3001\u3053\u306e\u30c6\u30fc\u30d6\u30eb\u304c\u30ec\u30a4\u30a2\u30a6\u30c8\u30c6\u30fc\u30d6\u30eb\u3067\u3042\u308b\u5834\u5408\u306f\u3001\u30c6\u30fc\u30d6\u30eb\u3067\u306f\u306a\u304f\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
C_76.0 = \u30c6\u30fc\u30d6\u30eb\u306e\u884c\u30fb\u5217\u306b\u5bfe\u3059\u308b\u898b\u51fa\u3057(th\u8981\u7d20)\u304c\u8907\u6570\u5b58\u5728\u3059\u308b\u5834\u5408\u3001\u69cb\u9020\u306b\u95a2\u3059\u308b\u8868\u73fe(scope\u5c5e\u6027\u7b49)\u3092\u7528\u3044\u3066\u968e\u5c64\u69cb\u9020\u3092\u660e\u3089\u304b\u306b\u3057\u3066\u304f\u3060\u3055\u3044
-C_76.1 = \u3044\u304f\u3064\u304b\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u30bb\u30eb\u304ccolspan\u5c5e\u6027\u307e\u305f\u306frowspan\u5c5e\u6027\u3092\u7528\u3044\u3066\u7d50\u5408\u3055\u308c\u3066\u3044\u307e\u3059\u3002 scope\u5c5e\u6027\u7b49\u3092\u7528\u3044\u3066\u898b\u51fa\u3057\u3068\u6b63\u3057\u304f\u95a2\u9023\u4ed8\u3051\u3089\u308c\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 \u307e\u305f\u3001colspan\u5c5e\u6027\u304a\u3088\u3073rowspan\u5c5e\u6027\u306e\u5229\u7528\u306f\u5fc5\u8981\u6700\u5c0f\u9650\u306b\u3057\u3066\u304f\u3060\u3055\u3044
+C_76.1 = \u3044\u304f\u3064\u304b\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u30bb\u30eb\u304ccolspan\u5c5e\u6027\u307e\u305f\u306frowspan\u5c5e\u6027\u3092\u7528\u3044\u3066\u7d50\u5408\u3055\u308c\u3066\u3044\u307e\u3059\u3002 id\u5c5e\u6027\u3068headers\u5c5e\u6027\u306e\u7d44\u307f\u5408\u308f\u305b\u3084scope\u5c5e\u6027\u7b49\u3092\u7528\u3044\u3066\u898b\u51fa\u3057\u3068\u6b63\u3057\u304f\u95a2\u9023\u4ed8\u3051\u3089\u308c\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 \u307e\u305f\u3001colspan\u5c5e\u6027\u304a\u3088\u3073rowspan\u5c5e\u6027\u306e\u5229\u7528\u306f\u5fc5\u8981\u6700\u5c0f\u9650\u306b\u3057\u3066\u304f\u3060\u3055\u3044
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)
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
index 5aa7262..c3d72fd 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
@@ -117,7 +117,7 @@
C_74.2 =\u5982\u679c\u7528\u6237\u9700\u8981\u5728\u7ed9\u5b9a\u65f6\u95f4\u5185\u5bf9\u8868\u5355\u64cd\u4f5c\uff0c\u5e94\u5f53\u7ed9\u4f7f\u7528\u8005\u63d0\u9192\u5e76\u7ed9\u4e88\u673a\u4f1a\u5ef6\u957f\u53cd\u5e94\u65f6\u95f4\u3002
C_75.0 =\u5982\u679c\u8fd9\u662f\u4e00\u4e2a\u6570\u636e\u8868\uff0c\u4e3a\u8868\u63d0\u4f9b\u6807\u9898\u5934\uff08TH\uff09\uff0c\u603b\u7ed3\uff0c\u548c\u6807\u9898\u3002\u5bf9\u4e8e\u5e03\u5c40\u8868\u683c\uff0c\u4f7f\u7528\u6837\u5f0f\u8868\u6765\u63a7\u5236\u5e03\u5c40\u3002
C_76.0 =\u5982\u679c\u4e00\u4e2a\u8868\u6709\u4e24\u4e2a\u6216\u591a\u4e2a\u884c\u6216\u5217\u4f5c\u4e3a\u6807\u9898\uff0c\u5229\u7528\u7ed3\u6784\u6807\u8bb0\uff08\u5982\u8f74SCOPE\uff09\uff0c\u4ee5\u786e\u5b9a\u5b83\u4eec\u7684\u5c42\u6b21\u548c\u5173\u7cfb\u3002
-C_76.1 =\u6709\u4e00\u4e9b\u5408\u5e76\u8868\u683c\u5355\u5143\u683c\uff08COLSPAN/ ROWSPAN\uff09\u3002\u4f7f\u7528\u7ed3\u6784\u6807\u8bb0\uff08\u5982\u8f74SCOPE\uff09\uff0c\u4ee5\u786e\u5b9a\u5b83\u4eec\u7684\u5c42\u6b21\u548c\u5173\u7cfb\u3002\u5982\u679c\u53ef\u80fd\uff0c\u5e94\u907f\u514d\u5728\u6570\u636e\u8868COLSPAN/ ROWSPAN\u3002
+C_76.1 =\u6709\u4e00\u4e9b\u5408\u5e76\u8868\u683c\u5355\u5143\u683c\uff08COLSPAN/ ROWSPAN\uff09\u3002\u4f7f\u7528\u7ed3\u6784\u6807\u8bb0\uff08\u5982\u8f74SCOPE, ID/HEADERS\uff09\uff0c\u4ee5\u786e\u5b9a\u5b83\u4eec\u7684\u5c42\u6b21\u548c\u5173\u7cfb\u3002\u5982\u679c\u53ef\u80fd\uff0c\u5e94\u907f\u514d\u5728\u6570\u636e\u8868COLSPAN/ ROWSPAN\u3002
C_77.0 =\u5f53\u4e00\u4e2aHTML\u6587\u4ef6\u6ca1\u6709\u63d0\u4f9b\u76f8\u5173\u7684\u6837\u5f0f\u8868\uff0c\u5b83\u4ecd\u7136\u5fc5\u987b\u80fd\u9605\u8bfb\u548c\u4f7f\u7528\u3002 \uff08LINK\u6807\u7b7e\u5305\u62ec\u6837\u5f0f\u8868\uff09
C_77.1 =\u5f53\u4e00\u4e2aHTML\u6587\u4ef6\u6ca1\u6709\u63d0\u4f9b\u76f8\u5173\u7684\u6837\u5f0f\u8868\uff0c\u5b83\u4ecd\u7136\u5fc5\u987b\u9605\u8bfb\u548c\u4f7f\u7528\u3002 \uff08\u6837\u5f0fSTYLE\u6807\u7b7e\u5b58\u5728\uff09
C_77.2 =\u5f53\u4e00\u4e2aHTML\u6587\u4ef6\u6ca1\u6709\u63d0\u4f9b\u76f8\u5173\u7684\u6837\u5f0f\u8868\uff0c\u5b83\u4ecd\u7136\u5fc5\u987b\u9605\u8bfb\u548c\u4f7f\u7528\u3002 \uff08\u6837\u5f0fSTYLE\u5c5e\u6027\u5b58\u5728\uff09
