X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FBlogReader.java;h=af59ca7f6d894319aa7828df42e8005bcfb06b8a;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=9d68af170191e08bd3236ea66ad410b3be22f7ad;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git

diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index 9d68af1..af59ca7 100644
--- 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.log.debug("News window closed.");
+          Console.debug("News window closed.");
           jd = null;
           parent.showNews(false);
         }
@@ -219,7 +220,7 @@ public class BlogReader extends JPanel
 
       }
     };
-  };
+  }
 
   private JLabel lblChannels = new JLabel();
 
@@ -247,17 +248,15 @@ public class BlogReader extends JPanel
 
   public BlogReader(Desktop desktop)
   {
-    Cache.log.debug("Constructing news reader.");
+    Console.debug("Constructing news reader.");
 
     parent = desktop;
     _channelModel = new ChannelListModel();
     // Construct our jalview news channel
     Channel chan = new Channel();
-    chan.setURL(
-            jalview.bin.Cache.getDefault("JALVIEW_NEWS_RSS",
-                    jalview.bin.Cache.getDefault("www.jalview.org",
-                            "http://www.jalview.org")
-                            + "/feeds/desktop/rss"));
+    chan.setURL(Cache.getDefault("JALVIEW_NEWS_RSS",
+            Cache.getDefault("www.jalview.org", "https://www.jalview.org")
+                    + "/feeds/desktop/rss"));
     loadLastM();
     _channelModel.addChannel(chan);
     updating = true;
@@ -272,15 +271,18 @@ public class BlogReader extends JPanel
 
     initItems(chan);
     updating = false;
-    boolean setvisible = checkForNew(chan, true);
-
-    if (setvisible)
+    if (!Cache.getDefault("NONEWS", false))
     {
+      boolean setvisible = checkForNew(chan, true);
+
+      if (setvisible)
+      {
 
-      Cache.log.debug("Will show jalview news automatically");
-      showNews();
+        Console.debug("Will show jalview news automatically");
+        showNews();
+      }
     }
-    Cache.log.debug("Completed construction of reader.");
+    Console.debug("Completed construction of reader.");
 
   }
 
@@ -340,7 +342,7 @@ public class BlogReader extends JPanel
                   MessageManager.getString("label.news_from_jalview"),
                   bounds.width, bounds.height);
           jd.frame.setModalExclusionType(ModalExclusionType.NO_EXCLUDE);
-          Cache.log.debug("Displaying news.");
+          Console.debug("Displaying news.");
           jd.waitForInput();
         }
       }
@@ -365,10 +367,9 @@ public class BlogReader extends JPanel
     } catch (Exception x)
     {
     }
-    ;
     if (chan != null && chan.getItems() != null)
     {
-      Cache.log.debug("Scanning news items: newsnew=" + newsnew
+      Console.debug("Scanning news items: newsnew=" + newsnew
               + " and lastDate is " + lastDate);
       for (Item i : (List<Item>) chan.getItems())
       {
@@ -427,7 +428,7 @@ public class BlogReader extends JPanel
       {
         String formatted = Cache
                 .setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", lastDate);
-        Cache.log.debug("Saved last read date as " + formatted);
+        Console.debug("Saved last read date as " + formatted);
       }
     }
   }
@@ -538,7 +539,7 @@ public class BlogReader extends JPanel
     public LaunchJvBrowserOnItem(JList listItems)
     {
       super("Open in Browser");
-      this.putValue(MNEMONIC_KEY, new Integer(KeyEvent.VK_O));
+      this.putValue(MNEMONIC_KEY, Integer.valueOf(KeyEvent.VK_O));
       this.putValue(Action.LONG_DESCRIPTION, "Open in Browser");
       _listItems = listItems;
     }
@@ -752,12 +753,16 @@ public class BlogReader extends JPanel
     }
   }
 
+  /**
+   * @j2sIgnore
+   * @param args
+   */
   public static void main(String args[])
   {
     // this tests the detection of new news based on the last read date stored
     // in jalview properties
-    jalview.bin.Cache.loadProperties(null);
-    jalview.bin.Cache.initLogger();
+    Cache.loadProperties(null);
+    Console.initLogger();
     // test will advance read date each time
     Calendar today = Calendar.getInstance(),
             lastread = Calendar.getInstance();
@@ -770,16 +775,16 @@ public class BlogReader extends JPanel
       System.out.println("Set last date to " + formattedDate);
       if (me.isNewsNew())
       {
-        Cache.log.debug("There is news to read.");
+        Console.debug("There is news to read.");
       }
       else
       {
-        Cache.log.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.log.debug("Waiting for closure.");
+      Console.debug("Waiting for closure.");
       do
       {
         try
@@ -788,16 +793,15 @@ public class BlogReader extends JPanel
         } catch (InterruptedException x)
         {
         }
-        ;
       } while (me.isVisible());
 
       if (me.isNewsNew())
       {
-        Cache.log.debug("Still new news after reader displayed.");
+        Console.debug("Still new news after reader displayed.");
       }
       if (lastread.getTime().before(me.lastDate))
       {
-        Cache.log.debug("The news was read.");
+        Console.debug("The news was read.");
         lastread.setTime(me.lastDate);
       }
       else