Changeset 8836 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
- Timestamp:
- 2015-10-08T00:22:36+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r8821 r8836 62 62 private static final String SEARCH_EXPRESSION = "searchExpression"; 63 63 64 public staticenum SearchMode {64 public enum SearchMode { 65 65 replace('R'), add('A'), remove('D'), in_selection('S'); 66 66 … … 178 178 private final HistoryComboBox hcb; 179 179 180 publicSearchKeywordRow(HistoryComboBox hcb) {180 SearchKeywordRow(HistoryComboBox hcb) { 181 181 super(new FlowLayout(FlowLayout.LEFT)); 182 182 this.hcb = hcb; … … 352 352 .addTitle(tr("basic examples")) 353 353 .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key")) 354 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")) 355 ,GBC.eol());354 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")), 355 GBC.eol()); 356 356 right.add(new SearchKeywordRow(hcbSearchString) 357 357 .addTitle(tr("basics")) … … 367 367 tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped " + 368 368 "by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."), 369 "\"addr:street\"") 370 ,GBC.eol());369 "\"addr:street\""), 370 GBC.eol()); 371 371 right.add(new SearchKeywordRow(hcbSearchString) 372 372 .addTitle(tr("combinators")) … … 375 375 .addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)")) 376 376 .addKeyword("-<i>expr</i>", null, tr("logical not")) 377 .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions")) 378 ,GBC.eol());377 .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions")), 378 GBC.eol()); 379 379 380 380 if (Main.pref.getBoolean("expert", false)) { … … 385 385 .addKeyword("type:relation", "type:relation ", tr("all relations")) 386 386 .addKeyword("closed", "closed ", tr("all closed ways")) 387 .addKeyword("untagged", "untagged ", tr("object without useful tags")) 388 ,GBC.eol());387 .addKeyword("untagged", "untagged ", tr("object without useful tags")), 388 GBC.eol()); 389 389 right.add(new SearchKeywordRow(hcbSearchString) 390 390 .addTitle(tr("metadata")) … … 395 395 "changeset:0 (objects without an assigned changeset)") 396 396 .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/", 397 "timestamp:2008/2011-02-04T12") 398 ,GBC.eol());397 "timestamp:2008/2011-02-04T12"), 398 GBC.eol()); 399 399 right.add(new SearchKeywordRow(hcbSearchString) 400 400 .addTitle(tr("properties")) … … 404 404 .addKeyword("role:", "role:", tr("objects with given role in a relation")) 405 405 .addKeyword("areasize:<i>-100</i>", "areasize:", tr("closed ways with an area of 100 m\u00b2")) 406 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")) 407 ,GBC.eol());406 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")), 407 GBC.eol()); 408 408 right.add(new SearchKeywordRow(hcbSearchString) 409 409 .addTitle(tr("state")) … … 411 411 .addKeyword("new", "new ", tr("all new objects")) 412 412 .addKeyword("selected", "selected ", tr("all selected objects")) 413 .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")) 414 ,GBC.eol());413 .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")), 414 GBC.eol()); 415 415 right.add(new SearchKeywordRow(hcbSearchString) 416 416 .addTitle(tr("related objects")) … … 420 420 tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1") 421 421 .addKeyword("nth%:<i>7</i>", "nth%: ", 422 tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)") 423 ,GBC.eol());422 tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)"), 423 GBC.eol()); 424 424 right.add(new SearchKeywordRow(hcbSearchString) 425 425 .addTitle(tr("view")) … … 428 428 .addKeyword("indownloadedarea", "indownloadedarea ", tr("objects in downloaded area")) 429 429 .addKeyword("allindownloadedarea", "allindownloadedarea ", 430 tr("objects (and all its way nodes / relation members) in downloaded area")) 431 ,GBC.eol());430 tr("objects (and all its way nodes / relation members) in downloaded area")), 431 GBC.eol()); 432 432 } 433 433 }
Note:
See TracChangeset
for help on using the changeset viewer.
