X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FBlogReader.java;h=a3e695a1ed7085e6f6e9539b325a524d0f2ab2a0;hb=1e0a944431b347efefe067fdecb6f28fe4c187a8;hp=2b728aef60e74f46b06696778e67aa4d28c749d5;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index 2b728ae..a3e695a 100644
--- a/src/jalview/gui/BlogReader.java
+++ b/src/jalview/gui/BlogReader.java
@@ -1,25 +1,31 @@
-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
- *
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
  * This file is part of Jalview.
- *
+ * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import jalview.bin.Cache;
+import jalview.util.MessageManager;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Dialog.ModalExclusionType;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Rectangle;
@@ -122,11 +128,12 @@ public class BlogReader extends JPanel
     @Override
     public void actionPerformed(ActionEvent arg0)
     {
-      if (xf!=null)
+      if (xf != null)
       {
         xf.dispose();
       }
-      xf=null;jd=null;
+      xf = null;
+      jd = null;
       if (parent != null)
       {
         parent.showNews(false);
@@ -191,8 +198,8 @@ public class BlogReader extends JPanel
       {
         if (parent != null)
         {
-          Cache.log.info("News window closed.");
-          jd=null;
+          Cache.log.debug("News window closed.");
+          jd = null;
           parent.showNews(false);
         }
       }
@@ -239,7 +246,7 @@ public class BlogReader extends JPanel
 
   public BlogReader(Desktop desktop)
   {
-    Cache.log.info("Constructing news reader.");
+    Cache.log.debug("Constructing news reader.");
 
     parent = desktop;
     _channelModel = new ChannelListModel();
@@ -268,10 +275,10 @@ public class BlogReader extends JPanel
     if (setvisible)
     {
 
-      Cache.log.info("Will show jalview news automatically");
+      Cache.log.debug("Will show jalview news automatically");
       showNews();
     }
-    Cache.log.info("Completed construction of reader.");
+    Cache.log.debug("Completed construction of reader.");
 
   }
 
@@ -324,9 +331,10 @@ public class BlogReader extends JPanel
         {
           createDialog();
           bounds = new Rectangle(5, 5, 550, 350);
-          jd.initDialogFrame(me, true, false, "News from www.jalview.org",
+          jd.initDialogFrame(me, false, false, MessageManager.getString("label.news_from_jalview"),
                   bounds.width, bounds.height);
-          Cache.log.info("Displaying news.");
+          jd.frame.setModalExclusionType(ModalExclusionType.NO_EXCLUDE);
+          Cache.log.debug("Displaying news.");
           jd.waitForInput();
         }
       }
@@ -413,7 +421,7 @@ public class BlogReader extends JPanel
       {
         jalview.bin.Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED",
                 lastDate);
-        jalview.bin.Cache.log.info("Saved last read date as "
+        jalview.bin.Cache.log.debug("Saved last read date as "
                 + jalview.bin.Cache.date_format.format(lastDate));
 
       }
@@ -432,7 +440,7 @@ public class BlogReader extends JPanel
     topBottomSplitPane.setBottomComponent(bottomPanel);
     JScrollPane spTextDescription = new JScrollPane(textDescription);
     textDescription.setText("");
-    statusBar.setText(" [Status] ");
+    statusBar.setText(new StringBuffer("[").append(MessageManager.getString("label.status")).append("]").toString());
     buttonRefresh.addActionListener(new ActionListener()
     {
 
@@ -474,7 +482,7 @@ public class BlogReader extends JPanel
             _popupChannels);
     listItems.addMouseListener(popupAdapter);
     listItems.setCellRenderer(new ItemsRenderer());
-    lblChannels.setText("Channels");
+    lblChannels.setText(MessageManager.getString("label.channels"));
   }
 
   private void postInit()
@@ -750,16 +758,16 @@ public class BlogReader extends JPanel
               + jalview.bin.Cache.date_format.format(lastread.getTime()));
       if (me.isNewsNew())
       {
-        Cache.log.info("There is news to read.");
+        Cache.log.debug("There is news to read.");
       }
       else
       {
-        Cache.log.info("There is no new news.");
+        Cache.log.debug("There is no new news.");
         me.xf.setTitle("Testing : Last read is " + me.lastDate);
         me.showNews();
         me.xf.toFront();
       }
-      Cache.log.info("Waiting for closure.");
+      Cache.log.debug("Waiting for closure.");
       do
       {
         try
@@ -773,18 +781,18 @@ public class BlogReader extends JPanel
 
       if (me.isNewsNew())
       {
-        Cache.log.info("Still new news after reader displayed.");
+        Cache.log.debug("Still new news after reader displayed.");
       }
       if (lastread.getTime().before(me.lastDate))
       {
-        Cache.log.info("The news was read.");
+        Cache.log.debug("The news was read.");
         lastread.setTime(me.lastDate);
       }
       else
       {
         lastread.add(Calendar.MONTH, 1);
       }
-      
+
     }
   }
 
@@ -808,8 +816,14 @@ class ChannelsRenderer extends DefaultListCellRenderer
     if (value instanceof Channel)
     {
       Channel channel = (Channel) value;
-      component.setText(channel.getTitle() + " ("
-              + channel.getUnreadItemCount() + ")");
+      component
+              .setText(MessageManager.formatMessage(
+                      "label.channel_title_item_count",
+                      new String[]
+                      {
+                          channel.getTitle(),
+                          Integer.valueOf(channel.getUnreadItemCount())
+                                  .toString() }));
       component.setToolTipText(channel.getURL());
     }
     return component;
@@ -832,9 +846,15 @@ class ItemsRenderer extends DefaultListCellRenderer
       Item item = (Item) value;
       if (item.getPublishDate() != null)
       {
-        component.setText(DateFormat.getDateInstance().format(
-                item.getPublishDate())
-                + " " + item.getTitle());
+        component.setText(MessageManager.formatMessage(
+                "label.blog_item_published_on_date",
+                new String[]
+                {
+                    DateFormat
+                            .getDateInstance(DateFormat.LONG,
+                                    MessageManager.getLocale())
+                            .format(item.getPublishDate()).toString(),
+                    item.getTitle() }));
       }
       component.setToolTipText(item.getLink());
       if (!item.isRead())