Changeset 13887 in josm for trunk/src

Timestamp:

2018-06-04T00:50:29+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16335 - code simplification, javadoc

Location:

trunk/src/org/openstreetmap/josm/data/osm/search

Files:

• SearchCompiler.java (modified) (2 diffs)
• SearchSetting.java (modified) (1 diff)

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

@@ -89 +89 @@
     }
 
+    /**
+     * Constructs a new {@code SearchCompiler}.
+     * @param caseSensitive {@code true} to perform a case-sensitive search
+     * @param regexSearch {@code true} to perform a regex-based search
+     * @param tokenizer to split the search string into tokens
+     */
     public SearchCompiler(boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) {
         this.caseSensitive = caseSensitive;
@@ -276 +282 @@
          */
         public boolean match(Tagged tagged) {
-            return tagged instanceof OsmPrimitive ? match((OsmPrimitive) tagged) : false;
+            return tagged instanceof OsmPrimitive && match((OsmPrimitive) tagged);
         }
 

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

@@ -14 +14 @@
  */
 public class SearchSetting {
+    /** Search text */
     public String text;
+    /** Search mode */
     public SearchMode mode;
+    /** {@code true} to perform a case-sensitive search */
     public boolean caseSensitive;
+    /** {@code true} to perform a regex-based search */
     public boolean regexSearch;
+    /** {@code true} to execute a MapCSS selector */
     public boolean mapCSSSearch;
+    /** {@code true} to include all objects (even incomplete and deleted ones) */
     public boolean allElements;