Changeset 17208 in josm for trunk/src/org

Timestamp:

2020-10-15T17:00:31+02:00 (4 years ago)

Author:

GerdP

Message:

see #19875: Inactive Map Paint styles cause bad performance

• remove support for deprecated @media in mapcss parser

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -7 +7 @@
 PARSER_BEGIN(MapCSSParser)
 package org.openstreetmap.josm.gui.mappaint.mapcss.parsergen;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.InputStream;
@@ -16 +14 @@
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
@@ -51 +48 @@
  * (a) the preprocessor and (b) the main mapcss parser.
  *
- * The preprocessor handles @supports and @media syntax (@media is deprecated).
+ * The preprocessor handles @supports syntax.
  * Basically this allows to write one style for different versions of JOSM (or different editors).
  * When the @supports condition is not fulfilled, it should simply skip over
@@ -137 +134 @@
 |   < PP_NOT: "not" >
 |   < PP_SUPPORTS: "@supports" >
-|   < PP_MEDIA: "@media" >
 |   < PP_NEWLINECHAR: "\n" | "\r" | "\f" >
 |   < PP_WHITESPACE: " " | "\t" >
@@ -294 +290 @@
             pp_supports(!write)
         |
-            pp_media(!write)
-        |
             t=<LBRACE> { if (write) sb.append(t.image); } pp_black_box(write) t=<RBRACE> { if (write) sb.append(t.image); }
     )*
@@ -377 +371 @@
  */
 boolean pp_supports_declaration_condition():
-{
-    Token t;
-    String feature;
-    Object val = null;
-}
-{
-    <LPAR> pp_w() t=<IDENT> { feature = t.image; } pp_w() ( <COLON> pp_w() val=literal() )? <RPAR>
-    { return this.sheet.evalSupportsDeclCondition(feature, val); }
-}
-
-// deprecated
-void pp_media(boolean ignore):
-{
-    boolean pass = false;
-    boolean q;
-    boolean empty = true;
-}
-{
-    {
-        if (sheet != null) {
-            String msg = tr("Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use ''{2}'' instead.",
-                            "@media", sheet.getDisplayString(), "@supports");
-            Logging.error(msg);
-            sheet.logWarning(msg);
-        }
-    }
-    <PP_MEDIA> pp_w()
-    ( q=pp_media_query() { pass = pass || q; empty = false; }
-        ( <COMMA> pp_w() q=pp_media_query() { pass = pass || q; } )*
-    )?
-    <LBRACE>
-    pp_black_box((empty || pass) && !ignore)
-    <RBRACE>
-}
-
-// deprecated
-boolean pp_media_query():
-{
-    Token t;
-    String mediatype = "all";
-    boolean pass = true;
-    boolean invert = false;
-    boolean e;
-}
-{
-    ( <PP_NOT> { invert = true; } pp_w() )?
-    (
-            t=<IDENT> { mediatype = t.image.toLowerCase(Locale.ENGLISH); } pp_w()
-            ( <PP_AND> pp_w() e=pp_media_expression() { pass = pass && e; } pp_w() )*
-        |
-            e=pp_media_expression() { pass = pass && e; } pp_w()
-            ( <PP_AND> pp_w() e=pp_media_expression() { pass = pass && e; } pp_w() )*
-    )
-    { 
-        if (!"all".equals(mediatype)) {
-            pass = false;
-        }
-        return invert ? (!pass) : pass;
-    }
-}
-
-/**
- * Parse an @media expression.
- *
- * The parsing rule {@link #literal()} from the main mapcss parser is reused here.
- *
- * @return true if the condition is fulfilled
- * @throws ParseException in case of parsing error
- */
-// deprecated
-boolean pp_media_expression():
 {
     Token t;