Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImage.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImage.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImage.java (revision 36488) @@ -27,6 +27,5 @@ interface StreetsideAbstractImage extends ILatLon, IQuadBucketType, Comparable, Serializable -permits StreetsideImage -{ +permits StreetsideImage { /** 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImage.java (revision 36488) @@ -10,4 +10,6 @@ * A StreetsideImage object represents each of the images stored in Streetside. * + * @author nokutu + * @author renerr18 * @param id The unique id for the cubemap * @param lat The latitude of the image @@ -25,8 +27,4 @@ * @param imageWidth The width for this image tiles * @param imageUrlSubdomains The subdomains for this image - * - * @author nokutu - * @author renerr18 - * * @see StreetsideData */ 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (revision 36488) @@ -395,6 +395,6 @@ @Override public Action[] getMenuEntries() { - return new Action[] { LayerListDialog.getInstance().createShowHideLayerAction(), - LayerListDialog.getInstance().createDeleteLayerAction(), new LayerListPopup.InfoAction(this) }; + return new Action[] {LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), new LayerListPopup.InfoAction(this)}; } @@ -487,8 +487,8 @@ private record NearestImgToTargetComparator(StreetsideAbstractImage target) implements Comparator { - - @Override - public int compare(StreetsideAbstractImage img1, StreetsideAbstractImage img2) { - return (int) Math.signum(img1.greatCircleDistance(target) - img2.greatCircleDistance(target)); - } -}} + @Override + public int compare(StreetsideAbstractImage img1, StreetsideAbstractImage img2) { + return (int) Math.signum(img1.greatCircleDistance(target) - img2.greatCircleDistance(target)); + } + } +} 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsidePlugin.java (revision 36488) @@ -52,5 +52,5 @@ static StreetsideDataListener[] getStreetsideDataListeners() { - return new StreetsideDataListener[] { WALK_ACTION, ZOOM_ACTION, CubemapBuilder.getInstance() }; + return new StreetsideDataListener[] {WALK_ACTION, ZOOM_ACTION, CubemapBuilder.getInstance()}; } 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/CacheUtils.java (revision 36488) @@ -136,6 +136,5 @@ } - private static class IgnoreDownload implements ICachedLoaderListener { - + private static final class IgnoreDownload implements ICachedLoaderListener { @Override public void loadingFinished(CacheEntry arg0, CacheEntryAttributes arg1, LoadResult arg2) { Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBox.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBox.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBox.java (revision 36488) @@ -28,5 +28,5 @@ private final ImageView up = new ImageView(); private final ImageView down = new ImageView(); - private final ImageView[] views = new ImageView[] { front, right, back, left, up, down }; + private final ImageView[] views = new ImageView[] {front, right, back, left, up, down}; private final Image frontImg; private final Image rightImg; Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java (revision 36488) @@ -138,5 +138,5 @@ if (Boolean.TRUE.equals(StreetsideProperties.DEBUGING_ENABLED.get())) { LOGGER.log(Logging.LEVEL_DEBUG, "Completed downloading tiles for {0} in {1} seconds.", - new Object[] { newImage.id(), runTime }); + new Object[] {newImage.id(), runTime}); } } @@ -275,6 +275,6 @@ LOGGER.log(Logging.LEVEL_DEBUG, "{0} tile images ready for building cumbemap faces for cubemap {1} in {2} seconds.", - new Object[] { currentTileCount.get(), CubemapBuilder.getInstance().getCubemap().id(), - Long.toString(runTime) }); + new Object[] {currentTileCount.get(), CubemapBuilder.getInstance().getCubemap().id(), + Long.toString(runTime)}); } 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java (revision 36488) @@ -120,5 +120,5 @@ long endTime = System.currentTimeMillis(); long runTime = (endTime - startTime) / 1000; - LOGGER.log(Logging.LEVEL_DEBUG, "Loaded image for {0} in {1} seconds.", new Object[] { url, runTime }); + LOGGER.log(Logging.LEVEL_DEBUG, "Loaded image for {0} in {1} seconds.", new Object[] {url, runTime}); } } catch (IOException e) { Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideImageDisplay.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideImageDisplay.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideImageDisplay.java (revision 36488) @@ -217,5 +217,5 @@ } - private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener { + private final class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener { private boolean mouseIsDragging; private long lastTimeForMousePoint; Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java (revision 36488) @@ -45,6 +45,6 @@ private final JComboBox downloadModeComboBox = new JComboBox<>( - new String[] { DOWNLOAD_MODE.VISIBLE_AREA.getLabel(), DOWNLOAD_MODE.OSM_AREA.getLabel(), - DOWNLOAD_MODE.MANUAL_ONLY.getLabel() }); + new String[] {DOWNLOAD_MODE.VISIBLE_AREA.getLabel(), DOWNLOAD_MODE.OSM_AREA.getLabel(), + DOWNLOAD_MODE.MANUAL_ONLY.getLabel()}); private final JCheckBox displayHour = new JCheckBox(I18n.tr("Display hour when the picture was taken"), Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java (revision 36488) @@ -47,9 +47,10 @@ mainText.setContentType("text/html"); mainText.setFont(SelectableLabel.DEFAULT_FONT); - mainText.setText("
" - + "Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles for the 360 degree imagery, select Imagery->Streetside from the JOSM menu." + mainText.setText(I18n.tr("
" + + "Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles for the 360 degree imagery, " + + "select Imagery->Streetside from the JOSM menu." + "

" + "Once the blue bubbles appear on the map, click on a vector bubble and undock/maximize the 360 viewer to view the imagery." - + "
"); + + "
")); add(mainText, BorderLayout.CENTER); 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 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java (revision 36488) @@ -86,9 +86,9 @@ final var checkPanel = new JPanel(); - final var imgReloadAction = new ImageReloadAction("Reload"); + final var imgReloadAction = new ImageReloadAction(I18n.tr("Reload")); final var imgReloadButton = new StreetsideButton(imgReloadAction); - final var highResImageryCheck = new JCheckBox("High resolution"); + final var highResImageryCheck = new JCheckBox(I18n.tr("High resolution")); highResImageryCheck.setSelected(StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()); highResImageryCheck.addActionListener( @@ -101,5 +101,5 @@ final var privacyLink = new JPanel(); - imgLinkAction = new WebLinkAction("Report a privacy concern with this image", null); + imgLinkAction = new WebLinkAction(I18n.tr("Report a privacy concern with this image"), null); privacyLink.add(new StreetsideButton(imgLinkAction, true)); checkPanel.add(privacyLink, BorderLayout.PAGE_END); @@ -150,5 +150,5 @@ if (Boolean.TRUE.equals(StreetsideProperties.DEBUGING_ENABLED.get())) { LOGGER.log(Logging.LEVEL_DEBUG, "Privacy link set for Streetside image {0} quadKey {1}", - new Object[] { bubbleId, newImageId }); + new Object[] {bubbleId, newImageId}); } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java (revision 36488) @@ -1,4 +1,6 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.streetside.io.download; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.GraphicsEnvironment; @@ -39,5 +41,5 @@ if (Thread.interrupted()) { LOGGER.log(Logging.LEVEL_ERROR, "{0} for {1} interrupted!", - new Object[] { getClass().getSimpleName(), bounds }); + new Object[] {getClass().getSimpleName(), bounds}); return; } @@ -47,5 +49,5 @@ } } catch (IOException e) { - String message = "Could not read from URL " + nextURL + "!"; + String message = tr("Could not read from URL %s!", nextURL); LOGGER.log(Logging.LEVEL_WARN, message, e); if (!GraphicsEnvironment.isHeadless()) { @@ -56,4 +58,4 @@ } - public abstract void run(final URLConnection connection) throws IOException; + public abstract void run(URLConnection connection) throws IOException; } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java (revision 36488) @@ -74,5 +74,5 @@ final long endTime = System.currentTimeMillis(); LOG.log(Level.INFO, "Successfully loaded {0} Microsoft Streetside images in {1} seconds.", - new Object[] { this.images.size(), (endTime - startTime) / 1000 }); + new Object[] {this.images.size(), (endTime - startTime) / 1000}); } catch (DateTimeParseException dateTimeParseException) { // Added to debug #23658 -- a valid date string caused an exception Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/AbstractMode.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/AbstractMode.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/AbstractMode.java (revision 36488) @@ -62,5 +62,5 @@ } - private static class SemiautomaticThread extends Thread { + private static final class SemiautomaticThread extends Thread { /** Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/SelectMode.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/SelectMode.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/mode/SelectMode.java (revision 36488) @@ -51,10 +51,10 @@ if (closestTemp != null && !imageHighlighted) { if (MainApplication.getMap().mapMode != null) { - MainApplication.getMap().mapMode.putValue("active", Boolean.FALSE); + MainApplication.getMap().mapMode.putValue("active", false); } imageHighlighted = true; } else if (closestTemp == null && imageHighlighted && nothingHighlighted) { if (MainApplication.getMap().mapMode != null) { - MainApplication.getMap().mapMode.putValue("active", Boolean.TRUE); + MainApplication.getMap().mapMode.putValue("active", true); } nothingHighlighted = false; Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/ImageUtil.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/ImageUtil.java (revision 36483) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/ImageUtil.java (revision 36488) @@ -30,5 +30,5 @@ public static ImageIcon scaleImageIcon(final ImageIcon icon, int size) { if (Boolean.TRUE.equals(StreetsideProperties.DEBUGING_ENABLED.get())) { - LOGGER.log(Logging.LEVEL_DEBUG, "Scale icon {0} → {1}", new Object[] { icon.getIconWidth(), size }); + LOGGER.log(Logging.LEVEL_DEBUG, "Scale icon {0} → {1}", new Object[] {icon.getIconWidth(), size}); } return new ImageIcon(