Index: trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java	(revision 16138)
@@ -29,5 +29,5 @@
                 KeyEvent.VK_C, Shortcut.CTRL_SHIFT),
                 false);
-        putValue("toolbar", "copy/coordinates");
+        setToolbarId("copy/coordinates");
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 16138)
@@ -115,5 +115,5 @@
               false /* register toolbar */
         );
-        putValue("toolbar", "expertmode");
+        setToolbarId("expertmode");
         if (MainApplication.getToolbar() != null) {
             MainApplication.getToolbar().register(this);
Index: trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 16138)
@@ -44,5 +44,5 @@
         );
         setHelpId(ht("/Action/FullscreenView"));
-        putValue("toolbar", "fullscreen");
+        setToolbarId("fullscreen");
         MainApplication.getToolbar().register(this);
         gd = GraphicsEnvironment.isHeadless() ? null : GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 16138)
@@ -36,5 +36,5 @@
                         tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
         setHelpId(ht("/Action/ObjectHistory"));
-        putValue("toolbar", "action/historyinfo");
+        setToolbarId("action/historyinfo");
         MainApplication.getToolbar().register(this);
         setEnabled(true);
Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 16138)
@@ -24,4 +24,5 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -75,5 +76,5 @@
      *            the user CANNOT configure a shortcut for your action.
      * @param registerInToolbar register this action for the toolbar preferences?
-     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
+     * @param toolbarId identifier for the toolbar preferences
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
      */
@@ -99,5 +100,5 @@
         setTooltip(tooltip);
         if (getValue("toolbar") == null) {
-            putValue("toolbar", toolbarId);
+            setToolbarId(toolbarId);
         }
         if (registerInToolbar && MainApplication.getToolbar() != null) {
@@ -292,6 +293,20 @@
     }
 
+    /**
+     * Sets the help topic id.
+     * @param helpId help topic id (result of {@link HelpUtil#ht})
+     * @since 14397
+     */
     protected void setHelpId(String helpId) {
         putValue("help", helpId);
+    }
+
+    /**
+     * Sets the toolbar id.
+     * @param toolbarId toolbar id
+     * @since 16138
+     */
+    protected void setToolbarId(String toolbarId) {
+        putValue("toolbar", toolbarId);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 16138)
@@ -31,5 +31,5 @@
     public PreferenceToggleAction(String name, String tooltip, String prefKey, boolean prefDefault) {
         super(name, null, tooltip, null, false);
-        putValue("toolbar", "toggle-" + prefKey);
+        setToolbarId("toggle-" + prefKey);
         this.pref = new BooleanProperty(prefKey, prefDefault);
         checkbox = new JCheckBoxMenuItem(this);
Index: trunk/src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 16138)
@@ -51,5 +51,5 @@
                 Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false);
         setHelpId(ht("/Action/Restart"));
-        putValue("toolbar", "action/restart");
+        setToolbarId("action/restart");
         if (MainApplication.getToolbar() != null) {
             MainApplication.getToolbar().register(this);
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 16138)
@@ -67,5 +67,5 @@
 
         setHelpId(ht("/Action/ShowStatusReport"));
-        putValue("toolbar", "help/showstatusreport");
+        setToolbarId("help/showstatusreport");
         MainApplication.getToolbar().register(this);
     }
Index: trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java	(revision 16138)
@@ -24,5 +24,5 @@
         super(tr("Search preset..."), "dialogs/search", tr("Show preset search dialog"),
                 Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.DIRECT), false);
-        putValue("toolbar", "presets/search");
+        setToolbarId("presets/search");
         MainApplication.getToolbar().register(this);
     }
Index: trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java	(revision 16138)
@@ -30,5 +30,5 @@
               false /* register toolbar */
         );
-        putValue("toolbar", "wireframe");
+        setToolbarId("wireframe");
         MainApplication.getToolbar().register(this);
         setSelected(MapRendererFactory.getInstance().isWireframeMapRendererActive());
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 16138)
@@ -6,4 +6,5 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.Objects;
 
 import javax.swing.JOptionPane;
@@ -17,5 +18,4 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -37,6 +37,5 @@
         super(tr("Add a new Note"), "addnote", tr("Add note mode"),
             ImageProvider.getCursor("crosshair", "create_note"));
-        CheckParameterUtil.ensureParameterNotNull(data, "data");
-        noteData = data;
+        noteData = Objects.requireNonNull(data, "data");
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 16136)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 16138)
@@ -56,5 +56,5 @@
         AdjustImageryOffsetAction() {
             super(tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false);
-            putValue("toolbar", "imagery-offset");
+            setToolbarId("imagery-offset");
             MainApplication.getToolbar().register(this);
         }