Changeset 6742 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

Timestamp:

2014-01-19T20:59:05+01:00 (10 years ago)

Author:

simon04

Message:

fix #7686 - Shorten long search expression for display purposes (in dialogs, tooltips)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -56 +56 @@
 
     public static final int DEFAULT_SEARCH_HISTORY_SIZE = 15;
+    /** Maximum number of characters before the search expression is shortened for display purposes. */
+    public static final int MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY = 100;
 
     private static final String SEARCH_EXPRESSION = "searchExpression";
@@ -321 +323 @@
                     new ToolbarPreferences.ActionDefinition(Main.main.menu.search);
             aDef.getParameters().put(SEARCH_EXPRESSION, initialValues);
-            aDef.setName(initialValues.text); // Display search expression as tooltip instead of generic one
+            aDef.setName(Utils.shortenString(initialValues.text, MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY)); // Display search expression as tooltip instead of generic one
             // parametrized action definition is now composed
             ActionParser actionParser = new ToolbarPreferences.ActionParser(null);
@@ -588 +590 @@
         if (foundMatches == 0) {
             String msg = null;
+            final String text = Utils.shortenString(s.text, MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY);
             if (s.mode == SearchMode.replace) {
-                msg = tr("No match found for ''{0}''", s.text);
+                msg = tr("No match found for ''{0}''", text);
             } else if (s.mode == SearchMode.add) {
-                msg = tr("Nothing added to selection by searching for ''{0}''", s.text);
+                msg = tr("Nothing added to selection by searching for ''{0}''", text);
             } else if (s.mode == SearchMode.remove) {
-                msg = tr("Nothing removed from selection by searching for ''{0}''", s.text);
+                msg = tr("Nothing removed from selection by searching for ''{0}''", text);
             } else if (s.mode == SearchMode.in_selection) {
-                msg = tr("Nothing found in selection by searching for ''{0}''", s.text);
+                msg = tr("Nothing found in selection by searching for ''{0}''", text);
             }
             Main.map.statusLine.setHelpText(msg);