X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FMetaData.java;h=b2217ae3f4b721d235d7ee830c611514b68c9b90;hp=872baff2c1323a6e0f31f4a3b055273d7a4b07df;hb=aa8b74a318769354c5cb512ead428beb372503a2;hpb=0efd25e3aa839ba82da1054a470c27830b9ed94a

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index 872baff..b2217ae 100644
--- a/src/be/nikiroo/fanfix/data/MetaData.java
+++ b/src/be/nikiroo/fanfix/data/MetaData.java
@@ -1,9 +1,10 @@
 package be.nikiroo.fanfix.data;
 
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 
+import be.nikiroo.utils.Image;
+
 /**
  * The meta data associated to a {@link Story} object.
  * 
@@ -15,7 +16,7 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 	private String date;
 	private Chapter resume;
 	private List<String> tags;
-	private BufferedImage cover;
+	private Image cover;
 	private String subject;
 	private String source;
 	private String url;
@@ -129,7 +130,7 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 	 * 
 	 * @return the cover
 	 */
-	public BufferedImage getCover() {
+	public Image getCover() {
 		return cover;
 	}
 
@@ -139,7 +140,7 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 	 * @param cover
 	 *            the cover to set
 	 */
-	public void setCover(BufferedImage cover) {
+	public void setCover(Image cover) {
 		this.cover = cover;
 	}
 
@@ -377,9 +378,37 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 		this.fakeCover = fakeCover;
 	}
 
+	@Override
 	public int compareTo(MetaData o) {
-		String oUuid = o == null ? null : o.getUuid();
-		return getUuid().compareTo(oUuid);
+		if (o == null) {
+			return 1;
+		}
+
+		String id = (getUuid() == null ? "" : getUuid())
+				+ (getLuid() == null ? "" : getLuid());
+		String oId = (getUuid() == null ? "" : o.getUuid())
+				+ (o.getLuid() == null ? "" : o.getLuid());
+
+		return id.compareTo(oId);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof MetaData)) {
+			return false;
+		}
+
+		return compareTo((MetaData) obj) == 0;
+	}
+
+	@Override
+	public int hashCode() {
+		String uuid = getUuid();
+		if (uuid == null) {
+			uuid = "" + title + author + source;
+		}
+
+		return uuid.hashCode();
 	}
 
 	@Override
@@ -393,14 +422,11 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 		}
 
 		if (tags != null) {
-			meta.tags = new ArrayList<String>();
-			meta.tags.addAll(tags);
+			meta.tags = new ArrayList<String>(tags);
 		}
+
 		if (resume != null) {
-			meta.resume = new Chapter(resume.getNumber(), resume.getName());
-			for (Paragraph para : resume) {
-				meta.resume.getParagraphs().add(para);
-			}
+			meta.resume = resume.clone();
 		}
 
 		return meta;