Skip to content

Commit b76efe5

Browse files
committed
cleaner error output
1 parent 789c80f commit b76efe5

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

org/w3c/css/atrules/css/media/MediaFeature.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.w3c.css.atrules.css.media;
22

33
import org.w3c.css.css.StyleSheetOrigin;
4-
import org.w3c.css.parser.analyzer.ParseException;
54
import org.w3c.css.parser.CssError;
65
import org.w3c.css.util.ApplContext;
76
import org.w3c.css.util.InvalidParamException;
@@ -42,6 +41,7 @@ public abstract class MediaFeature implements StyleSheetOrigin {
4241

4342
/**
4443
* Set the combinator used in more complex expressions.
44+
*
4545
* @param combinator, the combinator string (and, or etc...)
4646
*/
4747
public void setCombinator(String combinator) {
@@ -50,7 +50,8 @@ public void setCombinator(String combinator) {
5050

5151
/**
5252
* Get the combinator string if present, null otherwise
53-
* @return a String
53+
*
54+
* @return a String
5455
*/
5556
public String getCombinator() {
5657
return combinator;
@@ -63,9 +64,9 @@ public void reportDeprecatedMediaFeature(ApplContext ac, String modifier) {
6364
} else {
6465
feature = getFeatureName();
6566
}
66-
ac.getFrame().addError(new CssError(new ParseException(
67-
String.format(ac.getMsg().getString("deprecatedmediafeature"),
68-
feature))));
67+
CssError err = new CssError(new InvalidParamException("deprecatedmediafeature",
68+
feature, ac));
69+
ac.getFrame().addError(err);
6970
}
7071

7172
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ error.bg_order: In the CSS3 background definition, \u201Cbg_position\u201D must
430430

431431
warning.deprecatedmedia: The media \u201C%s\u201D has been deprecated
432432
error.deprecatedmedia: The media \u201C%s\u201D has been deprecated
433-
deprecatedmediafeature: Deprecated media feature \u201C%s\u201D. For guidance, see the Deprecated Media Features section in the current Media Queries specification.
433+
error.deprecatedmediafeature: Deprecated media feature \u201C%s\u201D. For guidance, see the Deprecated Media Features section in the current Media Queries specification.
434434
error.nomediarestrictor: Mediarestrictor not defined in this CSS level
435435
error.nomediafeature: Media features are not defined in this CSS level
436436
error.nomodifiershortmedia: No prefixes are allowed for media features with no value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ error.bg_order: Dans la définition de CSS3 background, 'bg_position' doit appar
448448

449449
warning.deprecatedmedia: L'utilisation du media "\u201C%s\u201D" est déconseillée
450450
error.deprecatedmedia: L'utilisation du media "\u201C%s\u201D" est déconseillée
451-
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.
451+
error.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.
452452

453453
error.nomediarestrictor: Les limitations de media ne sont pas définies dans ce niveau de CSS
454454
error.nomediafeature: Les propriétés de media ne sont pas définies dans ce niveau de CSS

0 commit comments

Comments
 (0)