Ticket #20123: 20123.patch

File 20123.patch, 1.3 KB (added by GerdP, 5 years ago)

log error and ignore preference is a TabPreferenceSetting which doesn't provide an icon

  • src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

     
    489489        for (PreferenceSettingFactory factory : factories) {
    490490            if (factory != null) {
    491491                PreferenceSetting setting = factory.createPreferenceSetting();
     492                if (setting instanceof TabPreferenceSetting && ((TabPreferenceSetting) setting).getIconName() == null) {
     493                    Logging.error("Invalid setting (Icon missing): " + setting.getClass().getName());
     494                    setting = null;
     495                }
    492496                if (setting != null) {
    493497                    settings.add(setting);
    494498                }
    … …  
    523527        insertTab(title, icon, component, tps.getTooltip(), position);
    524528    }
    525529
    526     private String htmlTabTitle(String title, int maxWidth) {
     530    private static String htmlTabTitle(String title, int maxWidth) {
    527531        // Width is set to force left alignment, see https://stackoverflow.com/a/33781096/2257172
    528532        return "<html><div style='padding-left:5px; width:" + maxWidth + "px'>" + title + "</div></html>";
    529533    }