Changeset 16358 in josm

Timestamp:

2020-04-19T14:54:59+02:00 (5 years ago)

Author:

simon04

Message:

see #18164 - Rename class to SearchCompilerQueryWizard

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MainInitialization.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/SearchCompilerQueryWizard.java (moved) (moved from trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java ) (3 diffs)
• test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java ) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/MainInitialization.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -37 +38 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
 import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -127 +127 @@
     @Override
     public List<Callable<?>> asynchronousCallableTasks() {
-        return Arrays.asList(
-                OverpassTurboQueryWizard::getInstance
-            );
+        return Collections.emptyList();
     }
 

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.download.overpass.OverpassWizardRegistration.OverpassWizardCallbacks;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
+import org.openstreetmap.josm.tools.SearchCompilerQueryWizard;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
@@ -82 +82 @@
 
     /**
-     * Tries to process a search term using {@link OverpassTurboQueryWizard}. If the term cannot
+     * Tries to process a search term using {@link SearchCompilerQueryWizard}. If the term cannot
      * be parsed, the the corresponding dialog is shown.
      * @param searchTerm The search term to parse.
@@ -91 +91 @@
     private Optional<String> tryParseSearchTerm(String searchTerm) {
         try {
-            return Optional.of(OverpassTurboQueryWizard.getInstance().constructQuery(searchTerm));
+            return Optional.of(SearchCompilerQueryWizard.getInstance().constructQuery(searchTerm));
         } catch (UncheckedParseException | IllegalStateException ex) {
             Logging.error(ex);

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

@@ -24 +24 @@
  * @since 8744 (using tyrasd/overpass-wizard), 16262 (standalone)
  */
-public final class OverpassTurboQueryWizard {
-
-    private static final OverpassTurboQueryWizard instance = new OverpassTurboQueryWizard();
+public final class SearchCompilerQueryWizard {
+
+    private static final SearchCompilerQueryWizard instance = new SearchCompilerQueryWizard();
 
     /**
@@ -33 +33 @@
      * @return the unique instance of this class
      */
-    public static OverpassTurboQueryWizard getInstance() {
+    public static SearchCompilerQueryWizard getInstance() {
         return instance;
     }
 
-    private OverpassTurboQueryWizard() {
+    private SearchCompilerQueryWizard() {
         // private constructor for utility class
     }
@@ -182 +182 @@
     private static List<Match> normalizeToDNF(final Match match) {
         if (match instanceof SearchCompiler.And) {
-            return ((SearchCompiler.And) match).map(OverpassTurboQueryWizard::normalizeToDNF, (lhs, rhs) -> lhs.stream()
+            return ((SearchCompiler.And) match).map(SearchCompilerQueryWizard::normalizeToDNF, (lhs, rhs) -> lhs.stream()
                     .flatMap(l -> rhs.stream().map(r -> new SearchCompiler.And(l, r)))
                     .collect(Collectors.toList()));
         } else if (match instanceof SearchCompiler.Or) {
-            return ((SearchCompiler.Or) match).map(OverpassTurboQueryWizard::normalizeToDNF, CompositeList::new);
+            return ((SearchCompiler.Or) match).map(SearchCompilerQueryWizard::normalizeToDNF, CompositeList::new);
         } else if (match instanceof SearchCompiler.Xor) {
             throw new UnsupportedOperationException(match.toString());

trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
+import org.openstreetmap.josm.tools.SearchCompilerQueryWizard;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -59 +59 @@
 
     private String getExpandedQuery(String search) {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search);
+        final String query = SearchCompilerQueryWizard.getInstance().constructQuery(search);
         final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query)
                 .getRequestForBbox(1, 2, 3, 4)

trunk/test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java

@@ -12 +12 @@
 
 /**
- * Unit tests of {@link OverpassTurboQueryWizard} class.
+ * Unit tests of {@link SearchCompilerQueryWizard} class.
  */
-public class OverpassTurboQueryWizardTest {
+public class SearchCompilerQueryWizardTest {
     /**
      * Base test environment is enough
@@ -22 +22 @@
     public JOSMTestRules test = new JOSMTestRules().i18n("de");
 
+    private static String constructQuery(String s) {
+        return SearchCompilerQueryWizard.getInstance().constructQuery(s);
+    }
+
     private void assertQueryEquals(String expectedQueryPart, String input) {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery(input);
+        final String query = constructQuery(input);
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -139 +143 @@
     @Test
     public void testInArea() {
-        String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in Innsbruck");
+        String query = constructQuery("foo=bar | foo=baz in Innsbruck");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -149 +153 @@
                 "(._;>;);\n" +
                 "out meta;", query);
-        query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\"");
+        query = constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -159 +163 @@
                 "(._;>;);\n" +
                 "out meta;", query);
-        query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Новосибирск\"");
+        query = constructQuery("foo=bar | foo=baz in \"Новосибирск\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -176 +180 @@
     @Test
     public void testAroundArea() {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\"");
+        final String query = constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -193 +197 @@
     @Test
     public void testGlobal() {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar global");
+        final String query = constructQuery("foo=bar global");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -225 +229 @@
     @Test(expected = UncheckedParseException.class)
     public void testErroneous() {
-        OverpassTurboQueryWizard.getInstance().constructQuery("-(foo or bar)");
+        constructQuery("-(foo or bar)");
     }
 }