- Timestamp:
- 2017-09-13T23:21:09+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12841 r12845 145 145 import org.openstreetmap.josm.plugins.PluginHandler; 146 146 import org.openstreetmap.josm.plugins.PluginInformation; 147 import org.openstreetmap.josm.spi.preferences.Config; 147 148 import org.openstreetmap.josm.tools.FontsManager; 148 149 import org.openstreetmap.josm.tools.GBC; … … 914 915 915 916 Main.pref.init(args.hasOption(Option.RESET_PREFERENCES)); 917 Config.setPreferencesInstance(Main.pref); 916 918 917 919 args.getPreferencesToSet().forEach(Main.pref::put); 918 920 919 921 if (!language.isPresent()) { 920 I18n.set( Main.pref.get("language", null));922 I18n.set(Config.getPref().get("language", null)); 921 923 } 922 924 Main.pref.updateSystemProperties(); … … 938 940 WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry", 939 941 args.getSingle(Option.GEOMETRY).orElse(null), 940 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));942 !args.hasOption(Option.NO_MAXIMIZE) && Config.getPref().getBoolean("gui.maximized", false)); 941 943 final MainFrame mainFrame = new MainFrame(geometry); 942 944 final Container contentPane = mainFrame.getContentPane(); … … 975 977 final SplashScreen.SplashProgressMonitor monitor = splash.getProgressMonitor(); 976 978 monitor.beginTask(tr("Initializing")); 977 GuiHelper.runInEDT(() -> splash.setVisible( Main.pref.getBoolean("draw.splashscreen", true)));979 GuiHelper.runInEDT(() -> splash.setVisible(Config.getPref().getBoolean("draw.splashscreen", true))); 978 980 Main.setInitStatusListener(new InitStatusListener() { 979 981 … … 1022 1024 }); 1023 1025 1024 boolean maximized = Main.pref.getBoolean("gui.maximized", false);1026 boolean maximized = Config.getPref().getBoolean("gui.maximized", false); 1025 1027 if ((!args.hasOption(Option.NO_MAXIMIZE) && maximized) || args.hasOption(Option.MAXIMIZE)) { 1026 1028 mainFrame.setMaximized(true); … … 1051 1053 } 1052 1054 1053 if ( Main.pref.getBoolean("debug.edt-checker.enable", Version.getInstance().isLocalBuild())) {1055 if (Config.getPref().getBoolean("debug.edt-checker.enable", Version.getInstance().isLocalBuild())) { 1054 1056 // Repaint manager is registered so late for a reason - there is lots of violation during startup process 1055 1057 // but they don't seem to break anything and are difficult to fix … … 1220 1222 */ 1221 1223 private static void checkIPv6() { 1222 if ("auto".equals( Main.pref.get("prefer.ipv6", "auto"))) {1224 if ("auto".equals(Config.getPref().get("prefer.ipv6", "auto"))) { 1223 1225 new Thread((Runnable) () -> { /* this may take some time (DNS, Connect) */ 1224 1226 boolean hasv6 = false; 1225 boolean wasv6 = Main.pref.getBoolean("validated.ipv6", false);1227 boolean wasv6 = Config.getPref().getBoolean("validated.ipv6", false); 1226 1228 try { 1227 1229 /* Use the check result from last run of the software, as after the test, value … … 1252 1254 if (wasv6 && !hasv6) { 1253 1255 Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart.")); 1254 Main.pref.putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!1256 Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart! 1255 1257 try { 1256 1258 RestartAction.restartJOSM(); … … 1259 1261 } 1260 1262 } 1261 Main.pref.putBoolean("validated.ipv6", hasv6);1263 Config.getPref().putBoolean("validated.ipv6", hasv6); 1262 1264 }, "IPv6-checker").start(); 1263 1265 }
Note:
See TracChangeset
for help on using the changeset viewer.