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
e621: better title
[nikiroo-utils.git]
/
output
/
Text.java
diff --git
a/output/Text.java
b/output/Text.java
index 4a45e5430fba9465b1e92a590bcae9cc18b28360..f0516dc629ebca9bf65b7bf86fa559028004f622 100644
(file)
--- a/
output/Text.java
+++ b/
output/Text.java
@@
-62,8
+62,7
@@
class Text extends BasicOutput {
writer.write(title);
writer.write("\n");
if (author != null && !author.isEmpty()) {
writer.write(title);
writer.write("\n");
if (author != null && !author.isEmpty()) {
- writer.write(Instance.getTrans().getString(StringId.BY) + " "
- + author);
+ writer.write(Instance.getInstance().getTrans().getString(StringId.BY) + " " + author);
}
if (date != null && !date.isEmpty()) {
writer.write(" (");
}
if (date != null && !date.isEmpty()) {
writer.write(" (");
@@
-82,11
+81,9
@@
class Text extends BasicOutput {
protected void writeChapterHeader(Chapter chap) throws IOException {
String txt;
if (chap.getName() != null && !chap.getName().isEmpty()) {
protected void writeChapterHeader(Chapter chap) throws IOException {
String txt;
if (chap.getName() != null && !chap.getName().isEmpty()) {
- txt = Instance.getTrans().getString(StringId.CHAPTER_NAMED,
- chap.getNumber(), chap.getName());
+ txt = Instance.getInstance().getTrans().getString(StringId.CHAPTER_NAMED, chap.getNumber(), chap.getName());
} else {
} else {
- txt = Instance.getTrans().getString(StringId.CHAPTER_UNNAMED,
- chap.getNumber());
+ txt = Instance.getInstance().getTrans().getString(StringId.CHAPTER_UNNAMED, chap.getNumber());
}
writer.write("\n" + txt + "\n");
}
writer.write("\n" + txt + "\n");
@@
-106,11
+103,9
@@
class Text extends BasicOutput {
if (para.getType() == ParagraphType.IMAGE) {
File file = new File(targetDir, getCurrentImageBestName(true));
try {
if (para.getType() == ParagraphType.IMAGE) {
File file = new File(targetDir, getCurrentImageBestName(true));
try {
- Instance.getCache().saveAsImage(para.getContentImage(), file,
- nextParaIsCover);
+ Instance.getInstance().getCache().saveAsImage(para.getContentImage(), file, nextParaIsCover);
} catch (IOException e) {
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException("Cannot save an image", e));
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot save an image", e));
}
}
}
}