Changeset 13021 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-10-18T17:25:29+02:00 (3 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12928 r13021 11 11 import java.awt.GraphicsEnvironment; 12 12 import java.awt.GridBagLayout; 13 import java.awt.Toolkit; 13 14 import java.awt.event.KeyEvent; 14 15 import java.io.File; 15 16 import java.io.IOException; 16 17 import java.io.InputStream; 18 import java.lang.reflect.Field; 17 19 import java.net.Authenticator; 18 20 import java.net.Inet6Address; … … 38 40 import java.util.Objects; 39 41 import java.util.Optional; 42 import java.util.ResourceBundle; 40 43 import java.util.Set; 41 44 import java.util.TreeSet; … … 90 93 import org.openstreetmap.josm.data.osm.UserInfo; 91 94 import org.openstreetmap.josm.data.osm.search.SearchMode; 95 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories; 92 96 import org.openstreetmap.josm.data.preferences.sources.SourceType; 93 97 import org.openstreetmap.josm.data.projection.ProjectionCLI; … … 148 152 import org.openstreetmap.josm.plugins.PluginInformation; 149 153 import org.openstreetmap.josm.spi.preferences.Config; 154 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent; 155 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener; 150 156 import org.openstreetmap.josm.tools.FontsManager; 151 157 import org.openstreetmap.josm.tools.GBC; … … 926 932 Main.pref.init(args.hasOption(Option.RESET_PREFERENCES)); 927 933 Config.setPreferencesInstance(Main.pref); 928 Config.setBaseDirectoriesProvider( Main.pref);934 Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance()); 929 935 930 936 args.getPreferencesToSet().forEach(Main.pref::put); … … 933 939 I18n.set(Config.getPref().get("language", null)); 934 940 } 935 Main.pref.updateSystemProperties(); 941 updateSystemProperties(); 942 Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() { 943 @Override 944 public void preferenceChanged(PreferenceChangeEvent e) { 945 updateSystemProperties(); 946 } 947 }); 936 948 937 949 checkIPv6(); … … 1069 1081 Logging.info("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console"); 1070 1082 RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager()); 1083 } 1084 } 1085 1086 /** 1087 * Updates system properties with the current values in the preferences. 1088 */ 1089 private static void updateSystemProperties() { 1090 if ("true".equals(Config.getPref().get("prefer.ipv6", "auto")) 1091 && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) { 1092 // never set this to false, only true! 1093 Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup).")); 1094 } 1095 Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString()); 1096 Utils.updateSystemProperty("user.language", Config.getPref().get("language")); 1097 // Workaround to fix a Java bug. This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739 1098 // Force AWT toolkit to update its internal preferences (fix #6345). 1099 // Does not work anymore with Java 9, to remove with Java 9 migration 1100 if (Utils.getJavaVersion() < 9 && !GraphicsEnvironment.isHeadless()) { 1101 try { 1102 Field field = Toolkit.class.getDeclaredField("resources"); 1103 Utils.setObjectsAccessible(field); 1104 field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt")); 1105 } catch (ReflectiveOperationException | RuntimeException e) { // NOPMD 1106 // Catch RuntimeException in order to catch InaccessibleObjectException, new in Java 9 1107 Logging.warn(e); 1108 } 1109 } 1110 // Possibility to disable SNI (not by default) in case of misconfigured https servers 1111 // See #9875 + http://stackoverflow.com/a/14884941/2257172 1112 // then https://josm.openstreetmap.de/ticket/12152#comment:5 for details 1113 if (Config.getPref().getBoolean("jdk.tls.disableSNIExtension", false)) { 1114 Utils.updateSystemProperty("jsse.enableSNIExtension", "false"); 1071 1115 } 1072 1116 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
r12966 r13021 24 24 import org.openstreetmap.josm.Main; 25 25 import org.openstreetmap.josm.data.Bounds; 26 import org.openstreetmap.josm.data.Preferences;27 26 import org.openstreetmap.josm.data.ProjectionBounds; 28 27 import org.openstreetmap.josm.data.coor.EastNorth; … … 30 29 import org.openstreetmap.josm.data.coor.conversion.LatLonParser; 31 30 import org.openstreetmap.josm.data.osm.DataSet; 31 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories; 32 32 import org.openstreetmap.josm.data.projection.Projection; 33 33 import org.openstreetmap.josm.data.projection.Projections; … … 419 419 Logging.setLogLevel(getLogLevel()); 420 420 421 Config.setBaseDirectoriesProvider( new Preferences()); // for right-left-hand traffic cache file421 Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance()); // for right-left-hand traffic cache file 422 422 Config.setPreferencesInstance(new MemoryPreferences()); 423 423 Config.getPref().putBoolean("mappaint.auto_reload_local_styles", false); // unnecessary to listen for external changes
Note: See TracChangeset
for help on using the changeset viewer.