X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FBlogReader.java;h=2b728aef60e74f46b06696778e67aa4d28c749d5;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=2759eff2d18fe44f6d0583ebb4692c79f272b960;hpb=9c04f4ce6bb3a8851b1abf3bb9999ca097d37685;p=jalview.git
diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index 2759eff..2b728ae 100644
--- a/src/jalview/gui/BlogReader.java
+++ b/src/jalview/gui/BlogReader.java
@@ -1,8 +1,23 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * 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.
+ *
+ * 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 .
+ *******************************************************************************/
package jalview.gui;
import jalview.bin.Cache;
-import jalview.jbgui.GBlogReader;
-
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
@@ -16,6 +31,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeListener;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
@@ -31,6 +47,7 @@ import javax.swing.DefaultListModel;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
+import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JMenuItem;
@@ -65,10 +82,8 @@ import org.robsite.jswingreader.ui.util.ContextMenuMouseAdapter;
* org.robsite.jswingreader.ui.MainWindow class
*/
-public class BlogReader extends GBlogReader
+public class BlogReader extends JPanel
{
- private JButton buttonAbout = new JButton();
-
private JButton buttonRefresh = new JButton();
private JToolBar toolBar = new JToolBar();
@@ -85,10 +100,6 @@ public class BlogReader extends GBlogReader
private JPanel bottomPanel = new JPanel();
- private BorderLayout borderLayout2 = new BorderLayout();
-
- private BorderLayout borderLayout3 = new BorderLayout();
-
private JSplitPane topBottomSplitPane = new JSplitPane();
private JList listItems = new JList(new DefaultListModel());
@@ -111,7 +122,11 @@ public class BlogReader extends GBlogReader
@Override
public void actionPerformed(ActionEvent arg0)
{
- setVisible(false);
+ if (xf!=null)
+ {
+ xf.dispose();
+ }
+ xf=null;jd=null;
if (parent != null)
{
parent.showNews(false);
@@ -161,6 +176,43 @@ public class BlogReader extends GBlogReader
}
};
+ private JFrame xf = null;
+
+ private JalviewDialog jd = null;
+
+ private JalviewDialog createDialog()
+ {
+
+ return jd = new JalviewDialog()
+ {
+
+ @Override
+ protected void raiseClosed()
+ {
+ if (parent != null)
+ {
+ Cache.log.info("News window closed.");
+ jd=null;
+ parent.showNews(false);
+ }
+ }
+
+ @Override
+ protected void okPressed()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void cancelPressed()
+ {
+ // TODO Auto-generated method stub
+
+ }
+ };
+ };
+
private JLabel lblChannels = new JLabel();
private List _updatableActions = new ArrayList();
@@ -187,24 +239,9 @@ public class BlogReader extends GBlogReader
public BlogReader(Desktop desktop)
{
+ Cache.log.info("Constructing news reader.");
+
parent = desktop;
- if (parent == null)
- {
- this.setSize(new Dimension(550, 350));
- }
- else
- {
- Rectangle bounds = parent
- .getLastKnownDimensions("JALVIEW_RSS_WINDOW_");
- if (bounds == null)
- {
- setBounds(parent.getX(), parent.getY(), 550, 350);
- }
- else
- {
- setBounds(bounds.x, bounds.y, bounds.width, bounds.height);
- }
- }
_channelModel = new ChannelListModel();
// Construct our jalview news channel
Channel chan = new Channel();
@@ -227,25 +264,73 @@ public class BlogReader extends GBlogReader
initItems(chan);
updating = false;
boolean setvisible = checkForNew(chan, true);
+
if (setvisible)
{
+
Cache.log.info("Will show jalview news automatically");
- SwingUtilities.invokeLater(new Runnable()
+ showNews();
+ }
+ Cache.log.info("Completed construction of reader.");
+
+ }
+
+ /**
+ * check if the news panel's container is visible
+ */
+ public boolean isVisible()
+ {
+ if (parent == null)
+ {
+ return xf != null && xf.isVisible();
+ }
+ return jd != null && jd.isVisible();
+ }
+
+ /**
+ * display the container for the news panel
+ */
+ public void showNews()
+ {
+ final BlogReader me = this;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
{
- @Override
- public void run()
+ Rectangle bounds = new Rectangle(5, 5, 550, 350);
+ if (parent == null)
{
- if (parent != null)
- {
- parent.showNews(true);
- }
- else
+ xf = new JFrame();
+ xf.setContentPane(me);
+ xf.addWindowListener(new WindowAdapter()
{
- setVisible(true);
- }
+ public void windowClosing(WindowEvent e)
+ {
+ ActionEvent actionEvent = new ActionEvent(this,
+ ActionEvent.ACTION_FIRST, (String) exitAction
+ .getValue(Action.NAME));
+ exitAction.actionPerformed(actionEvent);
+ }
+
+ public void windowOpened(WindowEvent e)
+ {
+ }
+ });
+ me.setSize(new Dimension(550, 350));
+ xf.setVisible(true);
}
- });
- }
+ else
+ {
+ createDialog();
+ bounds = new Rectangle(5, 5, 550, 350);
+ jd.initDialogFrame(me, true, false, "News from www.jalview.org",
+ bounds.width, bounds.height);
+ Cache.log.info("Displaying news.");
+ jd.waitForInput();
+ }
+ }
+ });
}
/**
@@ -253,18 +338,31 @@ public class BlogReader extends GBlogReader
*/
private boolean checkForNew(Channel chan, boolean updateItems)
{
+
if (!updating || updateItems)
{
newsnew = false;
}
+ java.util.Date earliest = null;
+ try
+ {
+ earliest = new SimpleDateFormat("YYYY-MM-DD").parse(chan
+ .getHTTPLastModified());
+ } catch (Exception x)
+ {
+ }
+ ;
if (chan != null && chan.getItems() != null)
{
+ Cache.log.debug("Scanning news items: newsnew=" + newsnew
+ + " and lastDate is " + lastDate);
for (Item i : (List- ) chan.getItems())
{
- boolean isread = (lastDate != null && i.getPublishDate() != null && !lastDate
- .before(i.getPublishDate()));
+ boolean isread = lastDate == null ? false
+ : (i.getPublishDate() != null && !lastDate.before(i
+ .getPublishDate()));
- if (i.getPublishDate() != null && (!updating || updateItems))
+ if (!updating || updateItems)
{
newsnew |= !isread;
}
@@ -272,8 +370,19 @@ public class BlogReader extends GBlogReader
{
i.setRead(isread);
}
+ if (i.getPublishDate() != null && !i.isRead())
+ {
+ if (earliest == null || earliest.after(i.getPublishDate()))
+ {
+ earliest = i.getPublishDate();
+ }
+ }
}
}
+ if (!updateItems && !updating && lastDate == null)
+ {
+ lastDate = earliest;
+ }
return newsnew;
}
@@ -286,10 +395,20 @@ public class BlogReader extends GBlogReader
private void saveLastM(Item item)
{
- if (item != null && item.getPublishDate() != null
- && (lastDate == null || item.getPublishDate().after(lastDate)))
+ if (item != null)
{
- lastDate = item.getPublishDate();
+ if (item.getPublishDate() != null)
+ {
+ if (lastDate == null || item.getPublishDate().after(lastDate))
+ {
+ lastDate = item.getPublishDate();
+ }
+ }
+
+ if (_channelModel.getElementAt(0) != null)
+ {
+ checkForNew((Channel) _channelModel.getElementAt(0), false);
+ }
if (lastDate != null)
{
jalview.bin.Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED",
@@ -298,17 +417,12 @@ public class BlogReader extends GBlogReader
+ jalview.bin.Cache.date_format.format(lastDate));
}
- if (_channelModel.getElementAt(0) != null)
- {
- checkForNew((Channel) _channelModel.getElementAt(0), false);
- }
}
}
private void jbInit() throws Exception
{
- this.setTitle("News from www.jalview.org");
- this.getContentPane().setLayout(layoutMain);
+ setLayout(layoutMain);
panelMain.setLayout(borderLayout1);
topPanel.setLayout(borderLayout5);
bottomPanel.setLayout(borderLayout4);
@@ -321,22 +435,23 @@ public class BlogReader extends GBlogReader
statusBar.setText(" [Status] ");
buttonRefresh.addActionListener(new ActionListener()
{
-
+
@Override
public void actionPerformed(ActionEvent e)
{
refreshNews();
}
});
- this.getContentPane().add(statusBar, BorderLayout.SOUTH);
+ add(statusBar, BorderLayout.SOUTH);
toolBar.add(buttonRefresh);
toolBar.addSeparator();
- JLabel about=new JLabel("brought to you by JSwingReader (jswingreader.sourceforge.net)");
+ JLabel about = new JLabel(
+ "brought to you by JSwingReader (jswingreader.sourceforge.net)");
toolBar.add(about);
toolBar.setFloatable(false);
- this.getContentPane().add(toolBar, BorderLayout.NORTH);
+ add(toolBar, BorderLayout.NORTH);
panelMain.add(topBottomSplitPane, BorderLayout.CENTER);
- this.getContentPane().add(panelMain, BorderLayout.CENTER);
+ add(panelMain, BorderLayout.CENTER);
JScrollPane spListItems = new JScrollPane(listItems);
listItems
.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
@@ -380,21 +495,6 @@ public class BlogReader extends GBlogReader
}
});
- this.addWindowListener(new WindowAdapter()
- {
- public void windowClosing(WindowEvent e)
- {
- ActionEvent actionEvent = new ActionEvent(this,
- ActionEvent.ACTION_FIRST, (String) exitAction
- .getValue(Action.NAME));
- exitAction.actionPerformed(actionEvent);
- }
-
- public void windowOpened(WindowEvent e)
- {
- }
- });
-
listItems.addListSelectionListener(new ListSelectionListener()
{
public void valueChanged(ListSelectionEvent e)
@@ -622,11 +722,13 @@ public class BlogReader extends GBlogReader
*/
public void refreshNews()
{
- try {
- initItems((Channel)_channelModel.getElementAt(0));
-
+ try
+ {
+ initItems((Channel) _channelModel.getElementAt(0));
+
} catch (Exception x)
- {}
+ {
+ }
}
public static void main(String args[])
@@ -653,20 +755,22 @@ public class BlogReader extends GBlogReader
else
{
Cache.log.info("There is no new news.");
+ me.xf.setTitle("Testing : Last read is " + me.lastDate);
+ me.showNews();
+ me.xf.toFront();
}
- me.setTitle("Testing : Last read is " + me.lastDate);
- me.setVisible(true);
- me.toFront();
- while (me.isVisible())
+ Cache.log.info("Waiting for closure.");
+ do
{
try
{
- Thread.sleep(100);
+ Thread.sleep(300);
} catch (InterruptedException x)
{
}
;
- }
+ } while (me.isVisible());
+
if (me.isNewsNew())
{
Cache.log.info("Still new news after reader displayed.");
@@ -680,7 +784,7 @@ public class BlogReader extends GBlogReader
{
lastread.add(Calendar.MONTH, 1);
}
- me.dispose();
+
}
}