Changeset 16358 in josm for trunk/src

Timestamp:

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

Author:

simon04

Message:

see #18164 - Rename class to SearchCompilerQueryWizard

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainInitialization.java (modified) (3 diffs)
• gui/download/OverpassQueryWizardDialog.java (modified) (3 diffs)
• tools/SearchCompilerQueryWizard.java (moved) (moved from trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java ) (3 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());