Changeset 18173 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchSetting.java

Timestamp:

2021-08-24T02:43:50+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20690 - fix #21240 - Refactoring of UploadDialog, HistoryComboBox and AutoCompletingComboBox (patch by marcello)

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchSetting.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchSetting.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -50 +51 @@
     @Override
     public String toString() {
+        return Utils.shortenString(text,
+            org.openstreetmap.josm.actions.search.SearchAction.MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY);
+    }
+
+    /**
+     * A more talkative version of toString.
+     * @return a bit more info than toString
+     * @since 18173
+     */
+    public String toStringEx() {
         String cs = caseSensitive ?
                 /*case sensitive*/  trc("search", "CS") :
@@ -140 +151 @@
 
     /**
+     * Build a SearchSetting from a plain unformatted string.
+     * <p>
+     * All attributes are defaulted, only the search string is set. This function is used in
+     * {@link org.openstreetmap.josm.gui.download.OverpassQueryWizardDialog}.
+     *
+     * @param s The string
+     * @return The instance
+     * @since 18173
+     */
+    public static SearchSetting fromString(String s) {
+        if (s.isEmpty())
+            return null;
+        SearchSetting result = new SearchSetting();
+        result.text = s;
+        return result;
+    }
+
+    /**
      * Builds a string representation of the {@code SearchSetting} object,
      * see {@link #readFromString(String)} for more details.