Changeset 12880 in josm for trunk/src/org

Timestamp:

2017-09-20T21:33:06+02:00 (7 years ago)

Author:

simon04

Message:

see #15057, see #15264 - Rename OverpassQueryList to UserQueryList

This allows to use it also in the wikipedia plugin without name confusion.

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• OverpassDownloadSource.java (modified) (5 diffs)
• UserQueryList.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java ) (10 diffs)

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

@@ -91 +91 @@
 
         private final JosmTextArea overpassQuery;
-        private final OverpassQueryList overpassQueryList;
+        private final UserQueryList overpassQueryList;
 
         /**
@@ -134 +134 @@
 
 
-            this.overpassQueryList = new OverpassQueryList(this, this.overpassQuery);
+            this.overpassQueryList = new UserQueryList(this, this.overpassQuery, "download.overpass.query");
             this.overpassQueryList.setPreferredSize(new Dimension(350, 300));
 
@@ -288 +288 @@
 
         /**
-         * Action that delegates snippet creation to {@link OverpassQueryList#createNewItem()}.
+         * Action that delegates snippet creation to {@link UserQueryList#createNewItem()}.
          */
         private class AddSnippetAction extends AbstractAction {
@@ -308 +308 @@
 
         /**
-         * Action that delegates snippet removal to {@link OverpassQueryList#removeSelectedItem()}.
+         * Action that delegates snippet removal to {@link UserQueryList#removeSelectedItem()}.
          */
         private class RemoveSnippetAction extends AbstractAction implements ListSelectionListener {
@@ -341 +341 @@
 
         /**
-         * Action that delegates snippet edit to {@link OverpassQueryList#editSelectedItem()}.
+         * Action that delegates snippet edit to {@link UserQueryList#editSelectedItem()}.
          */
         private class EditSnippetAction extends AbstractAction implements ListSelectionListener {

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

@@ -55 +55 @@
 
 /**
- * A component to select user saved Overpass queries.
- * @since 12574
+ * A component to select user saved queries.
+ * @since 12880
+ * @since 12574 as OverpassQueryList
  */
-public final class OverpassQueryList extends SearchTextResultListPanel<OverpassQueryList.SelectorItem> {
+public final class UserQueryList extends SearchTextResultListPanel<UserQueryList.SelectorItem> {
 
     private static final DateTimeFormatter FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss, dd-MM-yyyy");
@@ -79 +80 @@
     private static final String QUERY_KEY = "query";
     private static final String LAST_EDIT_KEY = "lastEdit";
-    private static final String PREFERENCE_ITEMS = "download.overpass.query";
+    private final String preferenceKey;
 
     private static final String TRANSLATED_HISTORY = tr("history");
@@ -87 +88 @@
      * @param parent The parent of this component.
      * @param target The text component to which the queries must be added.
-     */
-    public OverpassQueryList(Component parent, JTextComponent target) {
+     * @param preferenceKey The {@linkplain org.openstreetmap.josm.spi.preferences.IPreferences preference} key to store the user queries
+     */
+    public UserQueryList(Component parent, JTextComponent target, String preferenceKey) {
         this.target = target;
         this.componentParent = parent;
+        this.preferenceKey = preferenceKey;
         this.items = restorePreferences();
 
-        OverpassQueryListMouseAdapter mouseHandler = new OverpassQueryListMouseAdapter(lsResult, lsResultModel);
-        super.lsResult.setCellRenderer(new OverpassQueryCellRendered());
+        QueryListMouseAdapter mouseHandler = new QueryListMouseAdapter(lsResult, lsResultModel);
+        super.lsResult.setCellRenderer(new QueryCellRendered());
         super.setDblClickListener(e -> doubleClickEvent());
         super.lsResult.addMouseListener(mouseHandler);
@@ -255 +258 @@
         }
 
-        Config.getPref().putListOfMaps(PREFERENCE_ITEMS, toSave);
+        Config.getPref().putListOfMaps(preferenceKey, toSave);
     }
 
@@ -262 +265 @@
      * @return A set of the user saved items.
      */
-    private static Map<String, SelectorItem> restorePreferences() {
+    private Map<String, SelectorItem> restorePreferences() {
         Collection<Map<String, String>> toRetrieve =
-                Config.getPref().getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
+                Config.getPref().getListOfMaps(preferenceKey, Collections.emptyList());
         Map<String, SelectorItem> result = new HashMap<>();
 
@@ -285 +288 @@
     }
 
-    private class OverpassQueryListMouseAdapter extends MouseAdapter {
+    private class QueryListMouseAdapter extends MouseAdapter {
 
         private final JList<SelectorItem> list;
@@ -292 +295 @@
         private final JPopupMenu elementPopup = new JPopupMenu();
 
-        OverpassQueryListMouseAdapter(JList<SelectorItem> list, ResultListModel<SelectorItem> listModel) {
+        QueryListMouseAdapter(JList<SelectorItem> list, ResultListModel<SelectorItem> listModel) {
             this.list = list;
             this.model = listModel;
@@ -372 +375 @@
      * This class defines the way each element is rendered in the list.
      */
-    private static class OverpassQueryCellRendered extends JLabel implements ListCellRenderer<SelectorItem> {
-
-        OverpassQueryCellRendered() {
+    private static class QueryCellRendered extends JLabel implements ListCellRenderer<SelectorItem> {
+
+        QueryCellRendered() {
             setOpaque(true);
         }
@@ -550 +553 @@
     /**
      * This class represents an Overpass query used by the user that can be
-     * shown within {@link OverpassQueryList}.
+     * shown within {@link UserQueryList}.
      */
     public static class SelectorItem {
@@ -602 +605 @@
 
         /**
-         * Gets the overpass query of this item.
-         * @return A string representing the overpass query of this item.
+         * Gets the query of this item.
+         * @return A string representing the query of this item.
          */
         public String getQuery() {