Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 13145) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 13146) @@ -966,4 +966,5 @@ /** + * Replies the parent way of a node, if it is the end of exactly one usable way. * @param n node * @return If the node is the end of exactly one way, return this. Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 13145) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 13146) @@ -201,4 +201,9 @@ } + /** + * Adds the title (prefix) label at the beginning of the row. Should be called only once. + * @param title English title + * @return {@code this} for easy chaining + */ public SearchKeywordRow addTitle(String title) { add(new JLabel(tr("{0}: ", title))); @@ -206,4 +211,12 @@ } + /** + * Adds an example keyword label at the end of the row. Can be called several times. + * @param displayText displayed HTML text + * @param insertText optional: if set, makes the label clickable, and {@code insertText} will be inserted in search string + * @param description optional: HTML text to be displayed in the tooltip + * @param examples optional: examples joined as HTML list in the tooltip + * @return {@code this} for easy chaining + */ public SearchKeywordRow addKeyword(String displayText, final String insertText, String description, String... examples) { JLabel label = new JLabel("" Index: /trunk/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java (revision 13145) +++ /trunk/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java (revision 13146) @@ -33,5 +33,5 @@ * Static instance */ - private static AsynchronousUploadPrimitivesTask asynchronousUploadPrimitivesTask = null; + private static AsynchronousUploadPrimitivesTask asynchronousUploadPrimitivesTask; /**