Index: /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 12854) @@ -356,5 +356,6 @@ tfUserName.setToolTipText(tr("Please enter the user name for authenticating at your proxy server")); tfPassword.setToolTipText(tr("Please enter the password for authenticating at your proxy server")); - lblHeading.setText("" + tr("Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password.", + lblHeading.setText("" + + tr("Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password.", Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST) + ':' + Config.getPref().get(DefaultProxySelector.PROXY_HTTP_PORT)) + ""); Index: /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java (revision 12854) @@ -232,5 +232,6 @@ } if (copyright.getText().isEmpty()) { - copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet(() -> Config.getPref().get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"))); + copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet( + () -> Config.getPref().get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5"))); copyright.setCaretPosition(0); } @@ -280,6 +281,8 @@ emailLabel.setEnabled(b); if (b) { - authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Config.getPref().get("lastAuthorName"))); - email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Config.getPref().get("lastAuthorEmail"))); + authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet( + () -> Config.getPref().get("lastAuthorName"))); + email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet( + () -> Config.getPref().get("lastAuthorEmail"))); } else { authorName.setText(""); Index: /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (revision 12854) @@ -95,5 +95,6 @@ */ public static ExtensionFileFilter getFileFilter() { - return ExtensionFileFilter.newFilterWithArchiveExtensions("gpx", Config.getPref().get("save.extension.gpx", "gpx"), tr("GPX Files"), true); + return ExtensionFileFilter.newFilterWithArchiveExtensions("gpx", + Config.getPref().get("save.extension.gpx", "gpx"), tr("GPX Files"), true); } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (revision 12854) @@ -8,5 +8,4 @@ import java.util.Objects; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 12854) @@ -175,6 +175,12 @@ */ public final void initFromPreferences() { - rbVersionBasedUpatePolicy.get(Optional.ofNullable(Policy.fromPreferenceValue(Config.getPref().get("pluginmanager.version-based-update.policy", "ask"))).orElse(Policy.ASK)).setSelected(true); - rbTimeBasedUpatePolicy.get(Optional.ofNullable(Policy.fromPreferenceValue(Config.getPref().get("pluginmanager.time-based-update.policy", "ask"))).orElse(Policy.ASK)).setSelected(true); + rbVersionBasedUpatePolicy.get( + Optional.ofNullable(Policy.fromPreferenceValue( + Config.getPref().get("pluginmanager.version-based-update.policy", "ask"))).orElse(Policy.ASK)) + .setSelected(true); + rbTimeBasedUpatePolicy.get( + Optional.ofNullable(Policy.fromPreferenceValue( + Config.getPref().get("pluginmanager.time-based-update.policy", "ask"))).orElse(Policy.ASK)) + .setSelected(true); String pref = Config.getPref().get("pluginmanager.warntime", null); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 12854) @@ -168,6 +168,8 @@ remote.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL)); - loadInNewLayer.setSelected(Config.getPref().getBoolean(RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault)); - alwaysAskUserConfirm.setSelected(Config.getPref().getBoolean(RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault)); + loadInNewLayer.setSelected(Config.getPref().getBoolean( + RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault)); + alwaysAskUserConfirm.setSelected(Config.getPref().getBoolean( + RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault)); ActionListener remoteControlEnabled = e -> { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 12854) @@ -148,5 +148,6 @@ */ PermissionPrefWithDefault permissionPref = getPermissionPref(); - if (permissionPref != null && permissionPref.pref != null && !Config.getPref().getBoolean(permissionPref.pref, permissionPref.defaultVal)) { + if (permissionPref != null && permissionPref.pref != null && + !Config.getPref().getBoolean(permissionPref.pref, permissionPref.defaultVal)) { String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand); Logging.info(err); Index: /trunk/src/org/openstreetmap/josm/spi/preferences/Config.java =================================================================== --- /trunk/src/org/openstreetmap/josm/spi/preferences/Config.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/spi/preferences/Config.java (revision 12854) @@ -8,7 +8,11 @@ * @since 12847 */ -public class Config { +public final class Config { private static IPreferences preferences; + + private Config() { + // hide constructor + } /** Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 12853) +++ /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 12854) @@ -1686,5 +1686,8 @@ public static String getJavaLatestVersion() { try { - return HttpClient.create(new URL(Config.getPref().get("java.baseline.version.url", "http://javadl-esd-secure.oracle.com/update/baseline.version"))) + return HttpClient.create( + new URL(Config.getPref().get( + "java.baseline.version.url", + "http://javadl-esd-secure.oracle.com/update/baseline.version"))) .connect().fetchContent().split("\n")[0]; } catch (IOException e) {