Changeset 12537 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
- Timestamp:
- 2017-07-30T00:22:46+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
r12005 r12537 251 251 // all created tabs 252 252 private final transient List<PreferenceTab> tabs = new ArrayList<>(); 253 private static final Collection<PreferenceSettingFactory> settingsFactories= new LinkedList<>();254 private static final PreferenceSettingFactory advancedPreferenceFactory= new AdvancedPreference.Factory();253 private static final Collection<PreferenceSettingFactory> SETTINGS_FACTORIES = new LinkedList<>(); 254 private static final PreferenceSettingFactory ADVANCED_PREFERENCE_FACTORY = new AdvancedPreference.Factory(); 255 255 private final transient List<PreferenceSetting> settings = new ArrayList<>(); 256 256 … … 439 439 440 440 public void buildGui() { 441 Collection<PreferenceSettingFactory> factories = new ArrayList<>( settingsFactories);441 Collection<PreferenceSettingFactory> factories = new ArrayList<>(SETTINGS_FACTORIES); 442 442 factories.addAll(PluginHandler.getPreferenceSetting()); 443 factories.add( advancedPreferenceFactory);443 factories.add(ADVANCED_PREFERENCE_FACTORY); 444 444 445 445 for (PreferenceSettingFactory factory : factories) { … … 531 531 static { 532 532 // order is important! 533 settingsFactories.add(new DisplayPreference.Factory());534 settingsFactories.add(new DrawingPreference.Factory());535 settingsFactories.add(new ColorPreference.Factory());536 settingsFactories.add(new LafPreference.Factory());537 settingsFactories.add(new LanguagePreference.Factory());538 settingsFactories.add(new ServerAccessPreference.Factory());539 settingsFactories.add(new AuthenticationPreference.Factory());540 settingsFactories.add(new ProxyPreference.Factory());541 settingsFactories.add(new OverpassServerPreference.Factory());542 settingsFactories.add(new MapPreference.Factory());543 settingsFactories.add(new ProjectionPreference.Factory());544 settingsFactories.add(new MapPaintPreference.Factory());545 settingsFactories.add(new TaggingPresetPreference.Factory());546 settingsFactories.add(new BackupPreference.Factory());547 settingsFactories.add(new PluginPreference.Factory());548 settingsFactories.add(Main.toolbar);549 settingsFactories.add(new AudioPreference.Factory());550 settingsFactories.add(new ShortcutPreference.Factory());551 settingsFactories.add(new ValidatorPreference.Factory());552 settingsFactories.add(new ValidatorTestsPreference.Factory());553 settingsFactories.add(new ValidatorTagCheckerRulesPreference.Factory());554 settingsFactories.add(new RemoteControlPreference.Factory());555 settingsFactories.add(new ImageryPreference.Factory());533 SETTINGS_FACTORIES.add(new DisplayPreference.Factory()); 534 SETTINGS_FACTORIES.add(new DrawingPreference.Factory()); 535 SETTINGS_FACTORIES.add(new ColorPreference.Factory()); 536 SETTINGS_FACTORIES.add(new LafPreference.Factory()); 537 SETTINGS_FACTORIES.add(new LanguagePreference.Factory()); 538 SETTINGS_FACTORIES.add(new ServerAccessPreference.Factory()); 539 SETTINGS_FACTORIES.add(new AuthenticationPreference.Factory()); 540 SETTINGS_FACTORIES.add(new ProxyPreference.Factory()); 541 SETTINGS_FACTORIES.add(new OverpassServerPreference.Factory()); 542 SETTINGS_FACTORIES.add(new MapPreference.Factory()); 543 SETTINGS_FACTORIES.add(new ProjectionPreference.Factory()); 544 SETTINGS_FACTORIES.add(new MapPaintPreference.Factory()); 545 SETTINGS_FACTORIES.add(new TaggingPresetPreference.Factory()); 546 SETTINGS_FACTORIES.add(new BackupPreference.Factory()); 547 SETTINGS_FACTORIES.add(new PluginPreference.Factory()); 548 SETTINGS_FACTORIES.add(Main.toolbar); 549 SETTINGS_FACTORIES.add(new AudioPreference.Factory()); 550 SETTINGS_FACTORIES.add(new ShortcutPreference.Factory()); 551 SETTINGS_FACTORIES.add(new ValidatorPreference.Factory()); 552 SETTINGS_FACTORIES.add(new ValidatorTestsPreference.Factory()); 553 SETTINGS_FACTORIES.add(new ValidatorTagCheckerRulesPreference.Factory()); 554 SETTINGS_FACTORIES.add(new RemoteControlPreference.Factory()); 555 SETTINGS_FACTORIES.add(new ImageryPreference.Factory()); 556 556 } 557 557
Note:
See TracChangeset
for help on using the changeset viewer.