X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=909c8fe9707b6a76a05d6ebdf151193142757b6e;hb=0efd25e3aa839ba82da1054a470c27830b9ed94a;hp=babe7537021058438071537dae41fbed948e2e0c;hpb=4d2056837eaad81199dfb2fbd727e65440371889;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index babe753..909c8fe 100644
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -67,6 +67,10 @@ public abstract class BasicOutput {
 				desc = Instance.getTrans().getString(id, this);
 			}
 
+			if (desc == null) {
+				desc = this.toString();
+			}
+
 			return desc;
 		}
 
@@ -90,7 +94,8 @@ public abstract class BasicOutput {
 		}
 
 		/**
-		 * Call {@link OutputType#valueOf(String.toUpperCase())}.
+		 * Call {@link OutputType#valueOf(String)} after conversion to upper
+		 * case.
 		 * 
 		 * @param typeName
 		 *            the possible type name
@@ -103,8 +108,9 @@ public abstract class BasicOutput {
 		}
 
 		/**
-		 * Call {@link OutputType#valueOf(String.toUpperCase())} but return NULL
-		 * for NULL and empty instead of raising an exception.
+		 * Call {@link OutputType#valueOf(String)} after conversion to upper
+		 * case but return NULL for NULL and empty instead of raising an
+		 * exception.
 		 * 
 		 * @param typeName
 		 *            the possible type name
@@ -120,8 +126,9 @@ public abstract class BasicOutput {
 		}
 
 		/**
-		 * Call {@link OutputType#valueOf(String.toUpperCase())} but return NULL
-		 * in case of error instead of raising an exception.
+		 * Call {@link OutputType#valueOf(String)} after conversion to upper
+		 * case but return NULL in case of error instead of raising an
+		 * exception.
 		 * 
 		 * @param typeName
 		 *            the possible type name
@@ -171,15 +178,19 @@ public abstract class BasicOutput {
 			throws IOException {
 		storyPg = pg;
 
-		target = new File(target).getAbsolutePath();
-		File targetDir = new File(target).getParentFile();
-		String targetName = new File(target).getName();
-
-		String ext = getDefaultExtension(false);
-		if (ext != null && !ext.isEmpty()) {
-			if (targetName.toLowerCase().endsWith(ext)) {
-				targetName = targetName.substring(0,
-						targetName.length() - ext.length());
+		File targetDir = null;
+		String targetName = null;
+		if (target != null) {
+			target = new File(target).getAbsolutePath();
+			targetDir = new File(target).getParentFile();
+			targetName = new File(target).getName();
+
+			String ext = getDefaultExtension(false);
+			if (ext != null && !ext.isEmpty()) {
+				if (targetName.toLowerCase().endsWith(ext)) {
+					targetName = targetName.substring(0, targetName.length()
+							- ext.length());
+				}
 			}
 		}
 
@@ -230,9 +241,10 @@ public abstract class BasicOutput {
 	 * 
 	 * @param type
 	 *            the new type
-	 * @param infoCover
-	 *            TRUE to enable the creation of a .info file and a cover if
-	 *            possible
+	 * @param writeInfo
+	 *            TRUE to enable the creation of a .info file
+	 * @param writeCover
+	 *            TRUE to enable the creation of a cover if possible
 	 * 
 	 * @return this
 	 */