X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=62a008c001b8b3697671079ab34b839fef74bf31;hb=34f8780d16faf3a5466c45261bd84f1b31516790;hp=104125535d69c3263f819dcff7130fc7bf12dbb9;hpb=6fd6ebe625db8a840e44f081f54a4112e4e68fd5;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java index 1041255..62a008c 100644 --- a/src/be/nikiroo/fanfix/output/BasicOutput.java +++ b/src/be/nikiroo/fanfix/output/BasicOutput.java @@ -63,10 +63,10 @@ public abstract class BasicOutput { StringId id = longDesc ? StringId.OUTPUT_DESC : StringId.OUTPUT_DESC_SHORT; - String desc = Instance.getTrans().getStringX(id, this.name()); + String desc = Instance.getInstance().getTrans().getStringX(id, this.name()); if (desc == null) { - desc = Instance.getTrans().getString(id, this.toString()); + desc = Instance.getInstance().getTrans().getString(id, this.toString()); } if (desc == null || desc.isEmpty()) { @@ -151,8 +151,8 @@ public abstract class BasicOutput { } /** The creator name (this program, by me!) */ - protected String EPUB_CREATOR = "Fanfix " + Version.getCurrentVersion() - + " (by Niki)"; + static protected final String EPUB_CREATOR = "Fanfix " + + Version.getCurrentVersion() + " (by Niki)"; /** The current best name for an image */ private String imageName; @@ -299,27 +299,21 @@ public abstract class BasicOutput { return ""; } - @SuppressWarnings("unused") protected void writeStoryHeader(Story story) throws IOException { } - @SuppressWarnings("unused") protected void writeChapterHeader(Chapter chap) throws IOException { } - @SuppressWarnings("unused") protected void writeParagraphHeader(Paragraph para) throws IOException { } - @SuppressWarnings("unused") protected void writeStoryFooter(Story story) throws IOException { } - @SuppressWarnings("unused") protected void writeChapterFooter(Chapter chap) throws IOException { } - @SuppressWarnings("unused") protected void writeParagraphFooter(Paragraph para) throws IOException { }