Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 32373) @@ -126,8 +126,9 @@ public void addMultiSelectedImage(MapillaryAbstractImage image) { if (!this.multiSelectedImages.contains(image)) { - if (this.getSelectedImage() == null) + if (this.getSelectedImage() == null) { this.setSelectedImage(image); - else + } else { this.multiSelectedImages.add(image); + } } if (Main.main != null) 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 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java (revision 32373) @@ -66,6 +66,7 @@ */ public synchronized void add(List images) { - for (MapillaryAbstractImage image : images) + for (MapillaryAbstractImage image : images) { add(image); + } } 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 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 32373) @@ -76,12 +76,13 @@ } else if (this.dialog.group.isSelected(this.dialog.sequence.getModel())) { Set images = new ConcurrentSkipListSet<>(); - for (MapillaryAbstractImage image : MapillaryLayer.getInstance() - .getData().getMultiSelectedImages()) + for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData().getMultiSelectedImages()) { if (image instanceof MapillaryImage) { - if (!images.contains(image)) + if (!images.contains(image)) { images.addAll(((MapillaryImage) image).getSequence().getImages()); + } } else { images.add(image); } + } export(images); } else if (this.dialog.group.isSelected(this.dialog.selected.getModel())) { Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java (revision 32373) @@ -37,8 +37,9 @@ @Override public void actionPerformed(ActionEvent arg0) { - if (MapillaryLayer.getInstance().mode instanceof SelectMode) + if (MapillaryLayer.getInstance().mode instanceof SelectMode) { MapillaryLayer.getInstance().setMode(new JoinMode()); - else + } else { MapillaryLayer.getInstance().setMode(new SelectMode()); + } } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java (revision 32373) @@ -69,10 +69,10 @@ @Override - public void selectedImageChanged(MapillaryAbstractImage oldImage, - MapillaryAbstractImage newImage) { - if (oldImage == null && newImage != null) + public void selectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) { + if (oldImage == null && newImage != null) { MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getUploadMenu(), true); - else if (oldImage != null && newImage == null) + } else if (oldImage != null && newImage == null) { MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getUploadMenu(), false); + } } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java (revision 32373) @@ -91,8 +91,10 @@ private void fireWalkStarted() { - if (this.listeners.isEmpty()) + if (this.listeners.isEmpty()) { return; - for (WalkListener lis : this.listeners) + } + for (WalkListener lis : this.listeners) { lis.walkStarted(this.thread); + } } 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 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 32373) @@ -47,10 +47,10 @@ @Override - public void selectedImageChanged(MapillaryAbstractImage oldImage, - MapillaryAbstractImage newImage) { - if (oldImage == null && newImage != null) + public void selectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) { + if (oldImage == null && newImage != null) { MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getZoomMenu(), true); - else if (oldImage != null && newImage == null) + } else if (oldImage != null && newImage == null) { MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getZoomMenu(), false); + } } 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 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 32373) @@ -87,13 +87,13 @@ this.sequence.setEnabled(false); } - if (MapillaryLayer.getInstance().getData().getMultiSelectedImages() - .isEmpty()) { + if (MapillaryLayer.getInstance().getData().getMultiSelectedImages().isEmpty()) { this.selected.setEnabled(false); } this.rewrite.setEnabled(false); - for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData() - .getImages()) - if (img instanceof MapillaryImportedImage) + for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData().getImages()) { + if (img instanceof MapillaryImportedImage) { this.rewrite.setEnabled(true); + } + } this.path = new JLabel(tr("Select a folder")); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java (revision 32373) @@ -145,13 +145,15 @@ int position = MapillaryRecord.getInstance().position; ArrayList undoCommands = new ArrayList<>(); - if (position >= 0) + if (position >= 0) { undoCommands = new ArrayList<>(commands.subList(0, position + 1)); - else + } else { this.undoButton.setEnabled(false); + } ArrayList redoCommands = new ArrayList<>(); - if (!commands.isEmpty() && position + 1 < commands.size()) + if (!commands.isEmpty() && position + 1 < commands.size()) { redoCommands = new ArrayList<>(commands.subList(position + 1, commands.size())); - else + } else { this.redoButton.setEnabled(false); + } DefaultMutableTreeNode redoRoot = new DefaultMutableTreeNode(); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java (revision 32373) @@ -143,22 +143,26 @@ visibleRect = MapillaryImageDisplay.this.visibleRect; } - if (image == null) - return; + if (image == null) { + return; + } if (e.getButton() == OPTION_BUTTON) { - if (!MapillaryImageDisplay.this.visibleRect.equals(new Rectangle(0, 0, - image.getWidth(null), image.getHeight(null)))) + if (!MapillaryImageDisplay.this.visibleRect.equals(new Rectangle(0, 0, image.getWidth(null), image.getHeight(null)))) { // Zooms to 1:1 MapillaryImageDisplay.this.visibleRect = new Rectangle(0, 0, image.getWidth(null), image.getHeight(null)); - else + } else { // Zooms to best fit. - MapillaryImageDisplay.this.visibleRect = new Rectangle(0, - (image.getHeight(null) - (image.getWidth(null) * getHeight()) - / getWidth()) / 2, image.getWidth(null), - (image.getWidth(null) * getHeight()) / getWidth()); + MapillaryImageDisplay.this.visibleRect = new Rectangle( + 0, + (image.getHeight(null) - (image.getWidth(null) * getHeight()) / getWidth()) / 2, + image.getWidth(null), + (image.getWidth(null) * getHeight()) / getWidth() + ); + } MapillaryImageDisplay.this.repaint(); return; - } else if (e.getButton() != DRAG_BUTTON) - return; + } else if (e.getButton() != DRAG_BUTTON) { + return; + } // Calculate the translation to set the clicked point the center of // the view. Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java (revision 32373) @@ -37,8 +37,10 @@ @Override public void undo() { - for (MapillaryAbstractImage img : this.images) + for (MapillaryAbstractImage img : this.images) { MapillaryLayer.getInstance().getData().getImages().remove(img); - if (Main.main != null) + } + if (Main.main != null) { MapillaryData.dataUpdated(); + } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java (revision 32373) @@ -78,12 +78,13 @@ String downloadMode = Main.pref.get("mapillary.download-mode", MODES.Automatic.toString()); boolean isTempSemiautomatic = MapillaryLayer.hasInstance() && MapillaryLayer.getInstance().tempSemiautomatic; - if (MODES.Semiautomatic.toString().equals(downloadMode) || isTempSemiautomatic) + if (MODES.Semiautomatic.toString().equals(downloadMode) || isTempSemiautomatic) { return MODES.Semiautomatic; - else if (MODES.Manual.toString().equals(downloadMode)) + } else if (MODES.Manual.toString().equals(downloadMode)) { return MODES.Manual; - else if (MODES.Automatic.toString().equals(downloadMode)) + } else if (MODES.Automatic.toString().equals(downloadMode)) { return MODES.Automatic; - else + } else { throw new IllegalStateException(); + } } Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java (revision 32373) @@ -129,6 +129,7 @@ // If the queue is full, waits for it to have more space // available before executing anything else. - while (this.ex.getQueue().remainingCapacity() == 0) + while (this.ex.getQueue().remainingCapacity() == 0) { Thread.sleep(100); + } } catch (Exception e) { Main.error(e); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java (revision 32373) @@ -127,10 +127,11 @@ exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); - if (mimg instanceof MapillaryImportedImage) + if (mimg instanceof MapillaryImportedImage) { exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL, ((MapillaryImportedImage) mimg).getDate("yyyy/MM/dd HH:mm:ss")); - else if (mimg instanceof MapillaryImage) + } else if (mimg instanceof MapillaryImage) { exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL, ((MapillaryImage) mimg).getDate("yyyy/MM/dd HH/mm/ss")); + } outputSet.setGPSInDegrees(mimg.getLatLon().lon(), mimg.getLatLon().lat()); OutputStream os = new BufferedOutputStream(new FileOutputStream(finalPath + ".jpg")); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java (revision 32372) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java (revision 32373) @@ -49,6 +49,7 @@ public void mousePressed(MouseEvent e) { this.lastButton = e.getButton(); - if (e.getButton() != MouseEvent.BUTTON1) - return; + if (e.getButton() != MouseEvent.BUTTON1) { + return; + } MapillaryAbstractImage closest = getClosest(e.getPoint()); if (!(Main.getLayerManager().getActiveLayer() instanceof MapillaryLayer) @@ -57,10 +58,9 @@ this.data.setSelectedImage(closest); return; - } else if (Main.getLayerManager().getActiveLayer() != MapillaryLayer - .getInstance()) - return; + } else if (Main.getLayerManager().getActiveLayer() != MapillaryLayer.getInstance()) { + return; + } // Double click - if (e.getClickCount() == 2 && this.data.getSelectedImage() != null - && closest != null) { + if (e.getClickCount() == 2 && this.data.getSelectedImage() != null && closest != null) { for (MapillaryAbstractImage img : closest.getSequence().getImages()) { this.data.addMultiSelectedImage(img); @@ -70,28 +70,29 @@ this.lastClicked = this.closest; this.closest = closest; - if (closest != null && this.data.getMultiSelectedImages().contains(closest)) - return; + if (closest != null && this.data.getMultiSelectedImages().contains(closest)) { + return; + } // ctrl+click - if (e.getModifiers() == (InputEvent.BUTTON1_MASK | InputEvent.CTRL_MASK) - && closest != null) + if (e.getModifiers() == (InputEvent.BUTTON1_MASK | InputEvent.CTRL_MASK) && closest != null) { this.data.addMultiSelectedImage(closest); // shift + click - else if (e.getModifiers() == (InputEvent.BUTTON1_MASK | InputEvent.SHIFT_MASK) - && this.lastClicked instanceof MapillaryImage) { + } else if ( + e.getModifiers() == (InputEvent.BUTTON1_MASK | InputEvent.SHIFT_MASK) + && this.lastClicked instanceof MapillaryImage + ) { if (this.closest != null && this.lastClicked != null && this.closest.getSequence() == (this.lastClicked).getSequence()) { int i = this.closest.getSequence().getImages().indexOf(this.closest); - int j = this.lastClicked.getSequence().getImages() - .indexOf(this.lastClicked); - if (i < j) - this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence() - .getImages().subList(i, j + 1))); - else - this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence() - .getImages().subList(j, i + 1))); + int j = this.lastClicked.getSequence().getImages().indexOf(this.lastClicked); + this.data.addMultiSelectedImage( + i < j + ? new ConcurrentSkipListSet<>(this.closest.getSequence().getImages().subList(i, j + 1)) + : new ConcurrentSkipListSet<>(this.closest.getSequence().getImages().subList(j, i + 1)) + ); } // click - } else + } else { this.data.setSelectedImage(closest); + } } @@ -102,9 +103,11 @@ } - if (!Main.pref.getBoolean("mapillary.developer")) + if (!Main.pref.getBoolean("mapillary.developer")) { for (MapillaryAbstractImage img : this.data.getMultiSelectedImages()) { - if (img instanceof MapillaryImage) + if (img instanceof MapillaryImage) { return; - } + } + } + } if (this.data.getSelectedImage() != null) { if (this.lastButton == MouseEvent.BUTTON1 && !e.isShiftDown()) {