Changeset 9239 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss
- Timestamp:
- 2016-01-01T17:01:08+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r9114 r9239 402 402 * @param env the environment 403 403 * @param key the property key 404 * @param layer layer 404 405 * @return the property value 405 406 */ … … 422 423 * @param env the environment 423 424 * @param key the property key 425 * @param layer layer 424 426 * @return {@code true} if the property is set, {@code false} otherwise 425 427 */ … … 676 678 * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} string for key {@code key}, 677 679 * and defaults to {@code def} if that is null. 680 * @param env the environment 678 681 * @param key Key in JOSM preference 679 682 * @param def Default value … … 1135 1138 /** 1136 1139 * Constructs a new {@code ParameterFunction}. 1140 * @param m method 1141 * @param args arguments 1142 * @param needsEnvironment whether function needs environment 1137 1143 */ 1138 1144 public ParameterFunction(Method m, List<Expression> args, boolean needsEnvironment) { … … 1208 1214 /** 1209 1215 * Constructs a new {@code ArrayFunction}. 1216 * @param m method 1217 * @param args arguments 1210 1218 */ 1211 1219 public ArrayFunction(Method m, List<Expression> args) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
r9099 r9239 52 52 * 53 53 */ 54 55 54 public class MapCSSParser { 56 55 MapCSSStyleSource sheet; … … 77 76 /** 78 77 * Constructor which initializes the parser with a certain lexical state. 78 * @param in input 79 * @param encoding contents encoding 80 * @param initState initial state 79 81 */ 80 82 public MapCSSParser(InputStream in, String encoding, LexicalState initState) { … … 95 97 /** 96 98 * Constructor which initializes the parser with a certain lexical state. 99 * @param in input 100 * @param initState initial state 97 101 */ 98 102 public MapCSSParser(Reader in, LexicalState initState) { … … 108 112 PARSER_END(MapCSSParser) 109 113 110 /** ***********114 /** 111 115 * Token definitions 112 116 * … … 222 226 223 227 224 /************* 225 * 228 /* 226 229 * Preprocessor parser definitions: 227 230 * … … 243 246 /** 244 247 * root method for the preprocessor. 248 * @param sheet MapCSS style source 249 * @return result string 250 * @throws ParseException in case of parsing error 245 251 */ 246 252 String pp_root(MapCSSStyleSource sheet): … … 260 266 * 261 267 * @param write false if this content should be skipped (@pp_media condition is not fulfilled), true otherwise 268 * @throws ParseException in case of parsing error 262 269 */ 263 270 void pp_black_box(boolean write): … … 284 291 * @param ignore if the content of this rule should be ignored 285 292 * (because we are already inside a @supports block that didn't pass) 293 * @throws ParseException in case of parsing error 286 294 */ 287 295 void pp_supports(boolean ignore): … … 302 310 * Unlike other parsing rules, grabs trailing whitespace. 303 311 * @return true, if the condition is fulfilled 312 * @throws ParseException in case of parsing error 304 313 */ 305 314 boolean pp_supports_condition(): … … 329 338 * 330 339 * @return true, if the condition is fulfilled 340 * @throws ParseException in case of parsing error 331 341 */ 332 342 boolean pp_supports_condition_in_parens(): … … 350 360 * 351 361 * @return true if the condition is fulfilled 362 * @throws ParseException in case of parsing error 352 363 */ 353 364 boolean pp_supports_declaration_condition(): … … 411 422 * 412 423 * @return true if the condition is fulfilled 424 * @throws ParseException in case of parsing error 413 425 */ 414 426 // deprecated … … 443 455 } 444 456 445 /************* 446 * 457 /* 447 458 * Parser definition for the main MapCSS parser: 448 459 * … … 542 553 /** 543 554 * white-space 555 * @throws ParseException in case of parsing error 544 556 */ 545 557 void s() : … … 552 564 /** 553 565 * mix of white-space and comments 566 * @throws ParseException in case of parsing error 554 567 */ 555 568 void w() : … … 562 575 /** 563 576 * comma delimited list of floats (at least 2, all >= 0) 577 * @return list of floats 578 * @throws ParseException in case of parsing error 564 579 */ 565 580 List<Float> float_array() : … … 581 596 /** 582 597 * entry point for the main parser 598 * @param sheet MapCSS style source 599 * @throws ParseException in case of parsing error 583 600 */ 584 601 void sheet(MapCSSStyleSource sheet): -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r9078 r9239 94 94 95 95 /** 96 * 96 * Constructs a new {@code ChildOrParentSelector}. 97 97 * @param a the first selector 98 * @param link link 98 99 * @param b the second selector 99 100 * @param type the selector type
Note:
See TracChangeset
for help on using the changeset viewer.