X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FMetaData.java;h=53525fdc58726eee7bd274dc10b5e4adf7568516;hb=2aac79c740789071ad9b773d25f20e103f0da86c;hp=8185ddd235340c07e814eae3665464a056762f3d;hpb=39cd9738bfcdafaf8806d5007e443e572f8994c0;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java index 8185ddd..53525fd 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 { private String date; private Chapter resume; private List 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 { * * @return the cover */ - public BufferedImage getCover() { + public Image getCover() { return cover; } @@ -139,7 +140,7 @@ public class MetaData implements Cloneable, Comparable { * @param cover * the cover to set */ - public void setCover(BufferedImage cover) { + public void setCover(Image cover) { this.cover = cover; } @@ -379,8 +380,41 @@ public class MetaData implements Cloneable, Comparable { @Override public int compareTo(MetaData o) { - String oUuid = o == null ? null : o.getUuid(); - return getUuid().compareTo(oUuid); + if (o == null) { + return 1; + } + + String uuid = getUuid(); + String oUuid = o.getUuid(); + + if (uuid == null) { + uuid = ""; + } + + if (oUuid == null) { + oUuid = ""; + } + + return uuid.compareTo(oUuid); + } + + @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