Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImage.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImage.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImage.java (revision 34325) @@ -65,9 +65,8 @@ * Main constructor of the class StreetsideImage * - * @param key The unique identifier of the image. + * @param id The unique identifier of the image. * @param latLon The latitude and longitude where it is positioned. - * @param cd The direction of the images in degrees, meaning 0 north. - */ - + * @param he The direction of the images in degrees, meaning 0 north. + */ public StreetsideImage(String id, LatLon latLon, double he) { super(id, latLon, he); @@ -205,5 +204,5 @@ /** - * @param pi the pi to set + * @param pitch the pi to set */ public void setPi(double pitch) { @@ -219,5 +218,5 @@ /** - * @param burringl the burringl to set + * @param blurring the blurring to set */ public void setBl(String blurring) { Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImportedImage.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImportedImage.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImportedImage.java (revision 34325) @@ -34,6 +34,7 @@ * Using when the EXIF tags doesn't contain that info. * + * @param id The Streetside image id * @param latLon The latitude and longitude where the picture was taken. - * @param cd Direction of the picture (0 means north). + * @param ca Direction of the picture (0 means north). * @param file The file containing the picture. */ @@ -45,6 +46,7 @@ * Main constructor of the class. * + * @param id The Streetside image id * @param latLon Latitude and Longitude where the picture was taken. - * @param cd Direction of the picture (0 means north), + * @param ca Direction of the picture (0 means north), * @param file The file containing the picture. * @param datetimeOriginal The date the picture was taken. Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (revision 34325) @@ -218,5 +218,5 @@ * Layer. * - * @return The {@link MapillaryData} object that stores the database. + * @return The {@link StreetsideData} object that stores the database. */ public StreetsideLocationChangeset getLocationChangeset() { @@ -333,5 +333,5 @@ } - /** + /* * Draws an image marker onto the given Graphics context. * @param g the Graphics context @@ -524,5 +524,5 @@ } - /** + /* * Returns the closest images belonging to a different sequence and * different from the specified target image. Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsidePlugin.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsidePlugin.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsidePlugin.java (revision 34325) @@ -1,6 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.streetside; - -import java.io.IOException; import org.openstreetmap.josm.Main; @@ -59,7 +57,6 @@ * @param info * Required information of the plugin. Obtained from the jar file. - * @throws IOException if the streetside cache directory is not found */ - public StreetsidePlugin(PluginInformation info) /*throws IOException*/ { + public StreetsidePlugin(PluginInformation info) { super(info); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideSequence.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideSequence.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideSequence.java (revision 34325) @@ -37,13 +37,4 @@ private List images; - /** - * Unique identifier. Used only for {@link StreetsideImage} sequences. - */ - - /** - * @param string - * @param string2 - * @param capturedAt2 - */ public StreetsideSequence(String id, Long ca) { this.id = id; @@ -52,9 +43,4 @@ } - /** - * @param string - * @param la - * @param lo - */ public StreetsideSequence(String id, double la, double lo) { this.id = id; @@ -65,5 +51,5 @@ /** - * No argument constructor for StreetsideSequence - necessary for JSON serialization + * No argument constructor for StreetsideSequence - necessary for JSON serialization */ public StreetsideSequence() { @@ -85,5 +71,5 @@ } -/** + /** * Adds a new {@link StreetsideAbstractImage} object to the database. * Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/CacheUtils.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/CacheUtils.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/CacheUtils.java (revision 34325) @@ -53,5 +53,5 @@ * image. Does nothing if it is already in cache. * -* @param img +* @param cm * The image whose picture is going to be downloaded. */ Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java (revision 34325) @@ -17,5 +17,5 @@ SIXTEEN(16); - private int value; + private final int value; private static Map map = new HashMap<>(); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/ITileDownloadingTaskListener.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/ITileDownloadingTaskListener.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/ITileDownloadingTaskListener.java (revision 34325) @@ -3,5 +3,5 @@ /** -* Interface for listeners of the class {@link StreetsideData}. +* Interface for listeners of the class {@link org.openstreetmap.josm.plugins.streetside.StreetsideData}. * * @author renerr18 @@ -10,8 +10,8 @@ public interface ITileDownloadingTaskListener { -/** -* Fired when a cubemap tile image is downloaded by a download worker. -* -*/ -void tileAdded(String imageId); + /** + * Fired when a cubemap tile image is downloaded by a download worker. + * @param imageId image id + */ + void tileAdded(String imageId); } Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java (revision 34325) @@ -56,5 +56,5 @@ /** - * @param tileId the tileId to set + * @param id the tileId to set */ public void setId(String id) { Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoPanel.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoPanel.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoPanel.java (revision 34325) @@ -18,8 +18,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.openstreetmap.josm.data.SelectionChangedListener; -import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSelectionListener; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Tag; +import org.openstreetmap.josm.data.osm.event.SelectionEventManager; import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; @@ -34,5 +34,5 @@ import org.openstreetmap.josm.tools.I18n; -public final class ImageInfoPanel extends ToggleDialog implements StreetsideDataListener, SelectionChangedListener { +public final class ImageInfoPanel extends ToggleDialog implements StreetsideDataListener, DataSelectionListener { private static final long serialVersionUID = 4141847503072417190L; private static final Log L = LogFactory.getLog(ImageInfoPanel.class); @@ -59,5 +59,5 @@ 150 ); - DataSet.addSelectionListener(this); + SelectionEventManager.getInstance().addSelectionListener(this); //numDetectionsLabel = new JLabel(); @@ -232,5 +232,6 @@ */ @Override - public synchronized void selectionChanged(final Collection sel) { + public synchronized void selectionChanged(final SelectionChangeEvent event) { + final Collection sel = event.getSelection(); L.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size())); addStreetsideTagAction.setTarget(sel != null && sel.size() == 1 ? sel.iterator().next() : null); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java (revision 34325) @@ -3,5 +3,4 @@ import java.awt.BorderLayout; -import java.util.Collection; import javax.swing.JCheckBox; @@ -9,7 +8,4 @@ import javax.swing.SwingUtilities; -import org.openstreetmap.josm.data.SelectionChangedListener; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener; import org.openstreetmap.josm.plugins.streetside.StreetsideAbstractImage; @@ -28,5 +24,5 @@ public final class StreetsideViewerPanel extends JPanel - implements StreetsideDataListener, SelectionChangedListener { + implements StreetsideDataListener { private static final long serialVersionUID = 4141847503072417190L; @@ -56,6 +52,4 @@ private void initializeAndStartGUI() { - - DataSet.addSelectionListener(this); threeSixtyDegreeViewerPanel = new ThreeSixtyDegreeViewerPanel(); @@ -150,16 +144,4 @@ } - /* - * (non-Javadoc) - * - * @see - * org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java. - * util.Collection) - */ - @Override - public synchronized void selectionChanged(final Collection sel) { - Logging.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size())); - } - public CubemapBox getCubemapBox() { return threeSixtyDegreeViewerPanel.getCubemapBox(); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/history/commands/CommandTurn.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/history/commands/CommandTurn.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/history/commands/CommandTurn.java (revision 34325) @@ -23,5 +23,5 @@ * @param images * Set of images that is turned. - * @param cd + * @param ca * How much the images turn. */ Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/StreetsideDownloader.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/StreetsideDownloader.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/StreetsideDownloader.java (revision 34325) @@ -198,4 +198,6 @@ * lots of Streetside images are going to be downloaded, slowing down the * program too much. A notification is shown when the download has stopped or continued. + * @param area area to check + * @return {@code true} if the area is too big */ private static boolean isAreaTooBig(final double area) { Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/package-info.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/package-info.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/package-info.java (revision 34325) @@ -5,6 +5,6 @@ * Currently there are two of them: * */ Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideProperties.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideProperties.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideProperties.java (revision 34325) @@ -9,6 +9,6 @@ import org.openstreetmap.josm.data.preferences.NamedColorProperty; import org.openstreetmap.josm.data.preferences.StringProperty; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.ImageInfoPanel; +import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.StreetsideViewerPanel; import org.openstreetmap.josm.plugins.streetside.io.download.StreetsideDownloader; @@ -37,9 +37,9 @@ /** - * @see OsmDataLayer#PROPERTY_BACKGROUND_COLOR + * See {@code OsmDataLayer#PROPERTY_BACKGROUND_COLOR} */ public static final NamedColorProperty BACKGROUND = new NamedColorProperty("background", Color.BLACK); /** - * @see OsmDataLayer#PROPERTY_OUTSIDE_COLOR + * See {@code OsmDataLayer#PROPERTY_OUTSIDE_COLOR} */ public static final NamedColorProperty OUTSIDE_DOWNLOADED_AREA = new NamedColorProperty("outside downloaded area", Color.YELLOW); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java (revision 34325) @@ -193,5 +193,5 @@ /** * Gives you the URL for the blur editor of the image with the given key. - * @param key the key of the image for which you want to open the blur editor + * @param id the key of the image for which you want to open the blur editor * @return the URL of the blur editor * @throws IllegalArgumentException if the image key is null @@ -334,7 +334,4 @@ } - /** - * - */ static String queryByIdString(Map parts) { final StringBuilder ret = new StringBuilder("?id="); Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonSequencesDecoder.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonSequencesDecoder.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonSequencesDecoder.java (revision 34325) @@ -28,5 +28,5 @@ * Parses a given {@link JsonObject} as a GeoJSON Feature into a {@link StreetsideSequence}. * @param json the {@link JsonObject} to be parsed - * @return a {@link Streetsideequence} that is parsed from the given {@link JsonObject}. If mandatory information is + * @return a {@link StreetsideSequence} that is parsed from the given {@link JsonObject}. If mandatory information is * missing from the JSON or it's not meeting the expecting format in another way, null will be * returned. @@ -72,4 +72,5 @@ * Converts a {@link JsonArray} to a java array. * The conversion from {@link JsonValue} to a java type is done by the supplied function. + * @param object type * @param array the array to be converted * @param decodeValueFunction the function used for conversion from {@link JsonValue} to the desired type. @@ -98,4 +99,5 @@ * For example this is used to convert the `image_keys` JSON array to a String[] array or the `cas` JSON array to a * Double[] array. + * @param object type * @param json the JSON object representing the `properties` of a sequence * @param key the key, which identifies the desired array inside the `coordinateProperties` object to be converted Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonStreetsideSequencesDecoder.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonStreetsideSequencesDecoder.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/api/JsonStreetsideSequencesDecoder.java (revision 34325) @@ -70,6 +70,6 @@ /** - * Parses a given {@link JsonObject} as a GeoJSON Feature into a {@link StreetsideSequence}. - * @param json the {@link JsonObject} to be parsed + * Parses a given {@link StreetsideImage} as a GeoJSON Feature into a {@link StreetsideSequence}. + * @param image the {@link StreetsideImage} to be parsed * @return a {@link StreetsideSequence} that is parsed from the given {@link JsonObject}. If mandatory information is * missing from the JSON or it's not meeting the expecting format in another way, null will be @@ -123,4 +123,5 @@ * Converts a {@link JsonArray} to a java array. * The conversion from {@link JsonValue} to a java type is done by the supplied function. + * @param object type * @param array the array to be converted * @param decodeValueFunction the function used for conversion from {@link JsonValue} to the desired type. @@ -149,4 +150,5 @@ * For example this is used to convert the `image_keys` JSON array to a String[] array or the `cas` JSON array to a * Double[] array. + * @param object type * @param json the JSON object representing the `properties` of a sequence * @param key the key, which identifies the desired array inside the `coordinateProperties` object to be converted Index: /applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnableTest.java =================================================================== --- /applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnableTest.java (revision 34324) +++ /applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnableTest.java (revision 34325) @@ -10,5 +10,5 @@ import org.junit.AfterClass; -import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -18,5 +18,4 @@ import org.openstreetmap.josm.plugins.streetside.StreetsideLayer; import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties; -import org.openstreetmap.josm.plugins.streetside.utils.TestUtil; import org.openstreetmap.josm.plugins.streetside.utils.TestUtil.StreetsideTestRules; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -38,18 +37,18 @@ } - // TODO: fox! - //@Test + @Test + @Ignore // TODO: fox! public void testRun1() throws IllegalArgumentException, IllegalAccessException { testNumberOfDecodedImages(4, SEARCH_SEQUENCES_URL_GEN, new Bounds(7.246497, 16.432955, 7.249027, 16.432976)); } - //TODO: fox! - //@Test + @Test + @Ignore // TODO: fox! public void testRun2() throws IllegalArgumentException, IllegalAccessException { testNumberOfDecodedImages(0, SEARCH_SEQUENCES_URL_GEN, new Bounds(0, 0, 0, 0)); } - //TODO: fox! - //@Test + @Test + @Ignore // TODO: fox! public void testRun3() throws IllegalArgumentException, IllegalAccessException { testNumberOfDecodedImages(0, b -> { @@ -58,6 +57,6 @@ } - //TODO: fox! - //@Test + @Test + @Ignore // TODO: fox! public void testRun4() throws IllegalArgumentException, IllegalAccessException { StreetsideProperties.CUT_OFF_SEQUENCES_AT_BOUNDS.put(true); @@ -65,6 +64,6 @@ } - //TODO: fox! - //@Test + @Test + @Ignore // TODO: fox! public void testRun5() throws IllegalArgumentException, IllegalAccessException { StreetsideProperties.CUT_OFF_SEQUENCES_AT_BOUNDS.put(true);