Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 18193) @@ -780,5 +780,5 @@ /** * Gets a unique toolbar key to store this layer as toolbar item - * @return The kay. + * @return The key. */ public String getToolbarName() { Index: /trunk/src/org/openstreetmap/josm/data/osm/event/IDataSelectionListener.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/IDataSelectionListener.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/IDataSelectionListener.java (revision 18193) @@ -1,4 +1,11 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.osm.event; + +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.openstreetmap.josm.data.osm.DataSelectionListener; @@ -10,11 +17,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.tools.CheckParameterUtil; - -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** @@ -266,5 +266,5 @@ /** - * Create a {@link DataSelectionListener.SelectionRemoveEvent} + * Create a {@code SelectionRemoveEvent} * @param source The source dataset * @param old The old primitives that were previously selected. The caller needs to ensure that this set is not modified. Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java (revision 18193) @@ -1,4 +1,23 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.validation.tests; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.geom.Area; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Predicate; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.openstreetmap.josm.command.Command; @@ -29,23 +48,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; - -import java.awt.geom.Area; -import java.io.Reader; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.Predicate; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import static org.openstreetmap.josm.tools.I18n.tr; /** @@ -227,5 +227,5 @@ /** * Determines the {@code index}-th key/value/tag (depending on {@code type}) of the - * {@link Selector.GeneralSelector}. + * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}. * * @param matchingSelector matching selector Index: /trunk/src/org/openstreetmap/josm/data/vector/DataStore.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/vector/DataStore.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/data/vector/DataStore.java (revision 18193) @@ -25,4 +25,8 @@ * A class that stores data (essentially a simple {@link DataSet}) * @author Taylor Smock + * @param Type of OSM primitive + * @param Type of node + * @param Type of way + * @param Type of relation * @since 17862 */ Index: /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java (revision 18193) @@ -36,4 +36,9 @@ import org.openstreetmap.josm.data.osm.event.IDataSelectionEventSource; import org.openstreetmap.josm.data.osm.event.IDataSelectionListener; +import org.openstreetmap.josm.data.osm.event.IDataSelectionListener.SelectionAddEvent; +import org.openstreetmap.josm.data.osm.event.IDataSelectionListener.SelectionChangeEvent; +import org.openstreetmap.josm.data.osm.event.IDataSelectionListener.SelectionRemoveEvent; +import org.openstreetmap.josm.data.osm.event.IDataSelectionListener.SelectionReplaceEvent; +import org.openstreetmap.josm.data.osm.event.IDataSelectionListener.SelectionToggleEvent; import org.openstreetmap.josm.gui.mappaint.ElemStyles; import org.openstreetmap.josm.tools.ListenerList; @@ -296,6 +301,6 @@ /** - * Get the current Read/Write lock - * @implNote This changes based off of zoom level. Please do not use this in a finally block + * Get the current Read/Write lock. + * This changes based off of zoom level. Please do not use this in a finally block * @return The current read/write lock */ @@ -328,7 +333,7 @@ /** - * Mark some primitives as highlighted + * Mark some primitives as highlighted. + * API is *highly likely* to change, as the inherited methods are modified to accept primitives other than OSM primitives. * @param primitives The primitives to highlight - * @apiNote This is *highly likely* to change, as the inherited methods are modified to accept primitives other than OSM primitives. */ public void setHighlighted(Collection primitives) { @@ -423,5 +428,5 @@ private void toggleSelectedImpl(Stream osm) { - this.doSelectionChange(old -> new IDataSelectionListener.SelectionToggleEvent<>(this, old, + this.doSelectionChange(old -> new SelectionToggleEvent<>(this, old, osm.flatMap(this::getPrimitivesById).filter(Objects::nonNull))); } @@ -438,5 +443,5 @@ private void setSelectedImpl(Stream osm) { - this.doSelectionChange(old -> new IDataSelectionListener.SelectionReplaceEvent<>(this, old, + this.doSelectionChange(old -> new SelectionReplaceEvent<>(this, old, osm.filter(Objects::nonNull).flatMap(this::getPrimitivesById).filter(Objects::nonNull))); } @@ -453,5 +458,5 @@ private void addSelectedImpl(Stream osm) { - this.doSelectionChange(old -> new IDataSelectionListener.SelectionAddEvent<>(this, old, + this.doSelectionChange(old -> new SelectionAddEvent<>(this, old, osm.flatMap(this::getPrimitivesById).filter(Objects::nonNull))); } @@ -473,5 +478,5 @@ private void clearSelectionImpl(Stream osm) { - this.doSelectionChange(old -> new IDataSelectionListener.SelectionRemoveEvent<>(this, old, + this.doSelectionChange(old -> new SelectionRemoveEvent<>(this, old, osm.flatMap(this::getPrimitivesById).filter(Objects::nonNull))); } @@ -481,12 +486,12 @@ *

* This is the only method that changes the current selection state. - * @param command A generator that generates the {@link DataSelectionListener.SelectionChangeEvent} + * @param command A generator that generates the {@link SelectionChangeEvent} * for the given base set of currently selected primitives. * @return true iff the command did change the selection. */ private boolean doSelectionChange(final Function, - IDataSelectionListener.SelectionChangeEvent> command) { + SelectionChangeEvent> command) { synchronized (this.selectionLock) { - IDataSelectionListener.SelectionChangeEvent event = + SelectionChangeEvent event = command.apply(currentSelectedPrimitives.stream().map(this::getPrimitiveById).collect(Collectors.toSet())); if (event.isNop()) { @@ -570,4 +575,5 @@ * Try to read something (here to avoid boilerplate) * + * @param lock The lock * @param supplier The reading function * @param The return type @@ -589,5 +595,5 @@ /** * Try to write something (here to avoid boilerplate) - * + * @param lock lock * @param runnable The writing function */ Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java (revision 18193) @@ -221,6 +221,6 @@ * @deprecated Has been moved to the model, where it belongs. Use * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel#addAllStrings} instead. Probably you want to use - * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel.Preferences#load} and - * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel.Preferences#save}. + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}. */ @Deprecated @@ -239,6 +239,6 @@ * @deprecated Has been moved to the model, where it belongs. Use * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel#addAllStrings} instead. Probably you want to use - * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel.Preferences#load} and - * {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel.Preferences#save}. + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}. */ @Deprecated Index: /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (revision 18192) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (revision 18193) @@ -39,7 +39,7 @@ * @return the items as strings * @deprecated Has been moved to the model, where it belongs. Use - * {@link HistoryComboBoxModel#asStringList} instead. Probably you want to use - * {@link HistoryComboBoxModel.Preferences#load} and - * {@link HistoryComboBoxModel.Preferences#save}. + * {@link HistoryComboBoxModel#asStringList} instead. Probably you want to use + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and + * {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}. */ @Deprecated