fix build with newer JOSM

Author: stoecker

.github/workflows/ant.yml

@@ -51,7 +51,7 @@ jobs:
     needs: check-release-needed
     uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3
     with:
-      josm-revision: "r18877"
+      josm-revision: "r19387"
       java-version: 17
       perform-revision-tagging: ${{ needs.check-release-needed.outputs.release_needed == 'true' }}
 

.gitignore

@@ -31,3 +31,5 @@
 
 javadoc
 lib
+
+checkstyle-josm-Mapillary.xml

build.xml

@@ -8,7 +8,7 @@
   <property name="plugin.description" value="Allows the user to work with pictures hosted at mapillary.com"/>
   <property name="plugin.icon" value="images/mapillary-logo.svg"/>
   <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary"/>
-  <property name="plugin.main.version" value="18940"/>
+  <property name="plugin.main.version" value="19387"/>
   <!-- The datepicker plugin is currently in the source tree. TODO fix -->
   <property name="plugin.requires" value="apache-commons"/>
   <property name="plugin.minimum.java.version" value="17"/>

pom.xml

@@ -26,7 +26,7 @@
     <java.lang.version>17</java.lang.version>
     <plugin.src.dir>src/main/java</plugin.src.dir>
     <plugin.resources.dir>src/main/resources</plugin.resources.dir>
-    <plugin.main.version>18940</plugin.main.version>
+    <plugin.main.version>19387</plugin.main.version>
     <plugin.author>nokutu, floscher, taylor.smock &lt;tsmock@meta.com&gt;</plugin.author>
     <plugin.class>org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin</plugin.class>
     <plugin.description>Allows the user to work with pictures hosted at mapillary.com</plugin.description>

src/main/java/org/openstreetmap/josm/plugins/datepicker/IDatePicker.java

@@ -16,8 +16,8 @@
  * {@link IDatePicker#getNewDatePicker} to get a new date picker. It uses the
  * {@code "datepicker.classname"} setting to determine the appropriate class.
  *
- * @param <T> The component that the date picker returns for the UI
  * @author Taylor Smock
+ * @param <T> The component that the date picker returns for the UI
  */
 public interface IDatePicker<T extends JComponent> {
     /**

src/main/java/org/openstreetmap/josm/plugins/mapillary/MapillaryKeyListener.java

@@ -143,7 +143,7 @@ public void actionPerformed(ActionEvent e) {
                     new MapillaryNodesDownloader(
                         downloaded -> downloaded.stream().map(MapillaryImageUtils::getSequenceKey).distinct()
                             .map(seq -> new MapillarySequenceDownloader(seq, s -> {
-                                /* Do nothing */}))
+                                /* Do nothing */ }))
                             .forEach(MapillarySequenceDownloader::execute),
                         missingImages).execute();
                 }
@@ -198,7 +198,7 @@ public void actionPerformed(ActionEvent e) {
             if (missingImages.length != 0) {
                 new MapillaryNodesDownloader(downloaded -> downloaded.stream().map(MapillaryImageUtils::getSequenceKey)
                     .distinct().map(seq -> new MapillarySequenceDownloader(seq, s -> {
-                        /* Do nothing */}))
+                        /* Do nothing */ }))
                     .forEach(MapillarySequenceDownloader::execute), missingImages).execute();
             }
             Map<OsmData<?, ?, ?, ?>, List<IPrimitive>> selections = detections.stream()

src/main/java/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -117,7 +117,7 @@ public MapillaryPlugin(PluginInformation info) {
     }
 
     public static VectorDataSelectionListener[] getMapillaryDataListeners() {
-        return new VectorDataSelectionListener[] { ZOOM_ACTION };
+        return new VectorDataSelectionListener[] {ZOOM_ACTION};
     }
 
     /**

src/main/java/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

@@ -62,7 +62,7 @@ public void actionPerformed(ActionEvent ae) {
 
         this.dialog = new MapillaryExportDialog(ok);
         pane.setMessage(this.dialog);
-        pane.setOptions(new JButton[] { ok, cancel });
+        pane.setOptions(new JButton[] {ok, cancel});
 
         JDialog dlg = pane.createDialog(MainApplication.getMainFrame(), tr("Export Mapillary images"));
         dlg.setMinimumSize(new Dimension(400, 150));

src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/layer/geoimage/MapillaryImageEntry.java

@@ -85,7 +85,8 @@
 public class MapillaryImageEntry
     implements IImageEntry<MapillaryImageEntry>, BiConsumer<Long, Collection<ImageDetection<?>>> {
     private static final CacheAccess<Long, MapillaryImageEntry> CACHE =
-        JCSCacheManager.getCache("mapillary:mapillaryimageentry", Config.getPref().getInt("mapillary.jcs.cache.max_objects_in_memory", 10), 0, null);
+        JCSCacheManager.getCache("mapillary:mapillaryimageentry",
+        Config.getPref().getInt("mapillary.jcs.cache.max_objects_in_memory", 10), 0, null);
     private static final String MESSAGE_SEPARATOR = " — ";
     private INode image;
     private final List<ImageDetection<?>> imageDetections = new ArrayList<>();
@@ -94,7 +95,7 @@ public class MapillaryImageEntry
     private int exifOrientation = 1;
     private boolean fullImage;
 
-    private static class MapillaryValueChangeListener implements AbstractProperty.ValueChangeListener<Boolean> {
+    private static final class MapillaryValueChangeListener implements AbstractProperty.ValueChangeListener<Boolean> {
         static final MapillaryValueChangeListener INSTANCE = new MapillaryValueChangeListener();
 
         @Override
@@ -502,16 +503,56 @@ public Instant getExifInstant() {
         return MapillaryImageUtils.getDate(this.image);
     }
 
+    @Override
+    public Instant getExifGpsInstant() {
+        return null;
+    }
+
     @Override
     public boolean hasGpsTime() {
         return false;
     }
 
+    @Override
+    public Double getExifHPosErr() {
+      return null;
+    }
+
+    @Override
+    public String getExifGpsProcMethod() {
+      return null;
+    }
+
+    @Override
+    public String getExifGpsDatum() {
+      return null;
+    }
+
+    @Override
+    public Double getExifGpsDop() {
+      return null;
+    }
+
+    @Override
+    public Integer getGps2d3dMode() {
+      return null;
+    }
+
+    @Override
+    public Integer getGpsDiffMode() {
+      return null;
+    }
+
     @Override
     public Instant getGpsInstant() {
         return null;
     }
 
+    @Override
+    public Double getExifGpsTrack() {
+        return null;
+    }
+
     @Override
     public String getIptcCaption() {
         return null;