Changeset 12854 in josm
- Timestamp:
- 2017-09-14T11:21:57+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
r12846 r12854 356 356 tfUserName.setToolTipText(tr("Please enter the user name for authenticating at your proxy server")); 357 357 tfPassword.setToolTipText(tr("Please enter the password for authenticating at your proxy server")); 358 lblHeading.setText("<html>" + tr("Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password.", 358 lblHeading.setText("<html>" + 359 tr("Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password.", 359 360 Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST) + ':' + 360 361 Config.getPref().get(DefaultProxySelector.PROXY_HTTP_PORT)) + "</html>"); -
trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java
r12846 r12854 232 232 } 233 233 if (copyright.getText().isEmpty()) { 234 copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet(() -> Config.getPref().get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"))); 234 copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet( 235 () -> Config.getPref().get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"))); 235 236 copyright.setCaretPosition(0); 236 237 } … … 280 281 emailLabel.setEnabled(b); 281 282 if (b) { 282 authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Config.getPref().get("lastAuthorName"))); 283 email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Config.getPref().get("lastAuthorEmail"))); 283 authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet( 284 () -> Config.getPref().get("lastAuthorName"))); 285 email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet( 286 () -> Config.getPref().get("lastAuthorEmail"))); 284 287 } else { 285 288 authorName.setText(""); -
trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java
r12846 r12854 95 95 */ 96 96 public static ExtensionFileFilter getFileFilter() { 97 return ExtensionFileFilter.newFilterWithArchiveExtensions("gpx", Config.getPref().get("save.extension.gpx", "gpx"), tr("GPX Files"), true); 97 return ExtensionFileFilter.newFilterWithArchiveExtensions("gpx", 98 Config.getPref().get("save.extension.gpx", "gpx"), tr("GPX Files"), true); 98 99 } 99 100 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
r12846 r12854 8 8 import java.util.Objects; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 12 11 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
r12846 r12854 175 175 */ 176 176 public final void initFromPreferences() { 177 rbVersionBasedUpatePolicy.get(Optional.ofNullable(Policy.fromPreferenceValue(Config.getPref().get("pluginmanager.version-based-update.policy", "ask"))).orElse(Policy.ASK)).setSelected(true); 178 rbTimeBasedUpatePolicy.get(Optional.ofNullable(Policy.fromPreferenceValue(Config.getPref().get("pluginmanager.time-based-update.policy", "ask"))).orElse(Policy.ASK)).setSelected(true); 177 rbVersionBasedUpatePolicy.get( 178 Optional.ofNullable(Policy.fromPreferenceValue( 179 Config.getPref().get("pluginmanager.version-based-update.policy", "ask"))).orElse(Policy.ASK)) 180 .setSelected(true); 181 rbTimeBasedUpatePolicy.get( 182 Optional.ofNullable(Policy.fromPreferenceValue( 183 Config.getPref().get("pluginmanager.time-based-update.policy", "ask"))).orElse(Policy.ASK)) 184 .setSelected(true); 179 185 180 186 String pref = Config.getPref().get("pluginmanager.warntime", null); -
trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
r12846 r12854 168 168 remote.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL)); 169 169 170 loadInNewLayer.setSelected(Config.getPref().getBoolean(RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault)); 171 alwaysAskUserConfirm.setSelected(Config.getPref().getBoolean(RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault)); 170 loadInNewLayer.setSelected(Config.getPref().getBoolean( 171 RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault)); 172 alwaysAskUserConfirm.setSelected(Config.getPref().getBoolean( 173 RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault)); 172 174 173 175 ActionListener remoteControlEnabled = e -> { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
r12846 r12854 148 148 */ 149 149 PermissionPrefWithDefault permissionPref = getPermissionPref(); 150 if (permissionPref != null && permissionPref.pref != null && !Config.getPref().getBoolean(permissionPref.pref, permissionPref.defaultVal)) { 150 if (permissionPref != null && permissionPref.pref != null && 151 !Config.getPref().getBoolean(permissionPref.pref, permissionPref.defaultVal)) { 151 152 String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand); 152 153 Logging.info(err); -
trunk/src/org/openstreetmap/josm/spi/preferences/Config.java
r12847 r12854 8 8 * @since 12847 9 9 */ 10 public class Config {10 public final class Config { 11 11 12 12 private static IPreferences preferences; 13 14 private Config() { 15 // hide constructor 16 } 13 17 14 18 /** -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r12846 r12854 1686 1686 public static String getJavaLatestVersion() { 1687 1687 try { 1688 return HttpClient.create(new URL(Config.getPref().get("java.baseline.version.url", "http://javadl-esd-secure.oracle.com/update/baseline.version"))) 1688 return HttpClient.create( 1689 new URL(Config.getPref().get( 1690 "java.baseline.version.url", 1691 "http://javadl-esd-secure.oracle.com/update/baseline.version"))) 1689 1692 .connect().fetchContent().split("\n")[0]; 1690 1693 } catch (IOException e) {
Note:
See TracChangeset
for help on using the changeset viewer.