Merge branch 'master' into subtree

[nikiroo-utils.git] / output / BasicOutput.java

diff --git a/output/BasicOutput.java b/output/BasicOutput.java
index 15d8cc1c7c88c4b454c90c97a51f77e1740dcb5f..62a008c001b8b3697671079ab34b839fef74bf31 100644 (file)
--- a/output/BasicOutput.java
+++ b/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()) {
@@ -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 {
        }