X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FParagraph.java;h=0ed61fbb614f494725ebbc0f1c632a7ffcd7a29a;hb=e5a2f1b3d64907292ef59c6eae076354510e8641;hp=7a1a1c448322212cbd09cebdc7180b0f8912b6c4;hpb=39cd9738bfcdafaf8806d5007e443e572f8994c0;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/data/Paragraph.java b/src/be/nikiroo/fanfix/data/Paragraph.java
index 7a1a1c4..0ed61fb 100644
--- a/src/be/nikiroo/fanfix/data/Paragraph.java
+++ b/src/be/nikiroo/fanfix/data/Paragraph.java
@@ -1,6 +1,6 @@
 package be.nikiroo.fanfix.data;
 
-import java.awt.image.BufferedImage;
+import be.nikiroo.utils.Image;
 
 /**
  * A paragraph in a chapter of the story.
@@ -23,12 +23,24 @@ public class Paragraph implements Cloneable {
 		/** Quotation (dialogue) */
 		QUOTE,
 		/** An image (no text) */
-		IMAGE,
+		IMAGE, ;
+
+		/**
+		 * This paragraph type is of a text kind (quote or not).
+		 * 
+		 * @param allowEmpty
+		 *            allow empty text as text, too (blanks, breaks...)
+		 * @return TRUE if it is
+		 */
+		public boolean isText(boolean allowEmpty) {
+			return (this == NORMAL || this == QUOTE)
+					|| (allowEmpty && (this == BLANK || this == BREAK));
+		}
 	}
 
 	private ParagraphType type;
 	private String content;
-	private BufferedImage contentImage;
+	private Image contentImage;
 	private long words;
 
 	/**
@@ -45,7 +57,7 @@ public class Paragraph implements Cloneable {
 	 * @param contentImage
 	 *            the image
 	 */
-	public Paragraph(BufferedImage contentImage) {
+	public Paragraph(Image contentImage) {
 		this(ParagraphType.IMAGE, null, 1);
 		this.contentImage = contentImage;
 	}
@@ -109,7 +121,7 @@ public class Paragraph implements Cloneable {
 	 * 
 	 * @return the content
 	 */
-	public BufferedImage getContentImage() {
+	public Image getContentImage() {
 		return contentImage;
 	}
 
@@ -137,7 +149,8 @@ public class Paragraph implements Cloneable {
 	 */
 	@Override
 	public String toString() {
-		return String.format("%s: [%s]", "" + type, "" + content);
+		return String.format("%s: [%s]", "" + type, content == null ? "N/A"
+				: content);
 	}
 
 	@Override