X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FParagraph.java;h=9adc51c420e815492858adbcffbd1b606dab7eda;hb=8b152e7b4b89b6bda319c96a1371e766b8a51adc;hp=e409c286ae2949be6242c772b6fb7a1783e6a51f;hpb=793f1071fae48daed3b545a03a286c85e527d244;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/data/Paragraph.java b/src/be/nikiroo/fanfix/data/Paragraph.java
index e409c28..9adc51c 100644
--- a/src/be/nikiroo/fanfix/data/Paragraph.java
+++ b/src/be/nikiroo/fanfix/data/Paragraph.java
@@ -1,13 +1,17 @@
 package be.nikiroo.fanfix.data;
 
-import java.net.URL;
+import java.io.Serializable;
+
+import be.nikiroo.utils.Image;
 
 /**
  * A paragraph in a chapter of the story.
  * 
  * @author niki
  */
-public class Paragraph {
+public class Paragraph implements Cloneable, Serializable {
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * A paragraph type, that will dictate how the paragraph will be handled.
 	 * 
@@ -23,24 +27,43 @@ public class Paragraph {
 		/** 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 Image contentImage;
 	private long words;
 
+	/**
+	 * Empty constructor, not to use.
+	 */
+	@SuppressWarnings("unused")
+	private Paragraph() {
+		// for serialisation purposes
+	}
+
 	/**
 	 * Create a new {@link Paragraph} with the given image.
 	 * 
-	 * @param support
-	 *            the support that will be used to fetch the image via
-	 *            {@link Paragraph#getContentImage()}.
-	 * @param content
-	 *            the content image of this paragraph
+	 * @param contentImage
+	 *            the image
 	 */
-	public Paragraph(URL imageUrl) {
-		this(ParagraphType.IMAGE, imageUrl.toString(), 0);
+	public Paragraph(Image contentImage) {
+		this(ParagraphType.IMAGE, null, 1);
+		this.contentImage = contentImage;
 	}
 
 	/**
@@ -51,7 +74,7 @@ public class Paragraph {
 	 * @param content
 	 *            the content of this paragraph
 	 * @param words
-	 *            the number of words
+	 *            the number of words (or images)
 	 */
 	public Paragraph(ParagraphType type, String content, long words) {
 		this.type = type;
@@ -79,7 +102,7 @@ public class Paragraph {
 	}
 
 	/**
-	 * The content of this {@link Paragraph}.
+	 * The content of this {@link Paragraph} if it is not an image.
 	 * 
 	 * @return the content
 	 */
@@ -98,7 +121,16 @@ public class Paragraph {
 	}
 
 	/**
-	 * The number of words in this {@link Paragraph}.
+	 * The content of this {@link Paragraph} if it is an image.
+	 * 
+	 * @return the content
+	 */
+	public Image getContentImage() {
+		return contentImage;
+	}
+
+	/**
+	 * The number of words (or images) in this {@link Paragraph}.
 	 * 
 	 * @return the number of words
 	 */
@@ -107,7 +139,7 @@ public class Paragraph {
 	}
 
 	/**
-	 * The number of words in this {@link Paragraph}.
+	 * The number of words (or images) in this {@link Paragraph}.
 	 * 
 	 * @param words
 	 *            the number of words to set
@@ -121,6 +153,20 @@ public class Paragraph {
 	 */
 	@Override
 	public String toString() {
-		return String.format("%s: [%s]", "" + type, "" + content);
+		return String.format("%s: [%s]", "" + type, content == null ? "N/A"
+				: content);
+	}
+
+	@Override
+	public Paragraph clone() {
+		Paragraph para = null;
+		try {
+			para = (Paragraph) super.clone();
+		} catch (CloneNotSupportedException e) {
+			// Did the clones rebel?
+			System.err.println(e);
+		}
+
+		return para;
 	}
 }