Index: trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java (revision 12574) +++ trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java (revision 12575) @@ -106,5 +106,5 @@ * want to save the last query in OverpassQueryList. */ - Consumer errorReporter = (errors) -> { + Consumer> errorReporter = errors -> { boolean onlyNoDataError = errors.size() == 1 && @@ -221,5 +221,5 @@ @Override public void focusLost(FocusEvent e) { - + // ignored } }); @@ -233,5 +233,5 @@ ? BasicArrowButton.EAST : BasicArrowButton.WEST); - arrowButton.addActionListener(e -> { + arrowButton.addActionListener(e -> { if (overpassQueryList.isVisible()) { overpassQueryList.setVisible(false); @@ -288,4 +288,10 @@ private static final class QueryWizardDialog extends ExtendedDialog { + private static final String HEADLINE_START = "

"; + private static final String HEADLINE_END = "

"; + private static final String TR_START = ""; + private static final String TR_END = ""; + private static final String TD_START = ""; + private static final String TD_END = ""; private static QueryWizardDialog dialog; private final HistoryComboBox queryWizard; @@ -329,5 +335,5 @@ JLabel searchLabel = new JLabel(tr("Search :")); - JTextComponent descPane = this.buildDescriptionSection(); + JTextComponent descPane = buildDescriptionSection(); JScrollPane scroll = GuiHelper.embedInVerticalScrollPane(descPane); scroll.getVerticalScrollBar().setUnitIncrement(10); // make scrolling smooth @@ -422,6 +428,6 @@ } - private JTextComponent buildDescriptionSection() { - JEditorPane descriptionSection = new JEditorPane("text/html", this.getDescriptionContent()); + private static JTextComponent buildDescriptionSection() { + JEditorPane descriptionSection = new JEditorPane("text/html", getDescriptionContent()); descriptionSection.setEditable(false); descriptionSection.addHyperlinkListener(e -> { @@ -434,11 +440,11 @@ } - private String getDescriptionContent() { + private static String getDescriptionContent() { return new StringBuilder("") .append(DESCRIPTION_STYLE) .append("") - .append("

") + .append(HEADLINE_START) .append(tr("Query Wizard")) - .append("

") + .append(HEADLINE_END) .append("

") .append(tr("Allows you to interact with Overpass API by writing declarative, human-readable terms.")) @@ -447,16 +453,16 @@ .append(tr("OSM Wiki.", Main.getOSMWebsite() + "/wiki/Overpass_turbo/Wizard")) .append("

") - .append("

").append(tr("Hints")).append("

") - .append("").append("").append("

") + .append(HEADLINE_START).append(tr("Hints")).append(HEADLINE_END) + .append("").append(TR_START).append(TD_START) .append(Utils.joinAsHtmlUnorderedList(Arrays.asList("type:node", "type:relation", "type:way"))) - .append("").append("").append("") - .append("").append("").append("").append("") - .append("").append("").append("").append("") - .append("").append("").append("").append("").append("

") + .append(TD_END).append(TD_START) .append("").append(tr("Download objects of a certain type.")).append("") - .append("
") + .append(TD_END).append(TR_END) + .append(TR_START).append(TD_START) .append(Utils.joinAsHtmlUnorderedList( Arrays.asList("key=value in location", "key=value around location", "key=value in bbox"))) - .append("	") + .append(TD_END).append(TD_START) .append(tr("Download object by specifying a specific location. For example,")) .append(Utils.joinAsHtmlUnorderedList(Arrays.asList( @@ -469,22 +475,22 @@ .append(tr("Instead of location any valid place name can be used like address, city, etc.")) .append("") - .append("
") + .append(TD_END).append(TR_END) + .append(TR_START).append(TD_START) .append(Utils.joinAsHtmlUnorderedList(Arrays.asList("key=value", "key=", "key~regex", "key!=value", "key!~regex", "key=\"combined value\"*"))) - .append("	") + .append(TD_END).append(TD_START) .append(tr("Download objects that have some concrete key/value pair, only the key with any contents for the value, " + "the value matching some regular expression. 'Not equal' operators are supported as well.")) - .append("
") + .append(TD_END).append(TR_END) + .append(TR_START).append(TD_START) .append(Utils.joinAsHtmlUnorderedList(Arrays.asList( tr("expression1 {0} expression2", "or"), tr("expression1 {0} expression2", "and")))) - .append("	") + .append(TD_END).append(TD_START) .append("") .append(tr("Basic logical operators can be used to create more sophisticated queries. Instead of 'or' - '\|', '\|\|' " + "can be used, and instead of 'and' - '&', '&&'.")) .append("") - .append("

") + .append(TD_END).append(TR_END).append("

") .append("") .append("") Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 12574) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 12575) @@ -30,8 +30,8 @@ private final DownloadTask task; private final Future future; - private Consumer errorReporter; + private Consumer> errorReporter; /** - * constructor + * Creates a new {@link PostDownloadHandler} * @param task the asynchronous download task * @param future the future on which the completion of the download task can be synchronized @@ -43,5 +43,5 @@ /** - * constructor + * Creates a new {@link PostDownloadHandler} using a custom error reporter * @param task the asynchronous download task * @param future the future on which the completion of the download task can be synchronized @@ -49,5 +49,5 @@ * task */ - public PostDownloadHandler(DownloadTask task, Future future, Consumer errorReporter) { + public PostDownloadHandler(DownloadTask task, Future future, Consumer> errorReporter) { this(task, future); this.errorReporter = errorReporter; Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 12574) +++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 12575) Index: trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java (revision 12574) +++ trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java (revision 12575) @@ -56,5 +56,5 @@ public final class OverpassQueryList extends SearchTextResultListPanel { - private final DateTimeFormatter format = DateTimeFormatter.ofPattern("HH:mm:ss, dd-MM-yyyy"); + private static final DateTimeFormatter FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss, dd-MM-yyyy"); /* @@ -85,5 +85,5 @@ this.target = target; this.componentParent = parent; - this.items = this.restorePreferences(); + this.items = restorePreferences(); OverpassQueryListMouseAdapter mouseHandler = new OverpassQueryListMouseAdapter(lsResult, lsResultModel); @@ -134,5 +134,5 @@ if (!historicExist) { SelectorItem item = new SelectorItem( - "history " + LocalDateTime.now().format(this.format), + "history " + LocalDateTime.now().format(FORMAT), query); @@ -261,5 +261,5 @@ * @return A set of the user saved items. */ - private Map restorePreferences() { + private static Map restorePreferences() { Collection> toRetrieve = Main.pref.getListOfStructs(PREFERENCE_ITEMS, Collections.emptyList()); @@ -279,11 +279,10 @@ private class OverpassQueryListMouseAdapter extends MouseAdapter { - private final JList list; - private final ResultListModel model; + private final JList list; + private final ResultListModel model; private final JPopupMenu emptySelectionPopup = new JPopupMenu(); private final JPopupMenu elementPopup = new JPopupMenu(); - private final JPopupMenu queryLookup = new JPopupMenu(); - - OverpassQueryListMouseAdapter(JList list, ResultListModel listModel) { + + OverpassQueryListMouseAdapter(JList list, ResultListModel listModel) { this.list = list; this.model = listModel; @@ -331,5 +330,5 @@ } - SelectorItem item = (SelectorItem) model.getElementAt(idx); + SelectorItem item = model.getElementAt(idx); list.setToolTipText("

" +
                     Utils.escapeReservedCharactersHTML(Utils.restrictStringLines(item.getQuery(), 9)));
@@ -607,17 +606,39 @@
 
         @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof SelectorItem)) return false;
-
-            SelectorItem that = (SelectorItem) o;
-
-            return itemKey.equals(that.itemKey) &&
-                    query.equals(that.getKey());
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((itemKey == null) ? 0 : itemKey.hashCode());
+            result = prime * result + ((query == null) ? 0 : query.hashCode());
+            return result;
         }
 
         @Override
-        public int hashCode() {
-            return itemKey.hashCode();
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            SelectorItem other = (SelectorItem) obj;
+            if (itemKey == null) {
+                if (other.itemKey != null) {
+                    return false;
+                }
+            } else if (!itemKey.equals(other.itemKey)) {
+                return false;
+            }
+            if (query == null) {
+                if (other.query != null) {
+                    return false;
+                }
+            } else if (!query.equals(other.query)) {
+                return false;
+            }
+            return true;
         }
     }