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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 31451) @@ -82,5 +82,5 @@ /** {@link MapillaryData} object that stores the database */ - public final MapillaryData data; + private final MapillaryData data; /** The bounds of the areas for which the pictures have been downloaded */ @@ -172,5 +172,5 @@ * @return The {@link MapillaryData} object that stores the database. */ - public MapillaryData getMapillaryData() { + public MapillaryData getData() { return this.data; } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java (revision 31451) @@ -97,5 +97,5 @@ g.setColor(Color.MAGENTA); for (MapillaryAbstractImage img : MapillaryLayer.getInstance() - .getMapillaryData().getImages()) { + .getData().getImages()) { if (img instanceof MapillaryImage) { g.fillOval(mv.getPoint(img.getLatLon()).x - 3, 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 31451) @@ -71,9 +71,9 @@ && this.dialog.chooser != null) { if (this.dialog.group.isSelected(this.dialog.all.getModel())) { - export(MapillaryLayer.getInstance().data.getImages()); + export(MapillaryLayer.getInstance().getData().getImages()); } else if (this.dialog.group.isSelected(this.dialog.sequence.getModel())) { ArrayList images = new ArrayList<>(); - for (MapillaryAbstractImage image : MapillaryLayer.getInstance().data - .getMultiSelectedImages()) + for (MapillaryAbstractImage image : MapillaryLayer.getInstance() + .getData().getMultiSelectedImages()) if (image instanceof MapillaryImage) { if (!images.contains(image)) @@ -83,11 +83,11 @@ export(images); } else if (this.dialog.group.isSelected(this.dialog.selected.getModel())) { - export(MapillaryLayer.getInstance().data.getMultiSelectedImages()); + export(MapillaryLayer.getInstance().getData().getMultiSelectedImages()); } // This option ignores the selected directory. } else if (this.dialog.group.isSelected(this.dialog.rewrite.getModel())) { ArrayList images = new ArrayList<>(); - for (MapillaryAbstractImage image : MapillaryLayer.getInstance().data - .getImages()) + for (MapillaryAbstractImage image : MapillaryLayer.getInstance() + .getData().getImages()) if (image instanceof MapillaryImportedImage) { images.add(((MapillaryImportedImage) image)); 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java (revision 31451) @@ -84,8 +84,10 @@ try { if (extension.equals("jpg") || extension.equals("jpeg")) - MapillaryLayer.getInstance().data.add(readJPG(file.listFiles()[j])); + MapillaryLayer.getInstance().getData() + .add(readJPG(file.listFiles()[j])); else if (extension.equals("png")) - MapillaryLayer.getInstance().data.add(readPNG(file.listFiles()[j])); + MapillaryLayer.getInstance().getData() + .add(readPNG(file.listFiles()[j])); } catch (ImageReadException | IOException | NullPointerException e1) { Main.error(e1); @@ -98,5 +100,5 @@ .equals(".jpeg")) { try { - MapillaryLayer.getInstance().data.add(readJPG(file)); + MapillaryLayer.getInstance().getData().add(readJPG(file)); } catch (ImageReadException ex) { Main.error(ex); @@ -106,5 +108,5 @@ } else if (file.getPath().substring(file.getPath().length() - 4) .equals(".png")) { - MapillaryLayer.getInstance().data.add(readPNG(file)); + MapillaryLayer.getInstance().getData().add(readPNG(file)); } } 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java (revision 31451) @@ -161,5 +161,5 @@ MapillaryImportedImage image = new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue()); - MapillaryLayer.getInstance().data.add(image); + MapillaryLayer.getInstance().getData().add(image); image.getCapturedAt(); 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java (revision 31451) @@ -38,5 +38,5 @@ Shortcut.NONE), false, "mapillaryUpload", false); this.setEnabled(false); - MapillaryLayer.getInstance().data.addListener(this); + MapillaryLayer.getInstance().getData().addListener(this); } @@ -53,5 +53,5 @@ && (int) pane.getValue() == JOptionPane.OK_OPTION) { if (dialog.sequence.isSelected()) { - OAuthUtils.uploadSequence(MapillaryLayer.getInstance().data + OAuthUtils.uploadSequence(MapillaryLayer.getInstance().getData() .getSelectedImage().getSequence()); } 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 31451) @@ -35,5 +35,5 @@ KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryZoom", false); - MapillaryLayer.getInstance().data.addListener(this); + MapillaryLayer.getInstance().getData().addListener(this); this.setEnabled(false); } @@ -41,7 +41,7 @@ @Override public void actionPerformed(ActionEvent arg0) { - if (MapillaryLayer.getInstance().data.getSelectedImage() == null) + if (MapillaryLayer.getInstance().getData().getSelectedImage() == null) throw new IllegalStateException(); - Main.map.mapView.zoomTo(MapillaryLayer.getInstance().data + Main.map.mapView.zoomTo(MapillaryLayer.getInstance().getData() .getSelectedImage().getLatLon()); } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java (revision 31451) @@ -51,5 +51,5 @@ this.followSelected = followSelected; this.goForward = goForward; - this.data = MapillaryLayer.getInstance().getMapillaryData(); + this.data = MapillaryLayer.getInstance().getData(); this.data.addListener(this); } 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (revision 31451) @@ -64,6 +64,5 @@ queryStringParts.put("max_lat", maxLatLon.lat()); queryStringParts.put("max_lon", maxLatLon.lon()); - run(new MapillarySquareDownloadManagerThread(queryStringParts, - MapillaryLayer.getInstance())); + run(new MapillarySquareDownloadManagerThread(queryStringParts)); } 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java (revision 31451) @@ -27,5 +27,4 @@ private final String queryString; private final ExecutorService ex; - private final MapillaryLayer layer; /** @@ -36,12 +35,9 @@ * @param queryString * A String containing the parameters for the download. - * @param layer - * The layer to store the data. */ public MapillaryImageInfoDownloaderThread(ExecutorService ex, - String queryString, MapillaryLayer layer) { + String queryString) { this.ex = ex; this.queryString = queryString; - this.layer = layer; } @@ -59,5 +55,5 @@ data = jsonarr.getJsonObject(i); String key = data.getString("key"); - for (MapillaryAbstractImage image : this.layer.getMapillaryData() + for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData() .getImages()) { if (image instanceof MapillaryImage) { Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (revision 31451) @@ -101,12 +101,12 @@ try { for (MapillaryImage img : finalImages) { - if (this.layer.getMapillaryData().getImages().contains(img)) { + if (this.layer.getData().getImages().contains(img)) { // The image in finalImages is substituted by the one in the // database, as they represent the same picture. - img = (MapillaryImage) this.layer.getMapillaryData().getImages() - .get(this.layer.getMapillaryData().getImages().indexOf(img)); + img = (MapillaryImage) this.layer.getData().getImages() + .get(this.layer.getData().getImages().indexOf(img)); sequence.add(img); - ((MapillaryImage) this.layer.getMapillaryData().getImages() - .get(this.layer.getMapillaryData().getImages().indexOf(img))) + ((MapillaryImage) this.layer.getData().getImages() + .get(this.layer.getData().getImages().indexOf(img))) .setSequence(sequence); finalImages.set(finalImages.indexOf(img), img); @@ -121,5 +121,5 @@ } - this.layer.getMapillaryData().add( + this.layer.getData().add( new ArrayList(finalImages), false); } 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java (revision 31451) @@ -30,5 +30,4 @@ private final String sequenceQueryString; private final String signQueryString; - private final MapillaryLayer layer; /** @@ -37,10 +36,8 @@ * @param queryStringParts * The query data. - * @param layer - * The layer to store the images. * */ public MapillarySquareDownloadManagerThread( - ConcurrentHashMap queryStringParts, MapillaryLayer layer) { + ConcurrentHashMap queryStringParts) { this.imageQueryString = buildQueryString(queryStringParts); this.sequenceQueryString = buildQueryString(queryStringParts); @@ -49,6 +46,4 @@ // TODO: Move this line to the appropriate place, here's no GET-request Main.info("GET " + this.sequenceQueryString + " (Mapillary plugin)"); - - this.layer = layer; } @@ -85,5 +80,5 @@ MapillaryLayer.getInstance().updateHelpText(); } - this.layer.updateHelpText(); + MapillaryLayer.getInstance().updateHelpText(); MapillaryData.dataUpdated(); MapillaryFilterDialog.getInstance().refresh(); @@ -112,5 +107,5 @@ while (!ex.isShutdown()) { ex.execute(new MapillaryImageInfoDownloaderThread(ex, - this.imageQueryString + "&page=" + page + "&limit=20", this.layer)); + this.imageQueryString + "&page=" + page + "&limit=20")); while (ex.getQueue().remainingCapacity() == 0) Thread.sleep(100); @@ -126,5 +121,5 @@ while (!ex.isShutdown()) { ex.execute(new MapillaryTrafficSignDownloaderThread(ex, - this.signQueryString + "&page=" + page + "&limit=20", this.layer)); + this.signQueryString + "&page=" + page + "&limit=20")); while (ex.getQueue().remainingCapacity() == 0) Thread.sleep(100); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryTrafficSignDownloaderThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryTrafficSignDownloaderThread.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryTrafficSignDownloaderThread.java (revision 31451) @@ -28,5 +28,4 @@ private final String queryString; private final ExecutorService ex; - private final MapillaryLayer layer; /** @@ -37,12 +36,9 @@ * @param queryString * A String containing the parameter for the download. - * @param layer - * The layer to store the data. */ public MapillaryTrafficSignDownloaderThread(ExecutorService ex, - String queryString, MapillaryLayer layer) { + String queryString) { this.ex = ex; this.queryString = queryString; - this.layer = layer; } @@ -51,6 +47,6 @@ BufferedReader br; try { - br = new BufferedReader(new InputStreamReader( - new URL(URL + this.queryString).openStream(), "UTF-8")); + br = new BufferedReader(new InputStreamReader(new URL(URL + + this.queryString).openStream(), "UTF-8")); JsonObject jsonobj = Json.createReader(br).readObject(); if (!jsonobj.getBoolean("more")) { @@ -68,6 +64,6 @@ for (int k = 0; k < rects.size(); k++) { JsonObject data = rects.getJsonObject(k); - for (MapillaryAbstractImage image : this.layer.getMapillaryData() - .getImages()) + for (MapillaryAbstractImage image : MapillaryLayer.getInstance() + .getData().getImages()) if (image instanceof MapillaryImage && ((MapillaryImage) image).getKey().equals(key)) @@ -81,6 +77,6 @@ for (int j = 0; j < rects.size(); j++) { JsonObject data = rects.getJsonObject(j); - for (MapillaryAbstractImage image : this.layer.getMapillaryData() - .getImages()) + for (MapillaryAbstractImage image : MapillaryLayer.getInstance() + .getData().getImages()) if (image instanceof MapillaryImage && ((MapillaryImage) image).getKey().equals(key)) 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 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 31451) @@ -81,14 +81,15 @@ this.group.add(this.rewrite); // Some options are disabled depending on the circumstances - if (MapillaryLayer.getInstance().data.getSelectedImage() == null - || !(MapillaryLayer.getInstance().data.getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryLayer - .getInstance().data.getSelectedImage()).getSequence() != null)) { + if (MapillaryLayer.getInstance().getData().getSelectedImage() == null + || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryLayer + .getInstance().getData().getSelectedImage()).getSequence() != null)) { this.sequence.setEnabled(false); } - if (MapillaryLayer.getInstance().data.getMultiSelectedImages().isEmpty()) { + if (MapillaryLayer.getInstance().getData().getMultiSelectedImages() + .isEmpty()) { this.selected.setEnabled(false); } this.rewrite.setEnabled(false); - for (MapillaryAbstractImage img : MapillaryLayer.getInstance().data + for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData() .getImages()) if (img instanceof MapillaryImportedImage) Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (revision 31451) @@ -176,5 +176,5 @@ boolean onlySigns = this.onlySigns.isSelected(); - for (MapillaryAbstractImage img : MapillaryLayer.getInstance().data + for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData() .getImages()) { img.setVisible(true); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java (revision 31451) @@ -96,5 +96,5 @@ tr("Open Mapillary main dialog"), KeyEvent.VK_M, Shortcut.NONE), 200, false, MapillaryPreferenceSetting.class); - MapillaryLayer.getInstance().data.addListener(this); + MapillaryLayer.getInstance().getData().addListener(this); addShortcuts(); this.mapillaryImageDisplay = new MapillaryImageDisplay(); @@ -344,5 +344,5 @@ @Override public void actionPerformed(ActionEvent e) { - MapillaryLayer.getInstance().data.selectNext(); + MapillaryLayer.getInstance().getData().selectNext(); } } @@ -366,5 +366,5 @@ @Override public void actionPerformed(ActionEvent e) { - MapillaryLayer.getInstance().data.selectPrevious(); + MapillaryLayer.getInstance().getData().selectPrevious(); } } @@ -389,6 +389,6 @@ public void actionPerformed(ActionEvent e) { if (MapillaryMainDialog.getInstance().getImage() != null) { - MapillaryLayer.getInstance().data.setSelectedImage(MapillaryLayer.RED, - true); + MapillaryLayer.getInstance().getData() + .setSelectedImage(MapillaryLayer.RED, true); } } @@ -414,6 +414,6 @@ public void actionPerformed(ActionEvent e) { if (MapillaryMainDialog.getInstance().getImage() != null) { - MapillaryLayer.getInstance().data.setSelectedImage(MapillaryLayer.BLUE, - true); + MapillaryLayer.getInstance().getData() + .setSelectedImage(MapillaryLayer.BLUE, true); } } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java (revision 31451) @@ -28,6 +28,6 @@ this.sequence = new JRadioButton("Upload selected sequence."); - if (MapillaryLayer.getInstance().data.getSelectedImage() == null - || !(MapillaryLayer.getInstance().data.getSelectedImage() instanceof MapillaryImportedImage)) + if (MapillaryLayer.getInstance().getData().getSelectedImage() == null + || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage)) this.sequence.setEnabled(false); this.group.add(this.sequence); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java (revision 31451) @@ -28,5 +28,5 @@ private final static int DOWNLOAD_COOLDOWN = 2000; - protected MapillaryData data = MapillaryLayer.getInstance().data; + protected MapillaryData data = MapillaryLayer.getInstance().getData(); private static SemiautomaticThread semiautomaticThread = new SemiautomaticThread(); @@ -55,6 +55,8 @@ /** * Paint the dataset using the engine set. + * * @param g - * @param mv The object that can translate GeoPoints to screen coordinates. + * @param mv + * The object that can translate GeoPoints to screen coordinates. * @param box */ Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java =================================================================== --- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (revision 31450) +++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (revision 31451) @@ -59,5 +59,5 @@ int page = 1; - while (!ex.isShutdown() && MapillaryLayer.getInstance().getMapillaryData().getImages().size() <= 0 && page < 50) { + while (!ex.isShutdown() && MapillaryLayer.getInstance().getData().getImages().size() <= 0 && page < 50) { System.out.println("Sending sequence-request "+page+" to Mapillary-servers…"); Thread downloadThread = new MapillarySequenceDownloadThread(ex, queryString+"&page="+page); @@ -67,5 +67,5 @@ Thread.sleep(500); } - assertTrue(MapillaryLayer.getInstance().getMapillaryData().getImages().size() >= 1); + assertTrue(MapillaryLayer.getInstance().getData().getImages().size() >= 1); System.out.println("One or more images were added to the MapillaryLayer within the given bounds."); }