[PATCH] surveyor crashes since 14290

[taylor.smock]

surveyor was calling ImageProvider with ImageProvider.getIfAvailable(null, iconName); -- since r14290, there is a check for null in the directory.

It actually looks like there are several issues with the plugin, when it is attempted to be used.

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-12-11 01:40:30 +0100 (Wed, 11 Dec 2019)
Build-Date:2019-12-11 02:30:55
Revision:15582
Relative:URL: ^/trunk

Identification: JOSM/1.5 (15582 en) Mac OS X 10.15.1
OS Build number: Mac OS X 10.15.1 (19B88)
Memory Usage: 852 MB / 1820 MB (626 MB allocated, but free)
Java version: 1.8.0_211-b12, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: Display 69734272 1440x900, Display 188945226 1920x1080, Display 188945225 1920x1080
Maximum Screen Size: 1920x1080
VM arguments: [-Djava.security.policy=file:<java.home>/lib/security/javaws.policy, -DtrustProxy=true, -Djnlpx.home=<java.home>/bin, -Djava.security.manager, -Djnlpx.origFilenameArg=${HOME}/Downloads/josm-latest.jnlp, -Djnlpx.remove=false, -Dsun.awt.warmup=true, -Djava.util.Arrays.useLegacyMergeSort=true, -Djnlpx.heapsize=NULL,2048m, -Dmacosx.jnlpx.dock.name=JOSM (development version), -Dmacosx.jnlpx.dock.icon=${HOME}/Library/Application Support/Oracle/Java/Deployment/cache/6.0/25/4c122699-2acbeb7e.icns, -Djnlpx.jvm="<java.home>/bin/java"]
Dataset consistency test: No problems found

Plugins:
+ Mapillary (1.5.20)
+ apache-commons (35092)
+ apache-http (35092)
+ auto_tools (73)
+ buildings_tools (35248)
+ graphview (35248)
+ imagery_offset_db (35248)
+ intersection (0.0.7)
+ jna (35092)
+ livegps (35248)
+ mapwithai (0.2.4)
+ markseen (14)
+ osm-obj-info (56)
+ rex (53)
+ surveyor (35248)
+ utilsplugin2 (35248)

Map paint styles:
+ ${HOME}/workspace/osm/kaart-styles/Kaart-Styles.mapcss
+ https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1

Last errors/warnings:
- W: No configuration settings found.  Using hardcoded default values for all pools.
- E: Failed to locate image 'styles/standard/vehicle/tunnel.png'
- E: Failed to locate image 'styles/standard/vehicle/tunnel.png'
- E: Failed to locate image 'styles/standard/vehicle/tunnel.png'
- E: Failed to locate image 'styles/standard/vehicle/tunnel.png'
- E: Handled by bug report queue: java.lang.NullPointerException: name


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

Warning issued by: BugReportExceptionHandler#handleException

=== STACK TRACE ===
Thread: AWT-EventQueue-2 (48) of javawsApplicationThreadGroup
java.lang.NullPointerException: name
	at java.util.Objects.requireNonNull(Objects.java:228)
	at org.openstreetmap.josm.tools.ImageProvider.<init>(ImageProvider.java:323)
	at org.openstreetmap.josm.tools.ImageProvider.getIfAvailable(ImageProvider.java:798)
	at org.openstreetmap.josm.plugins.surveyor.ButtonDescription.createComponent(ButtonDescription.java:177)
	at org.openstreetmap.josm.plugins.surveyor.SurveyorComponent.addButton(SurveyorComponent.java:106)
	at org.openstreetmap.josm.plugins.surveyor.SurveyorShowAction.createComponent(SurveyorShowAction.java:153)
	at org.openstreetmap.josm.plugins.surveyor.SurveyorShowAction.createComponent(SurveyorShowAction.java:119)
	at org.openstreetmap.josm.plugins.surveyor.SurveyorShowAction.actionPerformed(SurveyorShowAction.java:56)
	at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022)
	at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348)
	at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402)
	at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259)
	at javax.swing.AbstractButton.doClick(AbstractButton.java:376)
	at com.apple.laf.ScreenMenuItem.actionPerformed(ScreenMenuItem.java:125)
	at java.awt.MenuItem.processActionEvent(MenuItem.java:669)
	at java.awt.MenuItem.processEvent(MenuItem.java:628)
	at java.awt.MenuComponent.dispatchEventImpl(MenuComponent.java:357)
	at java.awt.MenuComponent.dispatchEvent(MenuComponent.java:345)
	at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:763)
	at java.awt.EventQueue.access$500(EventQueue.java:97)
	at java.awt.EventQueue$3.run(EventQueue.java:709)
	at java.awt.EventQueue$3.run(EventQueue.java:703)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:84)
	at java.awt.EventQueue$4.run(EventQueue.java:733)
	at java.awt.EventQueue$4.run(EventQueue.java:731)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:730)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:205)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:82)

[taylor.smock]

Don't call ImageProvider with null

[Don-vip]

Fixed in [o35252:35254].