Ticket #19448: Preferences__save_on_put_in_specialized_methods.patch

core/scripts/TagInfoExtract.java

@@ -620 +620 @@
      */
     private void init() throws IOException {
         Logging.setLogLevel(Logging.LEVEL_INFO);
-        Preferences.main().enableSaveOnPut(false);
+        Preferences.main().disableSaveOnPut();
         Config.setPreferencesInstance(Preferences.main());
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Config.setUrlsProvider(JosmUrls.getInstance());

core/src/org/openstreetmap/josm/data/Preferences.java

@@ -914 +914 @@
     /**
      * Enables or not the preferences file auto-save mechanism (save each time a setting is changed).
      * This behaviour is enabled by default.
+     *
      * @param enable if {@code true}, makes JOSM save preferences file each time a setting is changed
+     * @deprecated use {@link Preferences#disableSaveOnPut()} or {@link Preferences#enableSaveOnPut()}
      * @since 7085
      */
+    @Deprecated(since = "16726")
     public final void enableSaveOnPut(boolean enable) {
         synchronized (this) {
             saveOnPut = enable;
         }
     }
+
+    /**
+     * Enables the preferences file auto-save mechanism (save each time a setting is changed).
+     * This behaviour is the default.
+     *
+     * @since 16726
+     */
+    public void enableSaveOnPut() {
+        enableSaveOnPut(true);
+    }
+
+    /**
+     * Disables the preferences file auto-save mechanism (save each time a setting is changed).
+     *
+     * @since 16726
+     */
+    public void disableSaveOnPut() {
+        enableSaveOnPut(false);
+    }
 }

core/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java

@@ -88 +88 @@
         // Test 2 - read(file, pref) + replace
         Preferences pref = new Preferences();
         // avoid messing up preferences file (that makes all following unit tests fail)
-        pref.enableSaveOnPut(false);
+        pref.disableSaveOnPut();
         pref.putList("lorem_ipsum", Arrays.asList("only 1 string"));
         assertEquals(1, pref.getList("lorem_ipsum").size());
         CustomConfigurator.readXML(new File(TestUtils.getTestDataRoot() + "customconfigurator", "replace.xml"), pref);

core/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -525 +525 @@
             final Map<String, Setting<?>> defaultsMap = (Map<String, Setting<?>>) TestUtils.getPrivateField(pref, "defaultsMap");
             defaultsMap.clear();
             pref.resetToInitialState();
-            pref.enableSaveOnPut(false);
+            pref.disableSaveOnPut();
             // No pref init -> that would only create the preferences file.
             // We force the use of a wrong API server, just in case anyone attempts an upload
             Config.getPref().put("osm-server.url", "http://invalid");

core/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -112 +112 @@
         Config.setUrlsProvider(JosmUrls.getInstance());
         HttpClient.setFactory(Http1Client::new);
         pref.resetToInitialState();
-        pref.enableSaveOnPut(false);
+        pref.disableSaveOnPut();
         I18n.init();
         // initialize the plaform hook, and
         // call the really early hook before we anything else

plugins/conflation/test/unit/org/openstreetmap/josm/plugins/conflation/ConflationPluginTest.java

@@ -173 +173 @@
     public static void setUpBeforeClass() {
       if (!isInitialized) {
           //System.setProperty("josm.home", "test/data/preferences");
-          Preferences.main().enableSaveOnPut(false);
+          Preferences.main().disableSaveOnPut();
           I18n.init();
           Preferences.main().init(false);
           I18n.set(Config.getPref().get("language", "en"));

plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/TestUtil.java

@@ -38 +38 @@
   public static synchronized void initPlugin() {
     if (!isInitialized) {
       System.setProperty("josm.home", "test/data/preferences");
-      Preferences.main().enableSaveOnPut(false);
+      Preferences.main().disableSaveOnPut();
       I18n.init();
       PlatformManager.getPlatform().preStartupHook();
       Preferences.main().init(false);