Index: /trunk/src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 10364)
+++ /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 10365)
@@ -42,5 +42,5 @@
             setIcon(icon.getImageIconBounded(
                 ImageProvider.ImageSizes.SIDEBUTTON.getImageDimension()));
-        } else { /* TODO: remove when calling code is fixed */
+        } else { /* TODO: remove when calling code is fixed, replace by exception */
             Main.warn("Old style SideButton usage for action " + action);
             fixIcon(action);
@@ -80,5 +80,6 @@
      * Fix icon size
      * @param action the action
-     * @deprecated
+     * @deprecated This method is old style and will be removed together with the removal
+     * of old constructor code
      */
     @Deprecated
Index: /trunk/src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java	(revision 10364)
+++ /trunk/src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java	(revision 10365)
@@ -12,5 +12,5 @@
  * @since 10358
  */
-public class GuiSizesHelper {
+final public class GuiSizesHelper {
 
     private GuiSizesHelper() {