X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderPropertiesFrame.java;h=18417716816d25c0a7f15e72dc650f30927cef10;hb=a6c830bb1ea8527a3600aa6d0e05d5b2291c4b15;hp=0ad082ce3a9089409910ce74e7e9ab073b23d861;hpb=31e28683c108bb5903864c58b0cc06bfa258fbfc;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java index 0ad082c..1841771 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java @@ -3,8 +3,7 @@ package be.nikiroo.fanfix.reader.ui; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; -import java.util.List; -import java.util.Map.Entry; +import java.util.Map; import javax.swing.BorderFactory; import javax.swing.BoxLayout; @@ -35,14 +34,16 @@ public class GuiReaderPropertiesFrame extends JFrame { * @param meta * the meta to describe */ - public GuiReaderPropertiesFrame(Reader reader, MetaData meta) { + public GuiReaderPropertiesFrame(Reader reader, GuiReaderBookInfo info) { + MetaData meta = info.getMeta(); + // Borders int top = 20; int space = 10; // Image ImageIcon img = GuiReaderCoverImager.generateCoverIcon( - reader.getLibrary(), meta); + reader.getLibrary(), info); // frame setTitle(meta.getLuid() + ": " + meta.getTitle()); @@ -61,23 +62,23 @@ public class GuiReaderPropertiesFrame extends JFrame { mainPanel.add(mainPanelKeys, BorderLayout.WEST); mainPanel.add(mainPanelValues, BorderLayout.CENTER); - List> infos = BasicReader.getMetaDesc(meta); + Map desc = BasicReader.getMetaDesc(meta); Color trans = new Color(0, 0, 0, 1); - for (Entry info : infos) { - JTextArea key = new JTextArea(info.getKey()); - key.setFont(new Font(key.getFont().getFontName(), Font.BOLD, key + for (String key : desc.keySet()) { + JTextArea jKey = new JTextArea(key); + jKey.setFont(new Font(jKey.getFont().getFontName(), Font.BOLD, jKey .getFont().getSize())); - key.setEditable(false); - key.setLineWrap(false); - key.setBackground(trans); - mainPanelKeys.add(key); - - JTextArea value = new JTextArea(info.getValue()); - value.setEditable(false); - value.setLineWrap(false); - value.setBackground(trans); - mainPanelValues.add(value); + jKey.setEditable(false); + jKey.setLineWrap(false); + jKey.setBackground(trans); + mainPanelKeys.add(jKey); + + JTextArea jValue = new JTextArea(desc.get(key)); + jValue.setEditable(false); + jValue.setLineWrap(false); + jValue.setBackground(trans); + mainPanelValues.add(jValue); } // Image