Merge branch 'subtree'

[fanfix.git] / src / be / nikiroo / fanfix / output / BasicOutput.java

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index 7ac8cdfff913931f1edf809d68cfb0e6317ff74e..62a008c001b8b3697671079ab34b839fef74bf31 100644 (file)
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -12,6 +12,7 @@ import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
 
 /**
  * This class is the base class used by the other output classes. It can be used
@@ -62,13 +63,13 @@ 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);
+                               desc = Instance.getInstance().getTrans().getString(id, this.toString());
                        }
 
-                       if (desc == null) {
+                       if (desc == null || desc.isEmpty()) {
                                desc = this.toString();
                        }
 
@@ -79,9 +80,10 @@ public abstract class BasicOutput {
                 * The default extension to add to the output files.
                 * 
                 * @param readerTarget
-                *            the target to point to to read the {@link Story} (for
-                *            instance, the main entry point if this {@link Story} is in
-                *            a directory bundle)
+                *            TRUE to point to the main {@link Story} entry point for a
+                *            reader (for instance, the main entry point if this
+                *            {@link Story} is in a directory bundle), FALSE to point to
+                *            the main file even if it is a directory for instance
                 * 
                 * @return the extension
                 */
@@ -149,7 +151,8 @@ public abstract class BasicOutput {
        }
 
        /** The creator name (this program, by me!) */
-       static final String EPUB_CREATOR = "Fanfix (by Niki)";
+       static protected final String EPUB_CREATOR = "Fanfix "
+                       + Version.getCurrentVersion() + " (by Niki)";
 
        /** The current best name for an image */
        private String imageName;
@@ -284,9 +287,10 @@ public abstract class BasicOutput {
         * The default extension to add to the output files.
         * 
         * @param readerTarget
-        *            the target to point to to read the {@link Story} (for
-        *            instance, the main entry point if this {@link Story} is in a
-        *            directory bundle)
+        *            TRUE to point to the main {@link Story} entry point for a
+        *            reader (for instance, the main entry point if this
+        *            {@link Story} is in a directory bundle), FALSE to point to the
+        *            main file even if it is a directory for instance
         * 
         * @return the extension
         */
@@ -295,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 {
        }
 
@@ -334,10 +332,10 @@ public abstract class BasicOutput {
                        story.getMeta().setType("" + getType());
                }
 
-               if (writeCover) {
+               if (isWriteCover()) {
                        InfoCover.writeCover(targetDir, targetName, story.getMeta());
                }
-               if (writeInfo) {
+               if (isWriteInfo()) {
                        InfoCover.writeInfo(targetDir, targetName, story.getMeta());
                }