Changeset 12601 in josm for trunk

Timestamp:

2017-08-14T13:38:42+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15149 - less verbose logs when starting JOSM in debug

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

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

@@ -671 +671 @@
 
     private static void setCorrectPermissions(File file) {
-        if (!file.setReadable(false, false) && Main.isDebugEnabled()) {
-            Main.debug(tr("Unable to set file non-readable {0}", file.getAbsolutePath()));
-        }
-        if (!file.setWritable(false, false) && Main.isDebugEnabled()) {
-            Main.debug(tr("Unable to set file non-writable {0}", file.getAbsolutePath()));
-        }
-        if (!file.setExecutable(false, false) && Main.isDebugEnabled()) {
-            Main.debug(tr("Unable to set file non-executable {0}", file.getAbsolutePath()));
-        }
-        if (!file.setReadable(true, true) && Main.isDebugEnabled()) {
-            Main.debug(tr("Unable to set file readable {0}", file.getAbsolutePath()));
-        }
-        if (!file.setWritable(true, true) && Main.isDebugEnabled()) {
-            Main.debug(tr("Unable to set file writable {0}", file.getAbsolutePath()));
+        if (!file.setReadable(false, false) && Main.isTraceEnabled()) {
+            Main.trace(tr("Unable to set file non-readable {0}", file.getAbsolutePath()));
+        }
+        if (!file.setWritable(false, false) && Main.isTraceEnabled()) {
+            Main.trace(tr("Unable to set file non-writable {0}", file.getAbsolutePath()));
+        }
+        if (!file.setExecutable(false, false) && Main.isTraceEnabled()) {
+            Main.trace(tr("Unable to set file non-executable {0}", file.getAbsolutePath()));
+        }
+        if (!file.setReadable(true, true) && Main.isTraceEnabled()) {
+            Main.trace(tr("Unable to set file readable {0}", file.getAbsolutePath()));
+        }
+        if (!file.setWritable(true, true) && Main.isTraceEnabled()) {
+            Main.trace(tr("Unable to set file writable {0}", file.getAbsolutePath()));
         }
     }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1278 +1278 @@
         if (value != null) {
             String old = System.setProperty(key, value);
-            if (Main.isDebugEnabled()) {
+            if (Main.isDebugEnabled() && !value.equals(old)) {
                 if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
                     Main.debug("System property '" + key + "' set to '" + value + "'. Old value was '" + old + '\'');