Changeset 33641 in osm for applications/editors

Timestamp:

2017-09-20T21:35:05+02:00 (7 years ago)

Author:

simon04

Message:

JOSM/wikipedia: reuse UserQueryList (drops massive code duplication) - see #josm15264

Location:

applications/editors/josm/plugins/wikipedia

Files:

• build.xml (modified) (1 diff)
• src/org/wikipedia/gui/WikosmDownloadSource.java (modified) (6 diffs)
• src/org/wikipedia/gui/WikosmQueryList.java (deleted)

applications/editors/josm/plugins/wikipedia/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12878"/>
+    <property name="plugin.main.version" value="12880"/>
     <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.download.DownloadSourceSizingPolicy;
 import org.openstreetmap.josm.gui.download.DownloadSourceSizingPolicy.AdjustableDownloadSizePolicy;
+import org.openstreetmap.josm.gui.download.UserQueryList;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -84 +85 @@
 
         private final JosmTextArea wikosmQuery;
-        private final WikosmQueryList wikosmQueryList;
+        private final UserQueryList wikosmQueryList;
         private final JCheckBox referrers;
         private final JCheckBox fullRel;
 
         /**
-         * Create a new {@link WikosmDownloadSourcePanel}
+         * Create a new {@code WikosmDownloadSourcePanel}
          * @param ds The download source to create the panel for
          */
@@ -123 +124 @@
 
 
-            this.wikosmQueryList = new WikosmQueryList(this, this.wikosmQuery);
+            this.wikosmQueryList = new UserQueryList(this, this.wikosmQuery, "download.wikosm.query");
             this.wikosmQueryList.setPreferredSize(new Dimension(350, 300));
 
@@ -269 +270 @@
 
         /**
-         * Action that delegates snippet creation to {@link WikosmQueryList#createNewItem()}.
+         * Action that delegates snippet creation to {@link UserQueryList#createNewItem()}.
          */
         private class AddSnippetAction extends AbstractAction {
@@ -289 +290 @@
 
         /**
-         * Action that delegates snippet removal to {@link WikosmQueryList#removeSelectedItem()}.
+         * Action that delegates snippet removal to {@link UserQueryList#removeSelectedItem()}.
          */
         private class RemoveSnippetAction extends AbstractAction implements ListSelectionListener {
@@ -322 +323 @@
 
         /**
-         * Action that delegates snippet edit to {@link WikosmQueryList#editSelectedItem()}.
+         * Action that delegates snippet edit to {@link UserQueryList#editSelectedItem()}.
          */
         private class EditSnippetAction extends AbstractAction implements ListSelectionListener {