X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FText.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FText.java;h=f0516dc629ebca9bf65b7bf86fa559028004f622;hp=4a45e5430fba9465b1e92a590bcae9cc18b28360;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hpb=0013f760d69fd7db2b298c3da5d89bc0b102eabf diff --git a/src/be/nikiroo/fanfix/output/Text.java b/src/be/nikiroo/fanfix/output/Text.java index 4a45e54..f0516dc 100644 --- a/src/be/nikiroo/fanfix/output/Text.java +++ b/src/be/nikiroo/fanfix/output/Text.java @@ -62,8 +62,7 @@ class Text extends BasicOutput { 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(" ("); @@ -82,11 +81,9 @@ class Text extends BasicOutput { 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 { - txt = Instance.getTrans().getString(StringId.CHAPTER_UNNAMED, - chap.getNumber()); + txt = Instance.getInstance().getTrans().getString(StringId.CHAPTER_UNNAMED, chap.getNumber()); } 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 { - Instance.getCache().saveAsImage(para.getContentImage(), file, - nextParaIsCover); + Instance.getInstance().getCache().saveAsImage(para.getContentImage(), file, nextParaIsCover); } catch (IOException e) { - Instance.getTraceHandler().error( - new IOException("Cannot save an image", e)); + Instance.getInstance().getTraceHandler().error(new IOException("Cannot save an image", e)); } }