Skip to content

Commit 6e0dc7c

Browse files
committed
Also made the error "cleaner" in the report. This fixes w3c#331
1 parent 299f140 commit 6e0dc7c

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

org/w3c/css/atrules/css3/AtRuleMedia.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,23 @@
99
import org.w3c.css.atrules.css.media.MediaFeature;
1010
import org.w3c.css.parser.AtRule;
1111
import org.w3c.css.parser.CssError;
12-
import org.w3c.css.parser.analyzer.ParseException;
1312
import org.w3c.css.util.ApplContext;
1413
import org.w3c.css.util.InvalidParamException;
1514

1615
import java.util.ArrayList;
1716

1817
/**
19-
* @spec https://www.w3.org/TR/2017/CR-mediaqueries-4-20170905/
18+
* @spec https://www.w3.org/TR/2020/CR-mediaqueries-4-20200721/#media-types
2019
*/
2120

2221
public class AtRuleMedia extends org.w3c.css.atrules.css.AtRuleMedia {
2322
static final String[] mediaType = {
24-
"all", "print", "screen", "speech"
23+
"all", "print", "screen"
2524
};
2625

2726
static final String[] deprecatedMedia = {
2827
"aural", "braille", "embossed", "handheld", "projection",
29-
"tty", "tv"
28+
"speech", "tty", "tv"
3029
};
3130

3231
/**
@@ -35,7 +34,7 @@ public class AtRuleMedia extends org.w3c.css.atrules.css.AtRuleMedia {
3534
* @throws InvalidParamException the medium doesn't exist
3635
*/
3736
public org.w3c.css.atrules.css.AtRuleMedia addMedia(String restrictor, String medium,
38-
ApplContext ac) throws InvalidParamException {
37+
ApplContext ac) throws InvalidParamException {
3938
Media media = new Media();
4039
if (restrictor != null) {
4140
// the grammar construct will build a restrictor as 'not' or 'only'
@@ -63,11 +62,9 @@ public org.w3c.css.atrules.css.AtRuleMedia addMedia(String restrictor, String me
6362
if (medium.equals(s)) {
6463
// error because the current Media Queries spec states that
6564
// "Authors *must not* use these media types"
66-
ac.getFrame().addError(
67-
new CssError(new ParseException(String.format(
68-
ac.getMsg()
69-
.getString("warning.deprecatedmedia"),
70-
medium))));
65+
CssError error;
66+
error = new CssError(new InvalidParamException("deprecatedmedia", medium, ac));
67+
ac.getFrame().addError(error);
7168
allMedia.add(new Media(s));
7269
return this;
7370
}

org/w3c/css/util/Messages.properties.en

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ parser.import_not_allowed: @import are not allowed after any valid statement oth
429429
error.bg_order: In the CSS3 background definition, \u201Cbg_position\u201D must occur before / \u201Cbg_size\u201D if both are present
430430

431431
warning.deprecatedmedia: The media \u201C%s\u201D has been deprecated
432+
error.deprecatedmedia: The media \u201C%s\u201D has been deprecated
432433
deprecatedmediafeature: Deprecated media feature \u201C%s\u201D. For guidance, see the Deprecated Media Features section in the current Media Queries specification.
433434
error.nomediarestrictor: Mediarestrictor not defined in this CSS level
434435
error.nomediafeature: Media features are not defined in this CSS level

org/w3c/css/util/Messages.properties.fr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ parser.import_not_allowed: @import n'est pas autorisé s'il apparaît après tou
447447
error.bg_order: Dans la définition de CSS3 background, 'bg_position' doit apparaître avant / 'bg_size' si les deux sont présent
448448

449449
warning.deprecatedmedia: L'utilisation du media "\u201C%s\u201D" est déconseillée
450+
error.deprecatedmedia: L'utilisation du media "\u201C%s\u201D" est déconseillée
450451
deprecatedmediafeature: La propriétés de media \u201C%s\u201D est déconseillée. Pour plus d'information, regardez la section "Deprecated Media Features" dans la version actuelle de la spécification Media Queries.
451452

452453
error.nomediarestrictor: Les limitations de media ne sont pas définies dans ce niveau de CSS

org/w3c/css/util/Messages.properties.pl-PL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ error.strictly-positive: \u201C%s\u201D jest niepoprawny, dozwolone są jedynie
393393
error.typevaluemismatch: Wartość \u201C%s\u201D jest niekompatybilna z zadeklarowanym typem <\u201C%s\u201D>
394394
vendorext: Rozszerzenia Dostawców
395395
warning.deprecatedmedia: Medium "\u201C%s\u201D" jest przestarzałe
396+
error.deprecatedmedia: Medium "\u201C%s\u201D" jest przestarzałe
396397
warning.noexproperty: Właściwość \u201C%s\u201D nie istnieje
397398
error.errortoken: Nieoczekiwana zawartość "\u201C%s\u201D" w wierszu \u201C%s\u201D, oczekiwano tokena \u201C%s\u201D (pominięto \u201C%s\u201D)
398399
warning.vendor-ext-pseudo-element: \u201C%s\u201D jest nieznanym przedrostkiem pseudo-elementu

org/w3c/css/util/Messages.properties.pt-BR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ vext_errors: Erros
403403
vext_warnings: Alertas
404404
warning.deprecated: O valor '\u201C%s\u201D' está em desuso
405405
warning.deprecatedmedia: A mídia "\u201C%s\u201D" está em desuso
406+
error.deprecatedmedia: A mídia "\u201C%s\u201D" está em desuso
406407
warning.deprecatedproperty: A propriedade '\u201C%s\u201D' está em desuso
407408
warning.greaterequal: O valor \u201C%s\u201D será interpretado como \u201C%s\u201D
408409
warning.link-type: Deve ser declarado o atributo 'type' com valor 'text/css' para o elemento link

org/w3c/css/util/Messages.properties.ru

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,5 +367,6 @@ vext_errors: Ошибки
367367
vext_warnings: Предупреждения
368368
369369
warning.deprecatedmedia: Среда "\u201C%s\u201D" устарела.
370+
error.deprecatedmedia: Среда "\u201C%s\u201D" устарела.
370371
warning.link-type: Вы должны добавить атрибут 'type' со значением 'text/css' к элементу 'link'
371372
warning.vendor-extension: Свойство \u201C%s\u201D - неизвестное расширение поставщика

org/w3c/css/util/Messages.properties.sv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ vext_warnings: Varningar
389389
warning.link-type: Du bör addera ett 'type'-attribut med värde 'text/css' till 'link'-elementet
390390

391391
warning.deprecatedmedia: Media "\u201C%s\u201D" har nedgraderats
392+
error.deprecatedmedia: Media "\u201C%s\u201D" har nedgraderats
392393
error.nomodifiershortmedia: Prefix kan inte användas för mediafunktionaliteter utan värden
393394
error.nomodifiermedia: Mediafunktionalitet \u201C%s\u201D stöder inte prefix
394395
error.grid: Enbart 0 och 1 är giltiga värden för grid

0 commit comments

Comments
 (0)