Changeset 12609 in josm for trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

Timestamp:

2017-08-16T22:08:22+02:00 (7 years ago)

Author:

michael2402

Message:

Apply #15057: Patch by bafonins, modified.

File:

• trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java (modified) (5 diffs)

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

@@ -37 +37 @@
 public final class OverpassQueryWizardDialog extends ExtendedDialog {
 
+    private final HistoryComboBox queryWizard;
     private static final String HEADLINE_START = "<h3>";
     private static final String HEADLINE_END = "</h3>";
@@ -43 +44 @@
     private static final String TD_START = "<td>";
     private static final String TD_END = "</td>";
-    private final HistoryComboBox queryWizard;
-    private final OverpassTurboQueryWizard overpassQueryBuilder;
+    private static final String SPAN_START = "<span>";
+    private static final String SPAN_END = "</span>";
     private static final CollectionProperty OVERPASS_WIZARD_HISTORY =
             new CollectionProperty("download.overpass.wizard", new ArrayList<String>());
+    private final transient OverpassTurboQueryWizard overpassQueryBuilder;
 
     // dialog buttons
@@ -200 +202 @@
                 .append(Utils.joinAsHtmlUnorderedList(Arrays.asList("<i>type:node</i>", "<i>type:relation</i>", "<i>type:way</i>")))
                 .append(TD_END).append(TD_START)
-                .append("<span>").append(tr("Download objects of a certain type.")).append("</span>")
+                .append(SPAN_START).append(tr("Download objects of a certain type.")).append(SPAN_END)
                 .append(TD_END).append(TR_END)
                 .append(TR_START).append(TD_START)
@@ -215 +217 @@
                         tr("{0} all objects within the current selection that have {1} as attribute.", "<i>tourism=hotel in bbox</i> -",
                                 "'tourism=hotel'"))))
-                .append("<span>")
+                .append(SPAN_START)
                 .append(tr("Instead of <i>location</i> any valid place name can be used like address, city, etc."))
-                .append("</span>")
+                .append(SPAN_END)
                 .append(TD_END).append(TR_END)
                 .append(TR_START).append(TD_START)
@@ -231 +233 @@
                         tr("<i>expression1 {0} expression2</i>", "and"))))
                 .append(TD_END).append(TD_START)
-                .append("<span>")
+                .append(SPAN_START)
                 .append(tr("Basic logical operators can be used to create more sophisticated queries. Instead of \"or\" - \"|\", \"||\" " +
                         "can be used, and instead of \"and\" - \"&\", \"&&\"."))
-                .append("</span>")
+                .append(SPAN_END)
                 .append(TD_END).append(TR_END).append("</table>")
                 .append("</body>")