X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FBlogReader.java;h=916f48696dcf236165478817dafd14cff1d32dde;hb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;hp=757bb01bbe4986b50da988a16dc5c6d814a330a8;hpb=17e4ea278bc9a5fb280db1252ce78b7a295215f5;p=jalview.git diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java index 757bb01..916f486 100644 --- a/src/jalview/gui/BlogReader.java +++ b/src/jalview/gui/BlogReader.java @@ -199,7 +199,7 @@ public class BlogReader extends JPanel { if (parent != null) { - Cache.log.debug("News window closed."); + Cache.debug("News window closed."); jd = null; parent.showNews(false); } @@ -247,16 +247,16 @@ public class BlogReader extends JPanel public BlogReader(Desktop desktop) { - Cache.log.debug("Constructing news reader."); + Cache.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") + Cache.getDefault("JALVIEW_NEWS_RSS", + Cache.getDefault("www.jalview.org", + "https://www.jalview.org") + "/feeds/desktop/rss")); loadLastM(); _channelModel.addChannel(chan); @@ -277,10 +277,10 @@ public class BlogReader extends JPanel if (setvisible) { - Cache.log.debug("Will show jalview news automatically"); + Cache.debug("Will show jalview news automatically"); showNews(); } - Cache.log.debug("Completed construction of reader."); + Cache.debug("Completed construction of reader."); } @@ -340,7 +340,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."); + Cache.debug("Displaying news."); jd.waitForInput(); } } @@ -367,7 +367,7 @@ public class BlogReader extends JPanel } if (chan != null && chan.getItems() != null) { - Cache.log.debug("Scanning news items: newsnew=" + newsnew + Cache.debug("Scanning news items: newsnew=" + newsnew + " and lastDate is " + lastDate); for (Item i : (List) chan.getItems()) { @@ -426,7 +426,7 @@ public class BlogReader extends JPanel { String formatted = Cache .setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", lastDate); - Cache.log.debug("Saved last read date as " + formatted); + Cache.debug("Saved last read date as " + formatted); } } } @@ -759,8 +759,8 @@ public class BlogReader extends JPanel { // 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); + Cache.initLogger(); // test will advance read date each time Calendar today = Calendar.getInstance(), lastread = Calendar.getInstance(); @@ -773,16 +773,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."); + Cache.debug("There is news to read."); } else { - Cache.log.debug("There is no new news."); + Cache.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."); + Cache.debug("Waiting for closure."); do { try @@ -795,11 +795,11 @@ public class BlogReader extends JPanel if (me.isNewsNew()) { - Cache.log.debug("Still new news after reader displayed."); + Cache.debug("Still new news after reader displayed."); } if (lastread.getTime().before(me.lastDate)) { - Cache.log.debug("The news was read."); + Cache.debug("The news was read."); lastread.setTime(me.lastDate); } else