X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderTextViewer.java;h=281f082a0b82aa3842d59d12abedaa948ca4e0f6;hp=8f27c6c3c6b7200e0893dd066903369e60398746;hb=1ee6709558f5e1a6200dd6ec20c0f206c22797cc;hpb=47b1710c92c1a14188a00c433879b94c7c3e7ea1
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderTextViewer.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderTextViewer.java
index 8f27c6c..281f082 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderTextViewer.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderTextViewer.java
@@ -18,7 +18,6 @@ import javax.swing.SwingConstants;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
-import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.library.BasicLibrary;
@@ -32,6 +31,7 @@ public class GuiReaderTextViewer extends JFrame {
private JLabel chapterLabel;
private GuiReaderPropertiesPane descPane;
private int currentChapter = -42; // cover = -1
+ private GuiReaderTextViewerOutput htmlOutput = new GuiReaderTextViewerOutput();
public GuiReaderTextViewer(BasicLibrary lib, Story story) {
super(story.getMeta().getLuid() + ": " + story.getMeta().getTitle());
@@ -135,71 +135,11 @@ public class GuiReaderTextViewer extends JFrame {
chapterLabel.setText(" Chapter "
+ chap.getNumber() + ": " + chap.getName() + "");
- StringBuilder builder = new StringBuilder();
- addChapter(builder, chap);
- text.setText(builder.toString());
+ text.setText(htmlOutput.convert(chap));
}
}
private void setCoverPage() {
descPane.setVisible(true);
}
-
- // htmlInsert = no need to add HTML tags
- private void addChapter(StringBuilder builder, Chapter chap) {
- builder.append("");
-
- builder.append("");
- builder.append("Chapter ");
- builder.append(chap.getNumber());
- builder.append(": ");
- builder.append(chap.getName());
- builder.append("
");
-
- builder.append("");
- for (Paragraph para : chap) {
- addPara(builder, para);
- }
-
- if (paraInQuote) {
- builder.append("");
- }
- paraInQuote = false;
-
- builder.append("");
-
- builder.append("");
- }
-
- private boolean paraInQuote;
-
- private void addPara(StringBuilder builder, Paragraph para) {
- switch (para.getType()) {
- case NORMAL:
- builder.append(para.getContent());
- builder.append("
");
- break;
- case BLANK:
- builder.append("
");
- break;
- case BREAK:
- builder.append("
* * *
");
- break;
- case QUOTE:
- if (!paraInQuote) {
- builder.append("");
- } else {
- builder.append("
");
- }
- paraInQuote = !paraInQuote;
-
- builder.append("");
- builder.append("– ");
- builder.append(para.getContent());
- builder.append("
");
-
- break;
- case IMAGE:
- }
- }
}