Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

• trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (modified) (8 diffs)

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

@@ -46 +46 @@
 import org.openstreetmap.josm.io.OsmExporter;
 import org.openstreetmap.josm.io.OsmImporter;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -134 +135 @@
 
             if (!autosaveDir.exists() && !autosaveDir.mkdirs()) {
-                Main.warn(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
+                Logging.warn(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
                 return;
             }
             if (!deletedLayersDir.exists() && !deletedLayersDir.mkdirs()) {
-                Main.warn(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
+                Logging.warn(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
                 return;
             }
@@ -200 +201 @@
                     return result;
                 } else {
-                    Main.warn(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
+                    Logging.warn(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
                 }
             } catch (IOException e) {
-                Main.error(e, tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()));
+                Logging.log(Logging.LEVEL_ERROR, tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()), e);
                 return null;
             }
@@ -215 +216 @@
             ps.println(ManagementFactory.getRuntimeMXBean().getName());
         } catch (IOException | SecurityException t) {
-            Main.error(t);
+            Logging.error(t);
         }
     }
@@ -252 +253 @@
             } catch (RuntimeException t) { // NOPMD
                 // Don't let exception stop time thread
-                Main.error("Autosave failed:");
-                Main.error(t);
+                Logging.error("Autosave failed:");
+                Logging.error(t);
             }
         }
@@ -343 +344 @@
                         }
                     } catch (IOException | SecurityException t) {
-                        Main.error(t);
+                        Logging.error(t);
                     }
                 }
@@ -379 +380 @@
                 }
             } catch (InterruptedException | ExecutionException e) {
-                Main.error(e);
+                Logging.error(e);
             }
         });
@@ -404 +405 @@
             Utils.deleteFile(pidFile);
         } else {
-            Main.warn(String.format("Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
+            Logging.warn(String.format("Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
             // we cannot move to deleted folder, so just try to delete it directly
             if (Utils.deleteFile(f, marktr("Unable to delete backup file {0}"))) {