Changeset 7085 in josm

Timestamp:

2014-05-09T06:41:29+02:00 (10 years ago)

Author:

Don-vip

Message:

allow to disable auto-save of preferences file for unit tests (ant chmod does not seem to work from Jenkins)

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (1 diff)

trunk/build.xml

@@ -267 +267 @@
             <replace file="${test.dir}/config/@{testfamily}-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_USERNAME@" value="${osm.username}"/>
             <replace file="${test.dir}/config/@{testfamily}-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_PASSWORD@" value="${osm.password}"/>
-                <!-- Works only on Windows, does nothing on Unix -->
-                <attrib file="${test.dir}/config/@{testfamily}-josm.home/preferences.xml" readonly="true"/>
-            <!-- Works only on Unix, does nothing on Windows -->
-                <chmod file="${test.dir}/config/@{testfamily}-josm.home/preferences.xml" perm="ugo-w" verbose="true"/>
         </sequential>
     </macrodef>

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

@@ -86 +86 @@
      */
     private File preferencesDirFile = null;
+
     /**
      * Internal storage for the cache directory.
      */
     private File cacheDirFile = null;
+
+    /**
+     * Determines if preferences file is saved each time a property is changed.
+     */
+    private boolean saveOnPut = true;
 
     /**
@@ -1036 +1042 @@
                 settingsMap.put(key, settingCopy);
             }
-            try {
-                save();
-            } catch (IOException e){
-                Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+            if (saveOnPut) {
+                try {
+                    save();
+                } catch (IOException e){
+                    Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+                }
             }
         }
@@ -1642 +1650 @@
         return a.equals(b);
     }
+
+    /**
+     * 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
+     * @since 7085
+     */
+    public final void enableSaveOnPut(boolean enable) {
+        synchronized (this) {
+            saveOnPut = enable;
+        }
+    }
 }

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

@@ -47 +47 @@
         System.setProperty("josm.home", josmHome);
         Main.initApplicationPreferences();
+        Main.pref.enableSaveOnPut(false);
         I18n.init();
         // initialize the plaform hook, and