Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 31387) @@ -63,10 +63,10 @@ * */ -public class MapillaryLayer extends AbstractModifiableLayer implements - DataSetListener, EditLayerChangeListener, LayerChangeListener { +public class MapillaryLayer extends AbstractModifiableLayer implements DataSetListener, EditLayerChangeListener, + LayerChangeListener { /** Maximum distance for the red/blue lines. */ - public final static int SEQUENCE_MAX_JUMP_DISTANCE = Main.pref.getInteger( - "mapillary.sequence-max-jump-distance", 100); + public final static int SEQUENCE_MAX_JUMP_DISTANCE = Main.pref + .getInteger("mapillary.sequence-max-jump-distance", 100); private boolean TEMP_MANUAL = false; @@ -130,5 +130,5 @@ * * @param mode - * The mode that is going to be activated. + * The mode that is going to be activated. */ public void setMode(AbstractMode mode) { @@ -567,32 +567,40 @@ @Override public void primitivesAdded(PrimitivesAddedEvent event) { + // Nothing } @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { + // Nothing } @Override public void tagsChanged(TagsChangedEvent event) { + // Nothing } @Override public void nodeMoved(NodeMovedEvent event) { + // Nothing } @Override public void wayNodesChanged(WayNodesChangedEvent event) { + // Nothing } @Override public void relationMembersChanged(RelationMembersChangedEvent event) { + // Nothing } @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) { + // Nothing } @Override public void visitBoundingBox(BoundingXYVisitor v) { + // Nothing } @@ -608,8 +616,10 @@ @Override public void layerAdded(Layer newLayer) { + // Nothing } @Override public void layerRemoved(Layer oldLayer) { + // Nothing } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java (revision 31387) @@ -111,6 +111,5 @@ if (i == images.size() - 1) return null; - else - return images.get(i + 1); + return images.get(i + 1); } @@ -129,6 +128,5 @@ if (i == 0) return null; - else - return images.get(i - 1); + return images.get(i - 1); } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java (revision 31387) @@ -153,6 +153,5 @@ if (datetimeOriginal != null) MapillaryData.getInstance().add( - new MapillaryImportedImage(latValue, lonValue, caValue, file, - datetimeOriginal.getStringValue())); + new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue())); else MapillaryData.getInstance().add( Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java (revision 31387) @@ -189,6 +189,5 @@ if (arg0.getCapturedAt() > arg1.getCapturedAt()) return 1; - else - return 0; + return 0; } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 31387) @@ -59,4 +59,5 @@ @Override public void imagesAdded() { + // Nothing } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java (revision 31387) @@ -11,5 +11,5 @@ /** - * Sotres the + * Stores the downloaded pictures locally. * * @author nokutu @@ -28,5 +28,9 @@ */ public static enum Type { - FULL_IMAGE, THUMBNAIL + /** Full quality image */ + FULL_IMAGE, + + /** Low quality image */ + THUMBNAIL } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java (revision 31387) @@ -19,6 +19,12 @@ private double y; - public CommandMoveImage(List images, double x, - double y) { + /** + * Main constructor. + * + * @param images Set of images that are going to be moved. + * @param x How much the x coordinate increases. + * @param y How much the y coordinate increases. + */ + public CommandMoveImage(List images, double x, double y) { this.images = new ArrayList<>(images); this.x = x; @@ -48,6 +54,5 @@ @Override public String toString() { - return trn("Moved {0} image", "Moved {0} images", images.size(), - images.size()); + return trn("Moved {0} image", "Moved {0} images", images.size(), images.size()); } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java (revision 31387) @@ -18,4 +18,10 @@ private double ca; + /** + * Main constructor. + * + * @param images Set of images that is turned. + * @param ca How much the images turn. + */ public CommandTurnImage(List images, double ca) { this.images = new ArrayList<>(images); @@ -45,6 +51,5 @@ @Override public String toString() { - return trn("Turned {0} image", "Turned {0} images", this.images.size(), - this.images.size()); + return trn("Turned {0} image", "Turned {0} images", this.images.size(), this.images.size()); } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryCommand.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryCommand.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryCommand.java (revision 31387) @@ -14,6 +14,12 @@ protected List images; + /** + * Undoes the action. + */ public abstract void undo(); + /** + * Redoes the action. + */ public abstract void redo(); @@ -27,5 +33,5 @@ /** - * Checks if the image has been modified, compairing with its original values. + * Checks if the image has been modified, comparing with its original values. */ public void checkModified() { Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java (revision 31387) @@ -12,12 +12,17 @@ */ public class MapillaryRecord { - public static MapillaryRecord INSTANCE; + /** The unique instance of the class. */ + private static MapillaryRecord INSTANCE; private ArrayList listeners; + /** The set of commands that have taken place or that have been undone. */ public ArrayList commandList; - /** Last written command */ + /** Last written command. */ public int position; + /** + * Main constructor. + */ public MapillaryRecord() { commandList = new ArrayList<>(); @@ -26,4 +31,9 @@ } + /** + * Returns the unique instance of the class. + * + * @return The unique instance of the class. + */ public static synchronized MapillaryRecord getInstance() { if (MapillaryRecord.INSTANCE == null) @@ -32,8 +42,18 @@ } + /** + * Adds a listener. + * + * @param lis + */ public void addListener(MapillaryRecordListener lis) { this.listeners.add(lis); } + /** + * Removes the given listener. + * + * @param lis + */ public void removeListener(MapillaryRecordListener lis) { this.listeners.remove(lis); @@ -52,6 +72,5 @@ if (!command.images.contains(img)) equalSets = false; - if (equalSets - && commandList.get(position).getClass() == command.getClass()) { + if (equalSets && commandList.get(position).getClass() == command.getClass()) { commandList.get(position).sum(command); fireRecordChanged(); @@ -59,5 +78,5 @@ } } - // Adds the command to the las position of the list. + // Adds the command to the last position of the list. commandList.add(position + 1, command); position++; Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecordListener.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecordListener.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecordListener.java (revision 31387) @@ -1,5 +1,14 @@ package org.openstreetmap.josm.plugins.mapillary.commands; +/** + * Interface for the listener of the {@link MapillaryRecord} class + * + * @author nokutu + * @see MapillaryRecord + */ public interface MapillaryRecordListener { + /** + * Fired when any command is undone or redone. + */ public void recordChanged(); } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (revision 31387) @@ -19,10 +19,11 @@ public class MapillaryDownloader { + /** Base URL of the Mapillary API. */ public final static String BASE_URL = "https://a.mapillary.com/v2/"; + /** Client ID for the app */ public final static String CLIENT_ID = "NzNRM2otQkR2SHJzaXJmNmdQWVQ0dzo1YTA2NmNlODhlNWMwOTBm"; + /** Executor that will run the petitions */ public final static Executor EXECUTOR = Executors.newSingleThreadExecutor(); - public MapillaryDownloader() { - } /** Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportDownloadThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportDownloadThread.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportDownloadThread.java (revision 31387) @@ -23,7 +23,7 @@ * @author nokutu * @see MapillaryExportManager + * @see MapillaryExportWriterThread */ -public class MapillaryExportDownloadThread extends Thread implements - ICachedLoaderListener { +public class MapillaryExportDownloadThread extends Thread implements ICachedLoaderListener { String url; @@ -34,9 +34,14 @@ MapillaryImage image; - public MapillaryExportDownloadThread(MapillaryImage image, - ArrayBlockingQueue queue, + /** + * Main constructor. + * + * @param image Image to be downloaded. + * @param queue Queue of {@link BufferedImage} objects for the {@link MapillaryExportWriterThread}. + * @param queueImages Queue of {@link MapillaryAbstractImage} objects for the {@link MapillaryExportWriterThread}. + */ + public MapillaryExportDownloadThread(MapillaryImage image, ArrayBlockingQueue queue, ArrayBlockingQueue queueImages) { - url = "https://d1cuyjsrcm0gby.cloudfront.net/" + image.getKey() - + "/thumb-2048.jpg"; + url = "https://d1cuyjsrcm0gby.cloudfront.net/" + image.getKey() + "/thumb-2048.jpg"; this.queue = queue; this.image = image; @@ -46,15 +51,12 @@ @Override public void run() { - new MapillaryCache(image.getKey(), MapillaryCache.Type.FULL_IMAGE).submit( - this, false); + new MapillaryCache(image.getKey(), MapillaryCache.Type.FULL_IMAGE).submit(this, false); } @Override - public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, - LoadResult result) { + public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result) { try { queue.put(ImageIO.read(new ByteArrayInputStream(data.getContent()))); queueImages.put(image); - } catch (InterruptedException e) { Main.error(e); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportManager.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportManager.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportManager.java (revision 31387) @@ -20,9 +20,8 @@ /** - * Export main thread. Exportation works by creating a - * {@link MapillaryExportWriterThread} and several + * Export main thread. Exportation works by creating a {@link MapillaryExportWriterThread} and several * {@link MapillaryExportDownloadThread}. The second ones download every single - * image that is going to be exported and stores them in an - * {@link ArrayBlockingQueue}. Then it is picked by the first one and written on + * image that is going to be exported and stores them in an {@link ArrayBlockingQueue}. Then it is picked by the first + * one and written on * the selected folder. Each image will be named by its key. * @@ -42,7 +41,12 @@ private ThreadPoolExecutor ex; + /** + * Main constructor. + * + * @param images Set of {@link MapillaryAbstractImage} objects to be exported. + * @param path Export path. + */ public MapillaryExportManager(List images, String path) { - super(tr("Downloading") + "...", new PleaseWaitProgressMonitor( - "Exporting Mapillary Images"), true); + super(tr("Downloading") + "...", new PleaseWaitProgressMonitor("Exporting Mapillary Images"), true); queue = new ArrayBlockingQueue<>(10); queueImages = new ArrayBlockingQueue<>(10); @@ -59,8 +63,6 @@ * @throws IOException */ - public MapillaryExportManager(List images) - throws IOException { - super(tr("Downloading") + "...", new PleaseWaitProgressMonitor( - "Exporting Mapillary Images"), true); + public MapillaryExportManager(List images) throws IOException { + super(tr("Downloading") + "...", new PleaseWaitProgressMonitor("Exporting Mapillary Images"), true); queue = new ArrayBlockingQueue<>(10); queueImages = new ArrayBlockingQueue<>(10); @@ -79,9 +81,7 @@ @Override - protected void realRun() throws SAXException, IOException, - OsmTransferException { + protected void realRun() throws SAXException, IOException, OsmTransferException { // Starts a writer thread in order to write the pictures on the disk. - writer = new MapillaryExportWriterThread(path, queue, queueImages, amount, - this.getProgressMonitor()); + writer = new MapillaryExportWriterThread(path, queue, queueImages, amount, this.getProgressMonitor()); writer.start(); if (path == null) { @@ -93,11 +93,9 @@ return; } - ex = new ThreadPoolExecutor(20, 35, 25, TimeUnit.SECONDS, - new ArrayBlockingQueue(10)); + ex = new ThreadPoolExecutor(20, 35, 25, TimeUnit.SECONDS, new ArrayBlockingQueue(10)); for (MapillaryAbstractImage image : images) { if (image instanceof MapillaryImage) { try { - ex.execute(new MapillaryExportDownloadThread((MapillaryImage) image, - queue, queueImages)); + ex.execute(new MapillaryExportDownloadThread((MapillaryImage) image, queue, queueImages)); } catch (Exception e) { Main.error(e); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java (revision 31387) @@ -44,4 +44,13 @@ private final ProgressMonitor monitor; + /** + * Main constructor. + * + * @param path Path to write the pictures. + * @param queue Queue of {@link MapillaryAbstractImage} objects. + * @param queueImages Queue of {@link BufferedImage} objects. + * @param amount Amount of images that are going to be exported. + * @param monitor Progress monitor. + */ public MapillaryExportWriterThread(String path, ArrayBlockingQueue queue, @@ -66,4 +75,6 @@ img = queue.take(); mimg = queueImages.take(); + if (img == null || mimg == null) + throw new IllegalStateException("Null image"); if (path == null && mimg instanceof MapillaryImportedImage) { String path = ((MapillaryImportedImage) mimg).getFile().getPath(); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java (revision 31387) @@ -29,4 +29,10 @@ private final MapillaryLayer layer; + /** + * Main constructor. + * + * @param ex {@link ExecutorService} object that is executing this thread. + * @param url + */ public MapillaryImageInfoDownloaderThread(ExecutorService ex, String queryString, MapillaryLayer layer) { this.ex = ex; Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySignDownloaderThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySignDownloaderThread.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySignDownloaderThread.java (revision 31387) @@ -23,4 +23,10 @@ private final MapillaryLayer layer; + /** + * Main constructor. + * + * @param ex {@link ExecutorService} object that is executing this thread. + * @param url + */ public MapillarySignDownloaderThread(ExecutorService ex, String queryString, MapillaryLayer layer) { this.ex = ex; Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java (revision 31387) @@ -33,4 +33,11 @@ public boolean imagesAdded = false; + /** + * Main constructor. + * + * @param urlImages URL used to download the images. + * @param urlSequences URL used to download the sequences. + * @param urlSigns URL used to download the signs. + */ public MapillarySquareDownloadManagerThread(ConcurrentHashMap queryStringParts, MapillaryLayer layer) { this.imageQueryString = buildQueryString(queryStringParts); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java (revision 31387) @@ -27,4 +27,5 @@ public class HyperlinkLabel extends JLabel implements ActionListener { + private static final long serialVersionUID = -8965989079294159405L; private String text; private URL url; @@ -46,6 +47,5 @@ @Override public void setText(String text) { - super - .setText("" + text + ""); //$NON-NLS-1$ //$NON-NLS-2$ + super.setText("" + text + ""); //$NON-NLS-1$ //$NON-NLS-2$ this.text = text; } @@ -70,4 +70,6 @@ /** * Returns the text set by the user. + * + * @return The plain-text written in the label. */ public String getNormalText() { @@ -82,6 +84,5 @@ super.processMouseEvent(evt); if (evt.getID() == MouseEvent.MOUSE_CLICKED) - fireActionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, - getNormalText())); + fireActionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, getNormalText())); } @@ -89,4 +90,6 @@ * Adds an ActionListener to the list of listeners receiving notifications * when the label is clicked. + * + * @param listener */ public void addActionListener(ActionListener listener) { @@ -97,4 +100,6 @@ * Removes the given ActionListener from the list of listeners receiving * notifications when the label is clicked. + * + * @param listener */ public void removeActionListener(ActionListener listener) { Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 31386) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 31387) @@ -30,20 +30,17 @@ public class MapillaryExportDialog extends JPanel implements ActionListener { + private static final long serialVersionUID = 8675637080225099248L; protected JOptionPane optionPane; /** Button to export all downloaded images. */ public JRadioButton all; - /** - * Button to export all images in the sequence of the selected MapillaryImage. - */ + /** Button to export all images in the sequence of the selected MapillaryImage. */ public JRadioButton sequence; - /** - * Button to export all images belonging to the selected MapillaryImage - * objects. - */ + /** Button to export all images belonging to the selected {@link MapillaryImage} objects. */ public JRadioButton selected; + /** Button to rewrite all imported images */ public JRadioButton rewrite; public ButtonGroup group; - protected JButton choose; - protected JLabel path; + private JButton choose; + private JLabel path; public JFileChooser chooser; protected String exportDirectory; @@ -125,4 +122,5 @@ public class RewriteButtonAction extends AbstractAction { + private static final long serialVersionUID = -9103251296651015563L; private String lastPath; private MapillaryExportDialog dlg;