Changeset 12656 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/PushbackTokenizer.java

Timestamp:

2017-08-26T00:40:19+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move SearchCompiler from actions.search to data.osm.search

Location:

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

Files:

• . (added)
• PushbackTokenizer.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java ) (6 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions.search;
+package org.openstreetmap.josm.data.osm.search;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -11 +11 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 
@@ -17 +16 @@
  * This class is used to parse a search string and split it into tokens.
  * It provides methods to parse numbers and extract strings.
+ * @since 12656 (moved from actions.search package)
  */
 public class PushbackTokenizer {
@@ -300 +300 @@
      * @param errorMessage The error if the number cannot be read
      * @return The number that was found
-     * @throws ParseError if there is no number
-     */
-    public long readNumber(String errorMessage) throws ParseError {
+     * @throws SearchParseError if there is no number
+     */
+    public long readNumber(String errorMessage) throws SearchParseError {
         if ((nextToken() == Token.KEY) && (currentNumber != null))
             return currentNumber;
         else
-            throw new ParseError(errorMessage);
+            throw new SearchParseError(errorMessage);
     }
 
@@ -321 +321 @@
      * @param errorMessage The error if the input is malformed
      * @return The range that was found
-     * @throws ParseError If the input is not as expected for a range
-     */
-    public Range readRange(String errorMessage) throws ParseError {
+     * @throws SearchParseError If the input is not as expected for a range
+     */
+    public Range readRange(String errorMessage) throws SearchParseError {
         if (nextToken() != Token.KEY || (currentNumber == null && currentRange == null)) {
-            throw new ParseError(errorMessage);
+            throw new SearchParseError(errorMessage);
         } else if (!isRange && currentNumber != null) {
             if (currentNumber >= 0) {
@@ -337 +337 @@
             return new Range(currentNumber, currentRange);
         } else {
-            throw new ParseError(errorMessage);
+            throw new SearchParseError(errorMessage);
         }
     }