Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java	(revision 12619)
+++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java	(revision 12620)
@@ -8,5 +8,4 @@
 import org.junit.BeforeClass;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
@@ -16,4 +15,5 @@
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.Logging;
 
 public class HistoryBrowserTestFT extends JFrame {
@@ -39,5 +39,5 @@
             ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
         } catch (OsmTransferException e) {
-            Main.error(e);
+            Logging.error(e);
             return;
         }
Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 12619)
+++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 12620)
@@ -13,7 +13,7 @@
 
 import org.junit.Ignore;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Logging;
 
 @Ignore
@@ -43,5 +43,5 @@
                             n = Integer.parseInt(tf.getText());
                         } catch (NumberFormatException e) {
-                            Main.error(e);
+                            Logging.error(e);
                             return;
                         }
Index: trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java	(revision 12619)
+++ trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java	(revision 12620)
@@ -45,4 +45,5 @@
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -209,5 +210,5 @@
                     Thread.sleep(300);
                 } catch (InterruptedException ex) {
-                    Main.warn(ex);
+                    Logging.warn(ex);
                 }
                 BenchmarkData data = new BenchmarkData();
Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 12620)
@@ -32,4 +32,5 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -63,7 +64,9 @@
     /**
      * Unit tests on log messages.
+     * @deprecated to remove end of 2017
      */
     @Test
     @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+    @Deprecated
     public void testLogs() {
 
@@ -122,5 +125,5 @@
                 f.get();
             } catch (InterruptedException | ExecutionException e) {
-                Main.error(e);
+                Logging.error(e);
             }
         }
Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java	(revision 12620)
@@ -15,8 +15,8 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -120,8 +120,8 @@
     @Test
     public void testRunExceptionFuture() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(null, newFuture("testRunExceptionFuture")).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(),
-                Main.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(),
+                Logging.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
     }
 
@@ -131,7 +131,7 @@
     @Test
     public void testRunNoError() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Collections.emptyList()), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(), Main.getLastErrorAndWarnings().isEmpty());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().isEmpty());
     }
 
@@ -141,7 +141,7 @@
     @Test
     public void testRunOneError() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Collections.singletonList(new Object())), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(), Main.getLastErrorAndWarnings().isEmpty());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().isEmpty());
     }
 
@@ -151,8 +151,8 @@
     @Test
     public void testRunMultipleErrors() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Arrays.asList("foo", new Exception("bar"), new Object())), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(),
-                Main.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(),
+                Logging.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java	(revision 12620)
@@ -14,6 +14,6 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -64,5 +64,5 @@
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                Main.trace(e);
+                Logging.trace(e);
             } finally {
                 this.counter.incrementAndGet();
Index: trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 12620)
@@ -14,7 +14,7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -121,5 +121,5 @@
                 } catch (InterruptedException e1) {
                     // do nothing, still wait
-                    Main.trace(e1);
+                    Logging.trace(e1);
                 }
             }
@@ -143,5 +143,5 @@
                 } catch (InterruptedException e1) {
                     // do nothing, wait
-                    Main.trace(e1);
+                    Logging.trace(e1);
                 }
             }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java	(revision 12620)
@@ -13,5 +13,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -48,5 +47,5 @@
             fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
         } catch (IllegalArgumentException e) {
-            Main.trace(e);
+            Logging.trace(e);
             // Was expected
         }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java	(revision 12620)
@@ -17,5 +17,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -23,4 +22,5 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -50,5 +50,5 @@
             Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
         } catch (IllegalArgumentException e) {
-            Main.trace(e);
+            Logging.trace(e);
             // Was expected
         }
@@ -76,5 +76,5 @@
             Assert.fail("Should have thrown an IllegalArgumentException as we gave a too long value.");
         } catch (IllegalArgumentException e) {
-            Main.trace(e);
+            Logging.trace(e);
             // Was expected
         }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 12620)
@@ -13,9 +13,9 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -83,5 +83,5 @@
         } catch (IndexOutOfBoundsException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java	(revision 12620)
@@ -30,6 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.validation.routines.DomainValidator.ArrayType;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -342,5 +342,5 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -349,5 +349,5 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -356,5 +356,5 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -363,5 +363,5 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
     }
@@ -431,5 +431,5 @@
         } catch (IllegalStateException ise) {
             // expected
-            Main.debug(ise.getMessage());
+            Logging.debug(ise.getMessage());
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java	(revision 12620)
@@ -48,5 +48,5 @@
 
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -84,5 +84,5 @@
             timestamp = download(txtFile, "http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 0L);
         } catch (ConnectException e) {
-            Main.error(e);
+            Logging.error(e);
             // Try again one more time in case of random network issue
             timestamp = download(txtFile, "http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 0L);
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java	(revision 12620)
@@ -27,5 +27,5 @@
 
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -244,5 +244,5 @@
         } catch (PatternSyntaxException e) {
             // expected
-            Main.debug(e.getMessage());
+            Logging.debug(e.getMessage());
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 12620)
@@ -19,5 +19,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -38,4 +37,5 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -185,5 +185,5 @@
         }
         for (String msg : assertionErrors) {
-            Main.error(msg);
+            Logging.error(msg);
         }
         assertTrue("not all assertions included in the tests are met", assertionErrors.isEmpty());
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java	(revision 12620)
@@ -20,9 +20,9 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.DatasetFactory;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -360,5 +360,5 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
 
@@ -368,5 +368,5 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java	(revision 12620)
@@ -8,8 +8,8 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -94,5 +94,5 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
@@ -141,5 +141,5 @@
         } catch (IllegalStateException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
@@ -154,5 +154,5 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java	(revision 12620)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -67,5 +68,5 @@
             } catch (IOException e) {
                 try {
-                    Main.warn(e);
+                    Logging.warn(e);
                     // try again in case of temporary network error
                     testPresets(allMessages, source);
@@ -95,5 +96,5 @@
         Collection<TaggingPreset> presets = TaggingPresetReader.readAll(source.url, true);
         assertFalse(presets.isEmpty());
-        Collection<String> errorsAndWarnings = Main.getLastErrorAndWarnings();
+        Collection<String> errorsAndWarnings = Logging.getLastErrorAndWarnings();
         boolean error = false;
         for (String message : errorsAndWarnings) {
@@ -108,5 +109,5 @@
         System.out.println(error ? " => KO" : " => OK");
         if (error) {
-            Main.clearLastErrorAndWarnings();
+            Logging.clearLastErrorAndWarnings();
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java	(revision 12620)
@@ -28,4 +28,5 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -63,5 +64,5 @@
                     RemoteControl.getRemoteControlDir()).resolve(RemoteControlHttpsServer.KEYSTORE_FILENAME));
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java	(revision 12620)
@@ -5,5 +5,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -99,5 +98,5 @@
             } catch (IllegalArgumentException e) {
                 // Ignore. check if bounds is null after
-                Main.trace(e);
+                Logging.trace(e);
             }
             Assert.assertEquals(item.url, item.bounds, bounds);
Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java	(revision 12620)
@@ -70,5 +70,5 @@
                 fail("Expected IOException");
             } catch (IOException e) {
-                Main.info(e.getMessage());
+                Logging.info(e.getMessage());
             }
         }
Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java	(revision 12619)
+++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java	(revision 12620)
@@ -60,5 +60,5 @@
                 fail("Expected KeyStoreException");
             } catch (KeyStoreException e) {
-                Main.info(e.getMessage());
+                Logging.info(e.getMessage());
             }
         }
@@ -78,5 +78,5 @@
                 fail("Expected KeyStoreException");
             } catch (KeyStoreException e) {
-                Main.info(e.getMessage());
+                Logging.info(e.getMessage());
             }
         }
@@ -99,5 +99,5 @@
                 fail("Expected KeyStoreException");
             } catch (KeyStoreException e) {
-                Main.info(e.getMessage());
+                Logging.info(e.getMessage());
             }
         }
@@ -125,5 +125,5 @@
                 fail("Expected IOException");
             } catch (IOException e) {
-                Main.info(e.getMessage());
+                Logging.info(e.getMessage());
             }
         }