Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 4973) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 4974) @@ -319,18 +319,4 @@ } } -/* - for (Iterator it = settings.iterator(); it.hasNext();) { - try { - PreferenceSetting ps = it.next(); - long start = System.currentTimeMillis(); - ps.addGui(this); - System.out.println(ps.getClass()+" -> "+(System.currentTimeMillis()-start)); - } catch (SecurityException e) { - it.remove(); - } catch (Throwable e) { - // allow to change most settings even if e.g. a plugin fails - BugReportExceptionHandler.handleException(e); - } - }*/ addGUITabs(false); } @@ -365,5 +351,6 @@ if (expert || !tps.isExpert()) { // Get icon - ImageIcon icon = ImageProvider.get("preferences", tps.getIconName()); + String iconName = tps.getIconName(); + ImageIcon icon = iconName != null && iconName.length() > 0 ? ImageProvider.get("preferences", iconName) : null; if (settingsInitialized.contains(tps)) { // If it has been initialized, add corresponding tab(s) @@ -376,10 +363,4 @@ } } - /*for (PreferenceTab tab : tabs) { - TabPreferenceSetting s = tab.getTabPreferenceSetting(); - if (expert || !s.isExpert()) { - addTab(null, ImageProvider.get("preferences", s.getIconName()), tab.getComponent(), ""+s.getTooltip()+""); - } - }*/ try { if (sel != null) {