Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2013-09-23T16:47:50+02:00 (11 years ago)

Author:

Don-vip

Message:

Rework console output:

• new log level "error"
• Replace nearly all calls to system.out and system.err to Main.(error|warn|info|debug)
• Remove some unnecessary debug output
• Some messages are modified (removal of "Info", "Warning", "Error" from the message itself -> notable i18n impact but limited to console error messages not seen by the majority of users, so that's ok)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (11 diffs)

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

@@ -373 +373 @@
         }
         if (!cacheDirFile.exists() && !cacheDirFile.mkdirs()) {
-            System.err.println(tr("Warning: Failed to create missing cache directory: {0}", cacheDirFile.getAbsoluteFile()));
+            Main.warn(tr("Failed to create missing cache directory: {0}", cacheDirFile.getAbsoluteFile()));
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -499 +499 @@
             defaults.put(key, def);
         } else if(def != null && !defaults.get(key).equals(def)) {
-            System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key));
+            Main.info("Defaults for " + key + " differ: " + def + " != " + defaults.get(key));
         }
     }
@@ -556 +556 @@
                 try {
                     save();
-                } catch(IOException e){
-                    System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+                } catch (IOException e) {
+                    Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
                 }
                 changed = true;
@@ -652 +652 @@
         if (prefDir.exists()) {
             if(!prefDir.isDirectory()) {
-                System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' is not a directory.", prefDir.getAbsoluteFile()));
+                Main.warn(tr("Failed to initialize preferences. Preference directory ''{0}'' is not a directory.", prefDir.getAbsoluteFile()));
                 JOptionPane.showMessageDialog(
                         Main.parent,
@@ -663 +663 @@
         } else {
             if (! prefDir.mkdirs()) {
-                System.err.println(tr("Warning: Failed to initialize preferences. Failed to create missing preference directory: {0}", prefDir.getAbsoluteFile()));
+                Main.warn(tr("Failed to initialize preferences. Failed to create missing preference directory: {0}", prefDir.getAbsoluteFile()));
                 JOptionPane.showMessageDialog(
                         Main.parent,
@@ -677 +677 @@
         try {
             if (!preferenceFile.exists()) {
-                System.out.println(tr("Info: Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
+                Main.info(tr("Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
                 resetToDefault();
                 save();
             } else if (reset) {
-                System.out.println(tr("Warning: Replacing existing preference file ''{0}'' with default preference file.", preferenceFile.getAbsoluteFile()));
+                Main.warn(tr("Replacing existing preference file ''{0}'' with default preference file.", preferenceFile.getAbsoluteFile()));
                 resetToDefault();
                 save();
@@ -712 +712 @@
             } catch(IOException e1) {
                 e1.printStackTrace();
-                System.err.println(tr("Warning: Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
+                Main.warn(tr("Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
             }
         }
@@ -906 +906 @@
             try {
                 save();
-            } catch(IOException e){
-                System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+            } catch (IOException e){
+                Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
             }
         }
@@ -1006 +1006 @@
             try {
                 save();
-            } catch(IOException e){
-                System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+            } catch (IOException e){
+                Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
             }
         }
@@ -1075 +1075 @@
             try {
                 save();
-            } catch(IOException e){
-                System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+            } catch (IOException e) {
+                Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
             }
         }
@@ -1657 +1657 @@
         for (String key : obsolete) {
             boolean removed = false;
-            if(properties.containsKey(key)) { properties.remove(key); removed = true; }
-            if(collectionProperties.containsKey(key)) { collectionProperties.remove(key); removed = true; }
-            if(arrayProperties.containsKey(key)) { arrayProperties.remove(key); removed = true; }
-            if(listOfStructsProperties.containsKey(key)) { listOfStructsProperties.remove(key); removed = true; }
-            if(removed)
-                System.out.println(tr("Preference setting {0} has been removed since it is no longer used.", key));
+            if (properties.containsKey(key)) { properties.remove(key); removed = true; }
+            if (collectionProperties.containsKey(key)) { collectionProperties.remove(key); removed = true; }
+            if (arrayProperties.containsKey(key)) { arrayProperties.remove(key); removed = true; }
+            if (listOfStructsProperties.containsKey(key)) { listOfStructsProperties.remove(key); removed = true; }
+            if (removed) {
+                Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
+            }
         }
     }