[289739] WCAG 2.0 initial support
diff --git a/plugins/org.eclipse.actf.visualization.doc.user/docs/compliance.html b/plugins/org.eclipse.actf.visualization.doc.user/docs/compliance.html
index b5dc4dd..9a185a1 100644
--- a/plugins/org.eclipse.actf.visualization.doc.user/docs/compliance.html
+++ b/plugins/org.eclipse.actf.visualization.doc.user/docs/compliance.html
@@ -14,8 +14,11 @@
ACTF can check the target page's compliance with the following four accessibility guidelines for Web content.
</P>
<UL>
-<LI><A href="http://www.w3.org/TR/WCAG10/">Web Content Accessibility Guidelines (WCAG)</A>: One of the most popular standards used for Web accessibility, issued by the Web Accessibility Initiative (WAI).
+<LI><A href="http://www.w3.org/TR/WCAG10/">Web Content Accessibility Guidelines 1.0 (WCAG 1.0)</A>:
+One of the most popular standards used for Web accessibility, issued by the Web Accessibility Initiative (WAI).
The WAI is a working group of the World Wide Web Consortium.
+<LI><A href="http://www.w3.org/TR/WCAG/">Web Content Accessibility Guidelines 2.0 (WCAG 2.0)</A>:
+One of the most popular and latest standards used for Web accessibility. (ACTF's WCAG 2.0 support is experimental.)
<LI><A
href="http://www.section508.gov/index.cfm?FuseAction=Content&ID=12#Web">Section
508 of the Rehabilitation Act §1194.22 (Section 508)</A>: A list
diff --git a/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewBlind.html b/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewBlind.html
index f176261..301ee18 100644
--- a/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewBlind.html
+++ b/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewBlind.html
@@ -47,6 +47,7 @@
the guidelines and standards can be selected for the tool to use when it checks the accessibility and usability of webpages.
<UL>
<LI>WCAG: The number of the <A href="http://www.w3.org/TR/WCAG10/">corresponding checkpoint</A> defined in the Web Content Accessibility Guidelines, which are issued by the World Wide Web Consortium.
+ <LI>WCAG 2.0: The number of the <A href="http://www.w3.org/TR/WCAG/">corresponding checkpoint</A> defined in the Web Content Accessibility Guidelines, which are issued by the World Wide Web Consortium.
<LI>[Section] 508: The <A href="http://www.section508.gov/index.cfm?FuseAction=Content&ID=12#Web">corresponding rule</A> in Section 508 of the Rehabilitation Act §1194.22.
<LI>JIS: The corresponding checkpoint of the Japanese Industrial Standard (JIS) X8341-3.
<LI>IBM Web Accessibility Checklist: The number of the <A href="http://www-306.ibm.com/able/guidelines/web/accessweb.html">corresponding checkpoint</A> of the IBM Web Accessibility Checklist.
diff --git a/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewLv.html b/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewLv.html
index 5112e2b..5b519fd 100644
--- a/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewLv.html
+++ b/plugins/org.eclipse.actf.visualization.doc.user/docs/lineViewLv.html
@@ -29,6 +29,7 @@
(Opened by clicking <B>Window</B> > <B>Preferences</B> > <b>ACTF</b> > <b>Guideline Checker</b>), the guidelines can be selected for the tool to use when it checks the accessibility and usability of webpages.
<UL>
<LI>WCAG: The number of the <A href="http://www.w3.org/TR/WCAG10/">corresponding checkpoint</A> defined in the Web Content Accessibility Guidelines, which are issued by the World Wide Web Consortium.
+ <LI>WCAG 2.0: The number of the <A href="http://www.w3.org/TR/WCAG/">corresponding checkpoint</A> defined in the Web Content Accessibility Guidelines, which are issued by the World Wide Web Consortium.
<LI>[Section] 508: The <A href="http://www.section508.gov/index.cfm?FuseAction=Content&ID=12#Web">corresponding rule</A> in Section 508 of the Rehabilitation Act §1194.22.
<LI>JIS: The corresponding checkpoint of the Japanese Industrial Standard (JIS) X8341-3.
<LI>IBM Web Accessibility Checklist: The number of the <A href="http://www-306.ibm.com/able/guidelines/web/accessweb.html">corresponding checkpoint</A> of the IBM Web Accessibility Checklist.
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml b/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
index 3080134..15ba8fc 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- Copyright (c) 2005, 2008 IBM Corporation and others.
+ Copyright (c) 2005, 2009 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
@@ -13,6 +13,7 @@
<checkitem id="C_1000.0" type="error" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -25,6 +26,7 @@
<checkitem id="C_1000.1" type="error" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -37,6 +39,7 @@
<checkitem id="C_1000.2" type="error" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -49,6 +52,7 @@
<checkitem id="C_1000.3" type="error" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -61,6 +65,7 @@
<checkitem id="C_1000.4" type="error" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -73,6 +78,7 @@
<checkitem id="C_1000.5" type="warning" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -85,6 +91,7 @@
<checkitem id="C_1000.6" type="warning" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -97,6 +104,7 @@
<checkitem id="C_1000.7" type="warning" >
<guideline>
<gItem name="WCAG" id="3.2" />
+ <gItem name="WCAG 2.0" id="4.1.1" />
<gItem name="JIS" id="5.1(a)" />
</guideline>
<metrics>
@@ -109,6 +117,7 @@
<checkitem id="B_0" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="Section508" id="a" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="1" />
@@ -124,6 +133,7 @@
<checkitem id="B_1" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="Section508" id="a" />
<gItem name="Section508" id="n" />
<gItem name="JIS" id="5.4(a)" />
@@ -141,6 +151,7 @@
<checkitem id="B_2" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="Section508" id="a" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="2" />
@@ -156,6 +167,7 @@
<checkitem id="B_4" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="1" />
</guideline>
@@ -170,6 +182,7 @@
<checkitem id="B_5" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="7" />
</guideline>
@@ -184,6 +197,7 @@
<checkitem id="B_6" type="error" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="2" />
</guideline>
@@ -198,6 +212,7 @@
<checkitem id="B_8" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -212,6 +227,7 @@
<checkitem id="B_9" type="error" >
<guideline>
<gItem name="WCAG" id="13.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="1" />
<gItem name="IBMGuideline" id="2" />
@@ -227,6 +243,7 @@
<checkitem id="B_10" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -241,6 +258,8 @@
<checkitem id="B_12" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="1.3.1" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.2(a)" />
<gItem name="JIS" id="5.3(h)" />
@@ -256,6 +275,8 @@
<checkitem id="B_14" type="error" >
<guideline>
<gItem name="WCAG" id="13.1" />
+ <gItem name="WCAG 2.0" id="2.4.4" />
+ <gItem name="WCAG 2.0" id="2.4.9" />
<gItem name="JIS" id="5.3(g)" />
<gItem name="IBMGuideline" id="8" />
</guideline>
@@ -271,6 +292,7 @@
<checkitem id="B_15" type="error" >
<guideline>
<gItem name="WCAG" id="14.1" />
+ <gItem name="WCAG 2.0" id="1.3.2" />
<gItem name="JIS" id="5.9(e)" />
</guideline>
<metrics>
@@ -298,6 +320,7 @@
<checkitem id="B_17" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -312,6 +335,7 @@
<checkitem id="B_18" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -326,6 +350,7 @@
<checkitem id="B_19" type="warning" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -340,6 +365,7 @@
<checkitem id="B_20" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -354,6 +380,7 @@
<checkitem id="B_21" type="warning" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -368,6 +395,9 @@
<checkitem id="B_22" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="1.3.1" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
+ <gItem name="WCAG 2.0" id="2.4.10" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.2(a)" />
<gItem name="IBMGuideline" id="8" />
@@ -382,6 +412,8 @@
<checkitem id="B_23" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="1.3.1" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.2(a)" />
<gItem name="JIS" id="5.3(h)" />
@@ -397,6 +429,8 @@
<checkitem id="B_24" type="error" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="1.3.1" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.2(a)" />
<gItem name="JIS" id="5.3(h)" />
@@ -412,6 +446,8 @@
<checkitem id="B_25" type="warning" >
<guideline>
<gItem name="WCAG" id="13.1" />
+ <gItem name="WCAG 2.0" id="2.4.4" />
+ <gItem name="WCAG 2.0" id="2.4.9" />
<gItem name="JIS" id="5.3(g)" />
<gItem name="IBMGuideline" id="8" />
</guideline>
@@ -426,6 +462,7 @@
<checkitem id="B_26" type="warning" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -440,6 +477,7 @@
<checkitem id="B_27" type="warning" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="Section508" id="a" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="1" />
@@ -456,6 +494,7 @@
<guideline>
<gItem name="WCAG" id="1.1" />
<gItem name="WCAG" id="14.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="JIS" id="5.9(e)" />
<gItem name="IBMGuideline" id="1" />
@@ -472,6 +511,7 @@
<guideline>
<gItem name="WCAG" id="1.1" />
<gItem name="WCAG" id="14.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="JIS" id="5.9(e)" />
<gItem name="IBMGuideline" id="7" />
@@ -488,6 +528,7 @@
<guideline>
<gItem name="WCAG" id="1.1" />
<gItem name="WCAG" id="14.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="JIS" id="5.9(e)" />
<gItem name="IBMGuideline" id="2" />
@@ -503,6 +544,7 @@
<checkitem id="B_33" type="warning" >
<guideline>
<gItem name="WCAG" id="13.6" />
+ <gItem name="WCAG 2.0" id="2.4.1" />
<gItem name="Section508" id="o" />
<gItem name="JIS" id="5.3(h)" />
<gItem name="IBMGuideline" id="8" />
@@ -517,6 +559,7 @@
<checkitem id="B_34" type="warning" >
<guideline>
<gItem name="WCAG" id="1.1" />
+ <gItem name="WCAG 2.0" id="1.1.1" />
<gItem name="JIS" id="5.4(a)" />
<gItem name="IBMGuideline" id="1" />
</guideline>
@@ -542,6 +585,7 @@
<mItem name="Listenability" score="1" />
</metrics>
<guideline>
+ <gItem name="WCAG 2.0" id="3.3.2" />
<gItem name="JIS" id="5.3(g)" />
</guideline>
<description>
@@ -551,6 +595,7 @@
<checkitem id="B_37" type="error" >
<guideline>
<gItem name="WCAG" id="14.1" />
+ <gItem name="WCAG 2.0" id="1.3.2" />
<gItem name="JIS" id="5.9(e)" />
<gItem name="IBMGuideline" id="7" />
</guideline>
@@ -565,6 +610,8 @@
<checkitem id="L_1" type="error" >
<guideline>
<gItem name="WCAG" id="2.2" />
+ <gItem name="WCAG 2.0" id="1.4.3" />
+ <gItem name="WCAG 2.0" id="1.4.6" />
<gItem name="JIS" id="5.5(c)" />
<gItem name="JIS" id="5.6(c)" />
</guideline>
@@ -574,6 +621,8 @@
</checkitem>
<checkitem id="L_2" type="warning" >
<guideline>
+ <gItem name="WCAG 2.0" id="1.4.3" />
+ <gItem name="WCAG 2.0" id="1.4.4" />
<gItem name="JIS" id="5.6(b)" />
</guideline>
<description>
@@ -584,6 +633,9 @@
<guideline>
<gItem name="WCAG" id="2.1" />
<gItem name="WCAG" id="2.2" />
+ <gItem name="WCAG 2.0" id="1.4.1" />
+ <gItem name="WCAG 2.0" id="1.4.3" />
+ <gItem name="WCAG 2.0" id="1.4.6" />
<gItem name="Section508" id="c" />
<gItem name="JIS" id="5.5(a)" />
<gItem name="JIS" id="5.5(c)" />
@@ -596,6 +648,7 @@
<checkitem id="L_4" type="error" >
<guideline>
<gItem name="WCAG" id="3.4" />
+ <gItem name="WCAG 2.0" id="1.4.4" />
<gItem name="JIS" id="5.6(a)" />
</guideline>
<description>
@@ -604,6 +657,7 @@
</checkitem>
<checkitem id="L_5" type="error" >
<guideline>
+ <gItem name="WCAG 2.0" id="1.4.4" />
<gItem name="JIS" id="5.6(b)" />
</guideline>
<description>
@@ -612,6 +666,7 @@
</checkitem>
<checkitem id="L_6" type="error" >
<guideline>
+ <gItem name="WCAG 2.0" id="1.4.4" />
<gItem name="JIS" id="5.6(a)" />
<gItem name="JIS" id="5.6(b)" />
</guideline>
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/IBMGuideline.xml b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/IBMGuideline.xml
index 6655d07..6594bf9 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/IBMGuideline.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/IBMGuideline.xml
@@ -9,7 +9,7 @@
Contributors:
IBM Corporation - initial API and implementation
-->
-<guideline name="IBMGuideline" order="4">
+<guideline name="IBMGuideline" order="30">
<category>Accessibility</category>
<description>IBM Web Accessibility Checklist</description>
<mimetypes>
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
index 0b29c40..46d5a52 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
@@ -9,7 +9,7 @@
Contributors:
IBM Corporation - initial API and implementation
-->
-<guideline name="JIS" order="3">
+<guideline name="JIS" order="20">
<category>Accessibility</category>
<description>Japanese Industrial Standard (JIS X 8341-3)</description>
<mimetypes>
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/section508.xml b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/section508.xml
index fdff663..12a784d 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/section508.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/section508.xml
@@ -9,7 +9,7 @@
Contributors:
IBM Corporation - initial API and implementation
-->
-<guideline name="Section508" order="2">
+<guideline name="Section508" order="10">
<category>Accessibility</category>
<description>US Section 508 of the Rehabilitation Act</description>
<mimetypes>
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/wcag20.xml b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/wcag20.xml
new file mode 100644
index 0000000..2707b11
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/wcag20.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2009 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
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ IBM Corporation - initial API and implementation
+-->
+<guideline name="WCAG 2.0" order="2">
+<category>Accessibility</category>
+<description>W3C Web Content Accessibility Guidelines (WCAG) 2.0</description>
+<levels>
+ <level id="A">
+ <category>Accessibility</category>
+ <description>W3C Web Content Accessibility Guidelines (WCAG) 2.0 (A) <experimental></description>
+ </level>
+ <level id="AA">
+ <category>Accessibility</category>
+ <description>W3C Web Content Accessibility Guidelines (WCAG) 2.0 (AA) <experimental></description>
+ </level>
+ <level id="AAA">
+ <category>Accessibility</category>
+ <description>W3C Web Content Accessibility Guidelines (WCAG) 2.0 (AAA) <experimental></description>
+ </level>
+</levels>
+<mimetypes>
+ <mimetype>text/html</mimetype>
+ <mimetype>application/xhtml+xml</mimetype>
+</mimetypes>
+<items>
+ <gItem id="1.1.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#text-equiv-all</helpUrl>
+ </gItem>
+ <gItem id="1.2.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-av-only-alt</helpUrl>
+ </gItem>
+ <gItem id="1.2.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-captions</helpUrl>
+ </gItem>
+ <gItem id="1.2.3" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-audio-desc</helpUrl>
+ </gItem>
+ <gItem id="1.2.4" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-real-time-captions</helpUrl>
+ </gItem>
+ <gItem id="1.2.5" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-audio-desc-only</helpUrl>
+ </gItem>
+ <gItem id="1.2.6" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-sign</helpUrl>
+ </gItem>
+ <gItem id="1.2.7" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-extended-ad</helpUrl>
+ </gItem>
+ <gItem id="1.2.8" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-text-doc</helpUrl>
+ </gItem>
+ <gItem id="1.2.9" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#media-equiv-live-audio-only</helpUrl>
+ </gItem>
+ <gItem id="1.3.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#content-structure-separation-programmatic</helpUrl>
+ </gItem>
+ <gItem id="1.3.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#content-structure-separation-sequence</helpUrl>
+ </gItem>
+ <gItem id="1.3.3" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#content-structure-separation-understanding</helpUrl>
+ </gItem>
+ <gItem id="1.4.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-without-color</helpUrl>
+ </gItem>
+ <gItem id="1.4.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-dis-audio</helpUrl>
+ </gItem>
+ <gItem id="1.4.3" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-contrast</helpUrl>
+ </gItem>
+ <gItem id="1.4.4" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-scale</helpUrl>
+ </gItem>
+ <gItem id="1.4.5" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-text-presentation</helpUrl>
+ </gItem>
+ <gItem id="1.4.6" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast7</helpUrl>
+ </gItem>
+ <gItem id="1.4.7" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-noaudio</helpUrl>
+ </gItem>
+ <gItem id="1.4.8" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-visual-presentation</helpUrl>
+ </gItem>
+ <gItem id="1.4.9" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#visual-audio-contrast-text-images</helpUrl>
+ </gItem>
+ <gItem id="2.1.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#keyboard-operation-keyboard-operable</helpUrl>
+ </gItem>
+ <gItem id="2.1.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#keyboard-operation-trapping</helpUrl>
+ </gItem>
+ <gItem id="2.1.3" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#keyboard-operation-all-funcs</helpUrl>
+ </gItem>
+ <gItem id="2.2.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#time-limits-required-behaviors</helpUrl>
+ </gItem>
+ <gItem id="2.2.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#time-limits-pause</helpUrl>
+ </gItem>
+ <gItem id="2.2.3" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#time-limits-no-exceptions</helpUrl>
+ </gItem>
+ <gItem id="2.2.4" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#time-limits-postponed</helpUrl>
+ </gItem>
+ <gItem id="2.2.5" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#time-limits-server-timeout</helpUrl>
+ </gItem>
+ <gItem id="2.3.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#seizure-does-not-violate</helpUrl>
+ </gItem>
+ <gItem id="2.3.2" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#seizure-three-times</helpUrl>
+ </gItem>
+ <gItem id="2.4.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-skip</helpUrl>
+ </gItem>
+ <gItem id="2.4.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-title</helpUrl>
+ </gItem>
+ <gItem id="2.4.3" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-focus-order</helpUrl>
+ </gItem>
+ <gItem id="2.4.4" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-refs</helpUrl>
+ </gItem>
+ <gItem id="2.4.5" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-mult-loc</helpUrl>
+ </gItem>
+ <gItem id="2.4.6" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-descriptive</helpUrl>
+ </gItem>
+ <gItem id="2.4.7" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-focus-visible</helpUrl>
+ </gItem>
+ <gItem id="2.4.8" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-location</helpUrl>
+ </gItem>
+ <gItem id="2.4.9" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-link</helpUrl>
+ </gItem>
+ <gItem id="2.4.10" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#navigation-mechanisms-headings</helpUrl>
+ </gItem>
+ <gItem id="3.1.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-doc-lang-id</helpUrl>
+ </gItem>
+ <gItem id="3.1.2" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-other-lang-id</helpUrl>
+ </gItem>
+ <gItem id="3.1.3" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-idioms</helpUrl>
+ </gItem>
+ <gItem id="3.1.4" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-located</helpUrl>
+ </gItem>
+ <gItem id="3.1.5" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-supplements</helpUrl>
+ </gItem>
+ <gItem id="3.1.6" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#meaning-pronunciation</helpUrl>
+ </gItem>
+ <gItem id="3.2.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#consistent-behavior-receive-focus</helpUrl>
+ </gItem>
+ <gItem id="3.2.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#consistent-behavior-unpredictable-change</helpUrl>
+ </gItem>
+ <gItem id="3.2.3" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#consistent-behavior-consistent-locations</helpUrl>
+ </gItem>
+ <gItem id="3.2.4" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#consistent-behavior-consistent-functionality</helpUrl>
+ </gItem>
+ <gItem id="3.2.5" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#consistent-behavior-no-extreme-changes-context</helpUrl>
+ </gItem>
+ <gItem id="3.3.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-identified</helpUrl>
+ </gItem>
+ <gItem id="3.3.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-cues</helpUrl>
+ </gItem>
+ <gItem id="3.3.3" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-suggestions</helpUrl>
+ </gItem>
+ <gItem id="3.3.4" level="AA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-reversible</helpUrl>
+ </gItem>
+ <gItem id="3.3.5" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-context-help</helpUrl>
+ </gItem>
+ <gItem id="3.3.6" level="AAA">
+ <helpUrl>http://www.w3.org/TR/WCAG/#minimize-error-reversible-all</helpUrl>
+ </gItem>
+ <gItem id="4.1.1" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#ensure-compat-parses</helpUrl>
+ </gItem>
+ <gItem id="4.1.2" level="A">
+ <helpUrl>http://www.w3.org/TR/WCAG/#ensure-compat-rsv</helpUrl>
+ </gItem>
+</items>
+</guideline>
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
index d7afa91..4eb151e 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
@@ -116,11 +116,11 @@
.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
TreeColumn categoryColumn = new TreeColumn(guidelineTree, SWT.NONE);
- categoryColumn.setWidth(220);
+ categoryColumn.setWidth(240);
categoryColumn.setText(Messages.GuidelinePreferencePage_0);
TreeColumn guidelineColumn = new TreeColumn(guidelineTree, SWT.NONE);
- guidelineColumn.setWidth(350);
+ guidelineColumn.setWidth(450);
guidelineColumn.setText(Messages.GuidelinePreferencePage_1);
GuidelineTreeItemData root = new GuidelineTreeItemData(null);
@@ -271,6 +271,8 @@
setParameters();
+ /*
+ //TODO WCAG 2.0 support
if (this._guidelineHolder.isEnabledMetric("Navigability")) { //$NON-NLS-1$
IGuidelineData[] datas = this._guidelineHolder
@@ -282,7 +284,7 @@
for (int i = 0; i < datas.length; i++) {
if (datas[i].isEnabled()) {
if (datas[i].getGuidelineName().matches(
- "Section508|JIS|IBMGuideline")) { //$NON-NLS-1$
+ "Section508|JIS|IBMGuideline|WCAG 2.0")) { //$NON-NLS-1$
isOtherComp = true;
} else if (datas[i].getGuidelineName().equals("WCAG")) { //$NON-NLS-1$
isWcagOn = true;
@@ -321,6 +323,7 @@
}
}
}
+ */
return isOK;
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
index c1193e6..7ab1fc9 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and Others
+ * Copyright (c) 2006, 2009 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Norimasa HAYASHIDA - initial API and implementation
+ * Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
package org.eclipse.actf.visualization.eval.preferences;
@@ -22,24 +23,27 @@
public class GuidelineTreeItemData implements IGuidelineTreeItem {
- public static final int GUIDELINE_WCAG_P1 = 30;
+ private static final int GUIDELINE_WCAG_P1 = 30;
- public static final int GUIDELINE_WCAG_P2 = 31;
+ private static final int GUIDELINE_WCAG_P2 = 31;
- public static final int GUIDELINE_WCAG_P3 = 32;
+ private static final int GUIDELINE_WCAG_P3 = 32;
+
+ private static final int GUIDELINE_SECTION508 = 33;
- public static final int GUIDELINE_SECTION508 = 33;
+ private static final int GUIDELINE_JIS = 34;
- public static final int GUIDELINE_JIS = 34;
+ private static final int GUIDELINE_IBMGUIDELINE = 35;
- public static final int GUIDELINE_IBMGUIDELINE = 35;
+ private static final int GUIDELINE_IBMW3V8 = 36;
- public static final int GUIDELINE_IBMW3V8 = 36;
+ private static final int GUIDELINE_ODF = 37;
- public static final int GUIDELINE_ODF = 37;
+ private static final int GUIDELINE_PII = 38;
- public static final int GUIDELINE_PII = 38;
+ private static final int GUIDELINE_WACAG_2 = 50;
+
private int _guideline = -1;
private IGuidelineTreeItem _parent = null;
@@ -78,7 +82,7 @@
return this._children;
}
- public int getGuideline() {
+ private int getGuideline() {
return this._guideline;
}
@@ -105,6 +109,8 @@
this._guideline = GUIDELINE_ODF;
} else if (this._name.equals("PII")) {
this._guideline = GUIDELINE_PII;
+ } else if (this._name.startsWith("WCAG 2.0")){
+ this._guideline = GUIDELINE_WACAG_2;
}
}
}
@@ -117,6 +123,7 @@
case GUIDELINE_WCAG_P1:
case GUIDELINE_WCAG_P2:
case GUIDELINE_WCAG_P3:
+ case GUIDELINE_WACAG_2:
return EvaluationPlugin.getImageDescriptor("icons/media/w3c.png").createImage();
case GUIDELINE_SECTION508:
return EvaluationPlugin.getImageDescriptor("icons/media/508.png").createImage();
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/table/ResultTableViewer.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/table/ResultTableViewer.java
index 1712c37..e31b727 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/table/ResultTableViewer.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/table/ResultTableViewer.java
@@ -221,7 +221,7 @@
* "icons/IconPink.gif").createImage()); break; default: }
*/
if (enabledMetrics[i]) {
- columns[curPos].setWidth(75);
+ columns[curPos].setWidth(70);
} else {
columns[curPos].setWidth(0);
columns[curPos].setResizable(false);
@@ -233,7 +233,7 @@
for (int i = 0; i < dataArray.length; i++) {
columns[curPos].setText(dataArray[i].getGuidelineName());
if (dataArray[i].isMatched()) {
- columns[curPos].setWidth(65);
+ columns[curPos].setWidth(80);
} else {
columns[curPos].setWidth(0);
columns[curPos].setResizable(false);
