Changeset 6742 in josm for trunk

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (3 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

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);

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -38 +38 @@
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
+import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -74 +75 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -275 +277 @@
             putValue(NAME, tr("Search"));
             putValue(SHORT_DESCRIPTION,   tr("Search for objects"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs","search"));
             updateEnabledState();
         }
@@ -657 +659 @@
 
         public SearchMenuItem(SearchSetting s) {
-            super(s.toString());
+            super(Utils.shortenString(s.toString(), org.openstreetmap.josm.actions.search.SearchAction.MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY));
             this.s = s;
             addActionListener(this);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -806 +806 @@
                 selection = null;
             }
-            if (positionString.length() > 20) {
-                positionString = positionString.substring(0, 17) + "...";
-            }
-            return positionString;
+            return Utils.shortenString(positionString, 20);
         }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -947 +947 @@
         return biggerCopy;
     }
+
+    /**
+     * If the string {@code s} is longer than {@code maxLength}, the string is cut and "..." is appended.
+     */
+    public static String shortenString(String s, int maxLength) {
+        if (s != null && s.length() > maxLength) {
+            return s.substring(0, maxLength - 3) + "...";
+        } else {
+            return s;
+        }
+    }
 }