Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/data/CustomConfigurator.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/CustomConfigurator.java (modified) (9 diffs)

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

@@ -236 +236 @@
             root = document.getDocumentElement();
         } catch (Exception ex) {
-            System.out.println("Error getting preferences to save:" +ex.getMessage());
+            Main.warn("Error getting preferences to save:" +ex.getMessage());
         }
         if (root==null) return;
@@ -265 +265 @@
             ts.transform(new DOMSource(exportDocument), new StreamResult(f.toURI().getPath()));
         } catch (Exception ex) {
-            System.out.println("Error saving preferences part: " +ex.getMessage());
+            Main.warn("Error saving preferences part: " +ex.getMessage());
             ex.printStackTrace();
         }
@@ -345 +345 @@
                         List<PluginInformation> toDeletePlugins = new ArrayList<PluginInformation>();
                         for (PluginInformation pi: availablePlugins) {
-                            //System.out.print(pi.name+";");
                             String name = pi.name.toLowerCase();
                             if (installList.contains(name)) toInstallPlugins.add(pi);
@@ -355 +354 @@
                             Main.worker.submit(pluginDownloadTask);
                         }
-                            Collection<String> pls = new ArrayList<String>(Main.pref.getCollection("plugins"));
-                            for (PluginInformation pi: toInstallPlugins) {
-                                if (!pls.contains(pi.name)) pls.add(pi.name);
+                        Collection<String> pls = new ArrayList<String>(Main.pref.getCollection("plugins"));
+                        for (PluginInformation pi: toInstallPlugins) {
+                            if (!pls.contains(pi.name)) {
+                                pls.add(pi.name);
                             }
-                            for (PluginInformation pi: toRemovePlugins) {
-                                pls.remove(pi.name);
-                            }
-                            for (PluginInformation pi: toDeletePlugins) {
-                                pls.remove(pi.name);
-                                new File(Main.pref.getPluginsDirectory(),pi.name+".jar").deleteOnExit();
-                            }
-                            System.out.println(pls);
-                            Main.pref.putCollection("plugins",pls);
                         }
+                        for (PluginInformation pi: toRemovePlugins) {
+                            pls.remove(pi.name);
+                        }
+                        for (PluginInformation pi: toDeletePlugins) {
+                            pls.remove(pi.name);
+                            new File(Main.pref.getPluginsDirectory(), pi.name+".jar").deleteOnExit();
+                        }
+                        Main.pref.putCollection("plugins",pls);
+                    }
                 });
             }
@@ -949 +949 @@
     }
 
-
-
     private static void defaultUnknownWarning(String key) {
         log("Warning: Unknown default value of %s , skipped\n", key);
@@ -961 +959 @@
 
     private static void showPrefs(Preferences tmpPref) {
-        System.out.println("properties: " + tmpPref.properties);
-        System.out.println("collections: " + tmpPref.collectionProperties);
-        System.out.println("arrays: " + tmpPref.arrayProperties);
-        System.out.println("maps: " + tmpPref.listOfStructsProperties);
+        Main.info("properties: " + tmpPref.properties);
+        Main.info("collections: " + tmpPref.collectionProperties);
+        Main.info("arrays: " + tmpPref.arrayProperties);
+        Main.info("maps: " + tmpPref.listOfStructsProperties);
     }
 
@@ -973 +971 @@
     }
 
-
-     /**
+    /**
      * Convert JavaScript preferences object to preferences data structures
      * @param engine - JS engine to put object
@@ -1059 +1056 @@
             tmpPref.listOfStructsProperties.put(e.getKey(), e.getValue());
         }
-
-    }
-
+    }
 
     /**
@@ -1153 +1148 @@
             "}\n";
 
-        //System.out.println("map1: "+stringMap );
-        //System.out.println("lists1: "+listMap );
-        //System.out.println("listlist1: "+listlistMap );
-        //System.out.println("listmap1: "+listmapMap );
-
         // Execute conversion script
         engine.eval(init);
-
     }
     }