Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.git] / src / be / nikiroo / fanfix / reader / GuiReaderBook.java

diff --git a/src/be/nikiroo/fanfix/reader/GuiReaderBook.java b/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
index e6fe91b4d84ed95def7fe13ba48b52850ceb9686..6475bd9736cf2ebe975a92295f2513317bf386ed 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
+++ b/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
@@ -27,7 +27,7 @@ import javax.swing.JPanel;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
-import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.ImageUtils;
 import be.nikiroo.utils.ui.UIUtils;
 
 /**
@@ -93,12 +93,15 @@ class GuiReaderBook extends JPanel {
        private Date lastClick;
 
        private List<BookActionListener> listeners;
+       private Reader reader;
        private MetaData meta;
        private boolean cached;
 
        /**
         * Create a new {@link GuiReaderBook} item for the given {@link Story}.
         * 
+        * @param reader
+        *            the associated reader
         * @param meta
         *            the story {@link MetaData}
         * @param cached
@@ -106,7 +109,9 @@ class GuiReaderBook extends JPanel {
         * @param seeWordCount
         *            TRUE to see word counts, FALSE to see authors
         */
-       public GuiReaderBook(MetaData meta, boolean cached, boolean seeWordCount) {
+       public GuiReaderBook(Reader reader, MetaData meta, boolean cached,
+                       boolean seeWordCount) {
+               this.reader = reader;
                this.cached = cached;
                this.meta = meta;
 
@@ -184,26 +189,31 @@ class GuiReaderBook extends JPanel {
        private void setupListeners() {
                listeners = new ArrayList<GuiReaderBook.BookActionListener>();
                addMouseListener(new MouseListener() {
+                       @Override
                        public void mouseReleased(MouseEvent e) {
                                if (e.isPopupTrigger()) {
                                        popup(e);
                                }
                        }
 
+                       @Override
                        public void mousePressed(MouseEvent e) {
                                if (e.isPopupTrigger()) {
                                        popup(e);
                                }
                        }
 
+                       @Override
                        public void mouseExited(MouseEvent e) {
                                setHovered(false);
                        }
 
+                       @Override
                        public void mouseEntered(MouseEvent e) {
                                setHovered(true);
                        }
 
+                       @Override
                        public void mouseClicked(MouseEvent e) {
                                if (isEnabled()) {
                                        Date now = new Date();
@@ -365,7 +375,7 @@ class GuiReaderBook extends JPanel {
                InputStream in = Instance.getCache().getFromCache(id);
                if (in != null) {
                        try {
-                               resizedImage = IOUtils.toImage(in);
+                               resizedImage = ImageUtils.fromStream(in);
                                in.close();
                                in = null;
                        } catch (IOException e) {
@@ -375,7 +385,7 @@ class GuiReaderBook extends JPanel {
 
                if (resizedImage == null) {
                        try {
-                               BufferedImage cover = Instance.getLibrary().getCover(
+                               BufferedImage cover = reader.getLibrary().getCover(
                                                meta.getLuid());
 
                                resizedImage = new BufferedImage(SPINE_WIDTH + COVER_WIDTH,