JAL-3949 - refactor logging from jalview.bin.Cache to jalview.bin.Console

[jalview.git] / src / jalview / gui / BlogReader.java

diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index 916f486..3dc51ce 100644 (file)
--- a/src/jalview/gui/BlogReader.java
+++ b/src/jalview/gui/BlogReader.java
@@ -21,6 +21,7 @@
 package jalview.gui;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -199,7 +200,7 @@ public class BlogReader extends JPanel
       {
         if (parent != null)
         {
-          Cache.debug("News window closed.");
+          Console.debug("News window closed.");
           jd = null;
           parent.showNews(false);
         }
@@ -247,7 +248,7 @@ public class BlogReader extends JPanel
 
   public BlogReader(Desktop desktop)
   {
-    Cache.debug("Constructing news reader.");
+    Console.debug("Constructing news reader.");
 
     parent = desktop;
     _channelModel = new ChannelListModel();
@@ -277,10 +278,10 @@ public class BlogReader extends JPanel
     if (setvisible)
     {
 
-      Cache.debug("Will show jalview news automatically");
+      Console.debug("Will show jalview news automatically");
       showNews();
     }
-    Cache.debug("Completed construction of reader.");
+    Console.debug("Completed construction of reader.");
 
   }
 
@@ -340,7 +341,7 @@ public class BlogReader extends JPanel
                   MessageManager.getString("label.news_from_jalview"),
                   bounds.width, bounds.height);
           jd.frame.setModalExclusionType(ModalExclusionType.NO_EXCLUDE);
-          Cache.debug("Displaying news.");
+          Console.debug("Displaying news.");
           jd.waitForInput();
         }
       }
@@ -367,7 +368,7 @@ public class BlogReader extends JPanel
     }
     if (chan != null && chan.getItems() != null)
     {
-      Cache.debug("Scanning news items: newsnew=" + newsnew
+      Console.debug("Scanning news items: newsnew=" + newsnew
               + " and lastDate is " + lastDate);
       for (Item i : (List<Item>) chan.getItems())
       {
@@ -426,7 +427,7 @@ public class BlogReader extends JPanel
       {
         String formatted = Cache
                 .setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", lastDate);
-        Cache.debug("Saved last read date as " + formatted);
+        Console.debug("Saved last read date as " + formatted);
       }
     }
   }
@@ -760,7 +761,7 @@ public class BlogReader extends JPanel
     // this tests the detection of new news based on the last read date stored
     // in jalview properties
     Cache.loadProperties(null);
-    Cache.initLogger();
+    Console.initLogger();
     // test will advance read date each time
     Calendar today = Calendar.getInstance(),
             lastread = Calendar.getInstance();
@@ -773,16 +774,16 @@ public class BlogReader extends JPanel
       System.out.println("Set last date to " + formattedDate);
       if (me.isNewsNew())
       {
-        Cache.debug("There is news to read.");
+        Console.debug("There is news to read.");
       }
       else
       {
-        Cache.debug("There is no new news.");
+        Console.debug("There is no new news.");
         me.xf.setTitle("Testing : Last read is " + me.lastDate);
         me.showNews();
         me.xf.toFront();
       }
-      Cache.debug("Waiting for closure.");
+      Console.debug("Waiting for closure.");
       do
       {
         try
@@ -795,11 +796,11 @@ public class BlogReader extends JPanel
 
       if (me.isNewsNew())
       {
-        Cache.debug("Still new news after reader displayed.");
+        Console.debug("Still new news after reader displayed.");
       }
       if (lastread.getTime().before(me.lastDate))
       {
-        Cache.debug("The news was read.");
+        Console.debug("The news was read.");
         lastread.setTime(me.lastDate);
       }
       else