regression: NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref

[stephankn]

The change in r16545 removed the method with matching signature.

Causes java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)

in

            if (matchingDefault != null && !matchingDefault.equalsPref(info)) {

Build-Date:2020-06-22 19:37:34
Revision:16705
Is-Local-Build:true

Identification: JOSM/1.5 (16705 SVN en) Windows 10 64-Bit
OS Build number: Windows 10 Pro 1909 (18363)
Memory Usage: 1517 MB / 5461 MB (835 MB allocated, but free)
Java version: 1.8.0_251-b08, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel
Screen: \Display0 3840x2160 (scaling 1.0x1.0)
Maximum Screen Size: 3840x2160
Best cursor sizes: 16x16 -> 32x32, 32x32 -> 32x32

Plugins:
+ Mapillary
+ OpeningHoursEditor
+ apache-commons
+ apache-http
+ editgpx
+ javafx-windows (35458)
+ jna
+ reverter
+ scripting
+ tageditor
+ tagging-preset-tester
+ turnlanes-tagging
+ undelete

Tagging presets:
+ http://code.osm-tools.org/latest/josm-thai-presets.zip

Map paint styles:
- https://josm.openstreetmap.de/josmfile?page=Styles/Lane_and_Road_Attributes&zip=1
+ D:\osm\josm-thai-styles\Styles_Fixme-style.mapcss

Last errors/warnings:
- E: Handled by bug report queue: org.openstreetmap.josm.tools.JosmRuntimeException: java.util.concurrent.ExecutionException: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z. Cause: java.util.concurrent.ExecutionException: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z. Cause: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z


=== REPORTED CRASH DATA ===
BugReportExceptionHandler#handleException:
No data collected.

Warning issued by: BugReportExceptionHandler#handleException

=== STACK TRACE ===
Thread: main (1)
org.openstreetmap.josm.tools.JosmRuntimeException: java.util.concurrent.ExecutionException: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z
	at org.openstreetmap.josm.spi.lifecycle.Lifecycle.initialize(Lifecycle.java:89)
	at org.openstreetmap.josm.gui.MainApplication.mainJOSM(MainApplication.java:915)
	at org.openstreetmap.josm.gui.MainApplication$3.processArguments(MainApplication.java:276)
	at org.openstreetmap.josm.gui.MainApplication.main(MainApplication.java:713)
Caused by: java.util.concurrent.ExecutionException: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z
	at java.util.concurrent.FutureTask.report(Unknown Source)
	at java.util.concurrent.FutureTask.get(Unknown Source)
	at org.openstreetmap.josm.spi.lifecycle.Lifecycle.initialize(Lifecycle.java:78)
	... 3 more
Caused by: java.lang.NoSuchMethodError: org.openstreetmap.josm.data.imagery.ImageryInfo.equalsPref(Lorg/openstreetmap/josm/data/imagery/ImageryInfo;)Z
	at org.openstreetmap.josm.data.imagery.ImageryLayerInfo.updateEntriesFromDefaults(ImageryLayerInfo.java:292)
	at org.openstreetmap.josm.data.imagery.ImageryLayerInfo$DefaultEntryLoader.finish(ImageryLayerInfo.java:194)
	at org.openstreetmap.josm.data.imagery.ImageryLayerInfo.loadDefaults(ImageryLayerInfo.java:120)
	at org.openstreetmap.josm.data.imagery.ImageryLayerInfo.load(ImageryLayerInfo.java:101)
	at org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.initialize(ImageryPreference.java:328)
	at org.openstreetmap.josm.spi.lifecycle.InitializationTask.call(InitializationTask.java:33)
	at org.openstreetmap.josm.spi.lifecycle.InitializationTask.call(InitializationTask.java:11)
	at java.util.concurrent.FutureTask.run(Unknown Source)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
	at java.lang.Thread.run(Unknown Source)

[taylor.smock]

Re-add equalsPref for binary compatibility