Bug 489096 - HTML5 support
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 6529b3f..f2a753d 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
@@ -228,7 +228,7 @@
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\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.1 = \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\u307e\u305f\u3001\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\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
C_600.3 = \u8868\u73fe\u3092\u901a\u3058\u3066\u4f1d\u9054\u3055\u308c\u3066\u3044\u308b\u60c5\u5831\u3001 \u69cb\u9020\u3001\u95a2\u4fc2\u6027\u306f\u3001\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u89e3\u91c8\u53ef\u80fd\u3067\u3042\u308b\u304b\u3001\u30c6\u30ad\u30b9\u30c8\u3067\u63d0\u4f9b\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
C_600.4 = \u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u63d0\u4f9b\u9806\u5e8f\u304c\u305d\u306e\u610f\u5473\u306b\u5f71\u97ff\u3092\u53ca\u307c\u3059\u5834\u5408\u306b\u306f\u3001\u6b63\u78ba\u306a\u8aad\u307f\u4e0a\u3052\u9806\u5e8f\u3092\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u89e3\u91c8\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
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 772b04e..1f150a6 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
@@ -146,10 +146,11 @@
}
}
- private static final String[] AUDIO_FILE_EXTENSION = { "mp3", "mid", "mrm", "mrl", "vqf", "wav" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ private static final String[] AUDIO_FILE_EXTENSION = { "mp3", "mid", "mrm", "mrl", "vqf", "wav", "ogg", "spx", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ "oga" };
private static final String[] MULTIMEDIA_FILE_EXTENSION = { "avi", "ram", "rm", "asf", "wm", "wmx", "wmv", "asx", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "mpeg", "mpg" }; //$NON-NLS-1$ //$NON-NLS-2$
+ "mpeg", "mpg", "mp4", "ogv", "3gp" }; //$NON-NLS-1$ //$NON-NLS-2$
/**
* debug flag for developers!
@@ -1276,11 +1277,61 @@
NodeList tmpNL = target.getElementsByTagName("math");
if (tmpNL.getLength() > 0) {
- addCheckerProblem("C_600.20", "MathML",tmpNL);
+ addCheckerProblem("C_600.20", "MathML", tmpNL);
}
tmpNL = target.getElementsByTagName("svg");
if (tmpNL.getLength() > 0) {
- addCheckerProblem("C_600.20", "SVG",tmpNL);
+ addCheckerProblem("C_600.20", "SVG", tmpNL);
+ }
+
+ Vector<Node> autoError = new Vector<Node>();
+ Vector<Node> autoUserCheck = new Vector<Node>();
+
+ tmpNL = target.getElementsByTagName("video");
+ if (tmpNL.getLength() > 0) {
+ addCheckerProblem("C_500.0", "", tmpNL);
+ addCheckerProblem("C_500.1", "", tmpNL);
+
+ addCheckerProblem("C_600.1", "", tmpNL);
+ addCheckerProblem("C_600.2", "", tmpNL);
+ addCheckerProblem("C_600.7", "", tmpNL);
+
+ for (int i = 0; i < tmpNL.getLength(); i++) {
+ Element e = (Element) tmpNL.item(i);
+ if (e.hasAttribute("autoplay")) {
+ String autoplay = e.getAttribute("autoplay");
+ if (!autoplay.equalsIgnoreCase("false")) {
+ autoError.add(e);
+ } else {
+ autoUserCheck.add(e);
+ }
+ } else {
+ autoUserCheck.add(e);
+ }
+ }
+ }
+ tmpNL = target.getElementsByTagName("audio");
+ if (tmpNL.getLength() > 0) {
+ addCheckerProblem("C_600.1", "", tmpNL);
+ for (int i = 0; i < tmpNL.getLength(); i++) {
+ Element e = (Element) tmpNL.item(i);
+ if (e.hasAttribute("autoplay")) {
+ String autoplay = e.getAttribute("autoplay");
+ if (!autoplay.equalsIgnoreCase("false")) {
+ autoError.add(e);
+ } else {
+ autoUserCheck.add(e);
+ }
+ } else {
+ autoUserCheck.add(e);
+ }
+ }
+ }
+ if (autoError.size() > 0) {
+ addCheckerProblem("C_85.0", "", autoError);
+ }
+ if (autoUserCheck.size() > 0) {
+ addCheckerProblem("C_600.6", "", autoUserCheck);
}
}
