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
TUI: improve story info, padding
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
data
/
Paragraph.java
diff --git
a/src/be/nikiroo/fanfix/data/Paragraph.java
b/src/be/nikiroo/fanfix/data/Paragraph.java
index 7a1a1c448322212cbd09cebdc7180b0f8912b6c4..e7ef04581fc3b2d70c05d19d1b203971ba2136b2 100644
(file)
--- 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;
package be.nikiroo.fanfix.data;
-import
java.awt.image.Buffered
Image;
+import
be.nikiroo.utils.
Image;
/**
* A paragraph in a chapter of the story.
/**
* A paragraph in a chapter of the story.
@@
-28,7
+28,7
@@
public class Paragraph implements Cloneable {
private ParagraphType type;
private String content;
private ParagraphType type;
private String content;
- private
Buffered
Image contentImage;
+ private Image contentImage;
private long words;
/**
private long words;
/**
@@
-45,7
+45,7
@@
public class Paragraph implements Cloneable {
* @param contentImage
* the image
*/
* @param contentImage
* the image
*/
- public Paragraph(
Buffered
Image contentImage) {
+ public Paragraph(Image contentImage) {
this(ParagraphType.IMAGE, null, 1);
this.contentImage = contentImage;
}
this(ParagraphType.IMAGE, null, 1);
this.contentImage = contentImage;
}
@@
-109,7
+109,7
@@
public class Paragraph implements Cloneable {
*
* @return the content
*/
*
* @return the content
*/
- public
Buffered
Image getContentImage() {
+ public Image getContentImage() {
return contentImage;
}
return contentImage;
}
@@
-137,7
+137,8
@@
public class Paragraph implements Cloneable {
*/
@Override
public String toString() {
*/
@Override
public String toString() {
- return String.format("%s: [%s]", "" + type, "" + content);
+ return String.format("%s: [%s]", "" + type, content == null ? "N/A"
+ : content);
}
@Override
}
@Override