git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update TODO.md
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
data
/
MetaData.java
diff --git
a/src/be/nikiroo/fanfix/data/MetaData.java
b/src/be/nikiroo/fanfix/data/MetaData.java
index 189277d9480fb8ef4abf3f5b6b8646a5d74d303e..d72b55732adde9098b98914968f0196c3abc0562 100644
(file)
--- 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;
package be.nikiroo.fanfix.data;
-import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+import be.nikiroo.utils.Image;
+
/**
* The meta data associated to a {@link Story} object.
*
/**
* 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 String date;
private Chapter resume;
private List<String> tags;
- private
Buffered
Image cover;
+ private Image cover;
private String subject;
private String source;
private String url;
private String subject;
private String source;
private String url;
@@
-129,7
+130,7
@@
public class MetaData implements Cloneable, Comparable<MetaData> {
*
* @return the cover
*/
*
* @return the cover
*/
- public
Buffered
Image getCover() {
+ public Image getCover() {
return cover;
}
return cover;
}
@@
-139,7
+140,7
@@
public class MetaData implements Cloneable, Comparable<MetaData> {
* @param cover
* the cover to set
*/
* @param cover
* the cover to set
*/
- public void setCover(
Buffered
Image cover) {
+ public void setCover(Image cover) {
this.cover = cover;
}
this.cover = cover;
}
@@
-235,7
+236,7
@@
public class MetaData implements Cloneable, Comparable<MetaData> {
/**
* A unique value representing the story in the local library.
*
/**
* A unique value representing the story in the local library.
*
- * @param
u
uid
+ * @param
l
uid
* the luid to set
*/
public void setLuid(String luid) {
* the luid to set
*/
public void setLuid(String luid) {
@@
-377,6
+378,7
@@
public class MetaData implements Cloneable, Comparable<MetaData> {
this.fakeCover = fakeCover;
}
this.fakeCover = fakeCover;
}
+ @Override
public int compareTo(MetaData o) {
String oUuid = o == null ? null : o.getUuid();
return getUuid().compareTo(oUuid);
public int compareTo(MetaData o) {
String oUuid = o == null ? null : o.getUuid();
return getUuid().compareTo(oUuid);
@@
-393,14
+395,11
@@
public class MetaData implements Cloneable, Comparable<MetaData> {
}
if (tags != null) {
}
if (tags != null) {
- meta.tags = new ArrayList<String>();
- meta.tags.addAll(tags);
+ meta.tags = new ArrayList<String>(tags);
}
}
+
if (resume != null) {
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;
}
return meta;