Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (revision 31264) @@ -3,4 +3,11 @@ import org.openstreetmap.josm.data.coor.LatLon; +/** + * Abstract supperclass for all image objects. At the moment there is just 2, + * {@code MapillaryImportedImage} and {@code MapillaryImage}. + * + * @author nokutu + * + */ public abstract class MapillaryAbstractImage { Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (revision 31264) @@ -9,4 +9,7 @@ public class MapillaryImportedImage extends MapillaryAbstractImage { + /** + * The picture file. + */ protected File file; @@ -16,4 +19,10 @@ } + /** + * Returns the pictures of the file. + * + * @return + * @throws IOException + */ public BufferedImage getImage() throws IOException { return ImageIO.read(file); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryMouseAdapter.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryMouseAdapter.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryMouseAdapter.java (revision 31264) @@ -12,4 +12,10 @@ import org.openstreetmap.josm.plugins.mapillary.commands.MapillaryRecord; +/** + * Handles the input event related with the layer. Mainly clicks. + * + * @author nokutu + * + */ public class MapillaryMouseAdapter extends MouseAdapter { private Point start; @@ -19,6 +25,6 @@ private MapillaryData mapillaryData; private MapillaryRecord record; - - public MapillaryMouseAdapter(){ + + public MapillaryMouseAdapter() { mapillaryData = MapillaryData.getInstance(); record = MapillaryRecord.getInstance(); @@ -30,10 +36,8 @@ if (e.getButton() != MouseEvent.BUTTON1) return; - if (Main.map.mapView.getActiveLayer() != MapillaryLayer - .getInstance()) + if (Main.map.mapView.getActiveLayer() != MapillaryLayer.getInstance()) return; MapillaryAbstractImage closestTemp = getClosest(e.getPoint()); - if (closestTemp instanceof MapillaryImage - || closestTemp == null) { + if (closestTemp instanceof MapillaryImage || closestTemp == null) { MapillaryImage closest = (MapillaryImage) closestTemp; // Doube click @@ -49,6 +53,5 @@ this.lastClicked = this.closest; this.closest = closest; - if (mapillaryData.getMultiSelectedImages() - .contains(closest)) + if (mapillaryData.getMultiSelectedImages().contains(closest)) return; // ctrl+click @@ -64,19 +67,19 @@ && ((MapillaryImage) this.closest).getSequence() == ((MapillaryImage) this.lastClicked) .getSequence()) { - int i = ((MapillaryImage) this.closest).getSequence().getImages() - .indexOf(this.closest); - int j = ((MapillaryImage) this.lastClicked).getSequence().getImages() - .indexOf(this.lastClicked); + int i = ((MapillaryImage) this.closest).getSequence() + .getImages().indexOf(this.closest); + int j = ((MapillaryImage) this.lastClicked).getSequence() + .getImages().indexOf(this.lastClicked); if (i < j) mapillaryData .addMultiSelectedImage(new ArrayList( - ((MapillaryImage) this.closest).getSequence() - .getImages() + ((MapillaryImage) this.closest) + .getSequence().getImages() .subList(i, j + 1))); else mapillaryData .addMultiSelectedImage(new ArrayList( - ((MapillaryImage) this.closest).getSequence() - .getImages() + ((MapillaryImage) this.closest) + .getSequence().getImages() .subList(j, i + 1))); } @@ -84,5 +87,5 @@ } else mapillaryData.setSelectedImage(closest); - // If you select and imported image + // If you select an imported image } else if (closestTemp instanceof MapillaryImportedImage) { MapillaryImportedImage closest = (MapillaryImportedImage) closestTemp; @@ -90,6 +93,5 @@ this.lastClicked = this.closest; this.closest = closest; - if (mapillaryData.getMultiSelectedImages() - .contains(closest)) + if (mapillaryData.getMultiSelectedImages().contains(closest)) return; if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK) @@ -106,8 +108,6 @@ MapillaryAbstractImage closest = null; for (MapillaryAbstractImage image : mapillaryData.getImages()) { - Point imagePoint = Main.map.mapView.getPoint(image - .getLatLon()); - imagePoint - .setLocation(imagePoint.getX(), imagePoint.getY()); + Point imagePoint = Main.map.mapView.getPoint(image.getLatLon()); + imagePoint.setLocation(imagePoint.getX(), imagePoint.getY()); double dist = clickPoint.distanceSq(imagePoint); if (minDistance > dist @@ -122,29 +122,24 @@ @Override public void mouseDragged(MouseEvent e) { - if (Main.map.mapView.getActiveLayer() != MapillaryLayer - .getInstance()) + if (Main.map.mapView.getActiveLayer() != MapillaryLayer.getInstance()) return; if (MapillaryData.getInstance().getSelectedImage() != null) { if (lastButton == MouseEvent.BUTTON1 && !e.isShiftDown()) { - LatLon to = Main.map.mapView.getLatLon(e.getX(), - e.getY()); + LatLon to = Main.map.mapView.getLatLon(e.getX(), e.getY()); LatLon from = Main.map.mapView.getLatLon(start.getX(), start.getY()); - for (MapillaryAbstractImage img : MapillaryData - .getInstance().getMultiSelectedImages()) { - img.move(to.getX() - from.getX(), - to.getY() - from.getY()); + for (MapillaryAbstractImage img : MapillaryData.getInstance() + .getMultiSelectedImages()) { + img.move(to.getX() - from.getX(), to.getY() - from.getY()); } Main.map.repaint(); - } else if (lastButton == MouseEvent.BUTTON1 - && e.isShiftDown()) { + } else if (lastButton == MouseEvent.BUTTON1 && e.isShiftDown()) { this.closest.turn(Math.toDegrees(Math.atan2( (e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa()); - for (MapillaryAbstractImage img : MapillaryData - .getInstance().getMultiSelectedImages()) { - img.turn(Math.toDegrees(Math.atan2( - (e.getX() - start.x), -(e.getY() - start.y))) - - closest.getTempCa()); + for (MapillaryAbstractImage img : MapillaryData.getInstance() + .getMultiSelectedImages()) { + img.turn(Math.toDegrees(Math.atan2((e.getX() - start.x), + -(e.getY() - start.y))) - closest.getTempCa()); } Main.map.repaint(); @@ -165,10 +160,9 @@ } else if (mapillaryData.getSelectedImage().getTempLatLon() != mapillaryData .getSelectedImage().getLatLon()) { - LatLon from = mapillaryData.getSelectedImage() - .getTempLatLon(); + LatLon from = mapillaryData.getSelectedImage().getTempLatLon(); LatLon to = mapillaryData.getSelectedImage().getLatLon(); record.addCommand(new CommandMoveImage(mapillaryData - .getMultiSelectedImages(), to.getX() - from.getX(), - to.getY() - from.getY())); + .getMultiSelectedImages(), to.getX() - from.getX(), to + .getY() - from.getY())); } for (MapillaryAbstractImage img : mapillaryData Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java (revision 31264) @@ -33,22 +33,13 @@ } - /* - * (non-Javadoc) - * - * @see - * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ @Override public void actionPerformed(ActionEvent arg0) { this.layer = null; if (Main.map == null || Main.map.mapView == null - || Main.map.mapView.getEditLayer() == null) { + || Main.map.mapView.getEditLayer() == null) return; - } - for (Layer layer : Main.map.mapView.getAllLayers()) { - if (layer instanceof MapillaryLayer) { + for (Layer layer : Main.map.mapView.getAllLayers()) + if (layer instanceof MapillaryLayer) this.layer = (MapillaryLayer) layer; - } - } if (this.layer == null) Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 31264) @@ -69,4 +69,5 @@ export(MapillaryData.getInstance().getMultiSelectedImages()); } + // This option ignores the selected directory. } else if (dialog.group.isSelected(dialog.rewrite.getModel())) { ArrayList images = new ArrayList<>(); 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 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryCommand.java (revision 31264) @@ -17,7 +17,17 @@ public abstract void redo(); - + + /** + * If two equal commands are applied consecutively to the same set of + * images, they are summed in order to reduce them to just one command. + * + * @param command + */ public abstract void sum(MapillaryCommand command); - + + /** + * Checks if the image has been modified, compairing with its original + * values. + */ public void checkModified() { for (MapillaryAbstractImage image : images) 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 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java (revision 31264) @@ -39,5 +39,5 @@ JsonObject jsonobj = Json.createReader(br).readObject(); if (!jsonobj.getBoolean("more")) - ex.shutdownNow(); + ex.shutdown(); JsonArray jsonarr = jsonobj.getJsonArray("ims"); JsonObject data; @@ -53,5 +53,6 @@ ((MapillaryImage) image).setCapturedAt(data .getJsonNumber("captured_at").intValue()); - ((MapillaryImage) image).setLocation(data.getString("location")); + ((MapillaryImage) image).setLocation(data + .getString("location")); } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java (revision 31263) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java (revision 31264) @@ -45,4 +45,7 @@ ICachedLoaderListener, MapillaryDataListener { + public final static int NORMAL_MODE = 0; + public final static int SIGNAL_MODE = 1; + public static MapillaryToggleDialog INSTANCE; @@ -63,7 +66,4 @@ private int mode; - - public final static int NORMAL_MODE = 0; - public final static int SIGNAL_MODE = 1; private JPanel buttonsPanel; @@ -182,10 +182,8 @@ c++; } - if (first >= i) { + if (first >= i) previousSignalButton.setEnabled(false); - } - if (last <= i) { + if (last <= i) nextSignalButton.setEnabled(false); - } } @@ -277,4 +275,10 @@ } + /** + * Action class to jump to the image following the red line. + * + * @author nokutu + * + */ class redAction extends AbstractAction { public redAction() { @@ -294,4 +298,10 @@ } + /** + * Action class to jump to the image following the blue line. + * + * @author nokutu + * + */ class blueAction extends AbstractAction { public blueAction() { @@ -377,9 +387,15 @@ } + /** + * Action class to jump to the next picture containing a signal. + * + * @author nokutu + * + */ class NextSignalAction extends AbstractAction { public NextSignalAction() { putValue(NAME, tr("Next Signal")); putValue(SHORT_DESCRIPTION, - tr("Jumps to the next picture that contains a siganl")); + tr("Jumps to the next picture that contains a signal")); } @@ -406,9 +422,15 @@ } + /** + * Action class to jump to the previous picture containing a signal. + * + * @author nokutu + * + */ class PreviousSignalAction extends AbstractAction { public PreviousSignalAction() { putValue(NAME, tr("Previous Signal")); putValue(SHORT_DESCRIPTION, - tr("Jumps to the previous picture that contains a siganl")); + tr("Jumps to the previous picture that contains a signal")); }