Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4372)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4373)
@@ -127,4 +127,26 @@
} else {
searchWithoutHistory((SearchSetting) parameters.get(SEARCH_EXPRESSION));
+ }
+ }
+
+ private static class DescriptionTextBuilder {
+
+ StringBuilder s = new StringBuilder(4096);
+
+ public StringBuilder append(String string) {
+ return s.append(string);
+ }
+
+ StringBuilder appendItem(String item) {
+ return append("").append(item).append("\n");
+ }
+
+ StringBuilder appendItemHeader(String itemHeader) {
+ return append("\n");
+ }
+
+ @Override
+ public String toString() {
+ return s.toString();
}
}
@@ -178,38 +200,41 @@
JPanel right = new JPanel();
- JLabel description =
- new JLabel(""
- + "- "+tr("Baker Street - ''Baker'' and ''Street'' in any key or name.")+"
"
- + "- "+tr("\"Baker Street\" - ''Baker Street'' in any key or name.")+"
"
- + "- "+tr("name:Bak - ''Bak'' anywhere in the name.")+"
"
- + "- "+tr("type=route - key ''type'' with value exactly ''route''.") + "
"
- + "- "+tr("type=* - key ''type'' with any value. Try also *=value, type=, *=*, *=") + "
"
- + "- "+tr("-name:Bak - not ''Bak'' in the name.")+"
"
- + "- "+tr("oneway? - oneway=yes, true, 1 or on")+"
"
- + "- "+tr("foot: - key=foot set to any value.")+"
"
- + "- "+tr("Special targets:")+"
"
- + "- "+tr("type: - type of the object (node, way, relation)")+"
"
- + "- "+tr("user:... - all objects changed by user")+"
"
- + "- "+tr("user:anonymous - all objects changed by anonymous users")+"
"
- + "- "+tr("id:... - object with given ID (0 for new objects)")+"
"
- + "- "+tr("version:... - object with given version (0 objects without an assigned version)")+"
"
- + "- "+tr("changeset:... - object with given changeset id (0 objects without assigned changeset)")+"
"
- + "- "+tr("nodes:... - object with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)")+"
"
- + "- "+tr("tags:... - object with given number of tags (nodes:count, nodes:min-max, nodes:min- or nodes:-max)")+"
"
- + "- "+tr("role:... - object with given role in a relation")+"
"
- + "- "+tr("timestamp:... - objects with this timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)")+"
"
- + "- "+tr("areasize:... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)")+"
"
- + "- "+tr("modified - all changed objects")+"
"
- + "- "+tr("selected - all selected objects")+"
"
- + "- "+tr("incomplete - all incomplete objects")+"
"
- + "- "+tr("untagged - all untagged objects")+"
"
- + "- "+tr("closed - all closed ways (a node is not considered closed)")+"
"
- + "- "+tr("child expr - all children of objects matching the expression")+"
"
- + "- "+tr("parent expr - all parents of objects matching the expression")+"
"
- + "- "+tr("Use | or OR to combine with logical or")+"
"
- + "- "+tr("Use \" to quote operators (e.g. if key contains :)") + "
"
- + tr("Within quoted strings the \" and \\ characters need to be escaped by a preceding \\ (e.g. \\\" and \\\\).")+" "
- + "- "+tr("Use ( and ) to group expressions")+"
"
- + "
");
+ DescriptionTextBuilder descriptionText = new DescriptionTextBuilder();
+ descriptionText.append("");
+ descriptionText.appendItem(tr("Baker Street - ''Baker'' and ''Street'' in any key or name."));
+ descriptionText.appendItem(tr("\"Baker Street\" - ''Baker Street'' in any key or name."));
+ descriptionText.appendItem(tr("name:Bak - ''Bak'' anywhere in the name."));
+ descriptionText.appendItem(tr("type=route - key ''type'' with value exactly ''route''.") + "");
+ descriptionText.appendItem(tr("type=* - key ''type'' with any value. Try also *=value, type=, *=*, *=") + "");
+ descriptionText.appendItem(tr("-name:Bak - not ''Bak'' in the name."));
+ descriptionText.appendItem(tr("oneway? - oneway=yes, true, 1 or on"));
+ descriptionText.appendItem(tr("foot: - key=foot set to any value."));
+ descriptionText.appendItemHeader(tr("Special targets"));
+ descriptionText.appendItem(tr("type: - objects with corresponding type (node, way, relation)"));
+ descriptionText.appendItem(tr("user:... - objects changed by user"));
+ descriptionText.appendItem(tr("user:anonymous - objects changed by anonymous users"));
+ descriptionText.appendItem(tr("id:... - objects with given ID (0 for new objects)"));
+ descriptionText.appendItem(tr("version:... - objects with given version (0 objects without an assigned version)"));
+ descriptionText.appendItem(tr("changeset:... - objects with given changeset id (0 objects without assigned changeset)"));
+ descriptionText.appendItem(tr("nodes:... - objects with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
+ descriptionText.appendItem(tr("tags:... - objects with given number of tags (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
+ descriptionText.appendItem(tr("role:... - objects with given role in a relation"));
+ descriptionText.appendItem(tr("timestamp:... - objects with this timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"));
+ descriptionText.appendItem(tr("areasize:... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)"));
+ descriptionText.appendItem(tr("modified - all changed objects"));
+ descriptionText.appendItem(tr("selected - all selected objects"));
+ descriptionText.appendItem(tr("incomplete - all incomplete objects"));
+ descriptionText.appendItem(tr("untagged - all untagged objects"));
+ descriptionText.appendItem(tr("closed - all closed ways (a node is not considered closed)"));
+ descriptionText.appendItem(tr("child expr - all children of objects matching the expression"));
+ descriptionText.appendItem(tr("parent expr - all parents of objects matching the expression"));
+ descriptionText.appendItem(tr("(all)inDownloadedArea - objects (and all its way nodes / relation members) in downloaded area"));
+ descriptionText.appendItem(tr("Use | or OR to combine with logical or"));
+ descriptionText.appendItem(tr("Use \" to quote operators (e.g. if key contains :)")
+ + "
"
+ + tr("Within quoted strings the \" and \\ characters need to be escaped by a preceding \\ (e.g. \\\" and \\\\)."));
+ descriptionText.appendItem(tr("Use ( and ) to group expressions"));
+ descriptionText.append("
");
+ JLabel description = new JLabel(descriptionText.toString());
description.setFont(description.getFont().deriveFont(Font.PLAIN));
right.add(description);