X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupportPara.java;h=1dbedc9cc326b0bdcb18e11753c8d78ccc611e22;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=2f657237a1acbb742e72757272ec3dc258a770ba;hpb=8d59ce0748baeeea0458bab49716ab4543aae439;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupportPara.java b/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
index 2f65723..1dbedc9 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
@@ -26,14 +26,10 @@ import be.nikiroo.utils.StringUtils;
  */
 public class BasicSupportPara {
 	// quote chars
-	private static char openQuote = Instance.getTrans().getCharacter(
-			StringId.OPEN_SINGLE_QUOTE);
-	private static char closeQuote = Instance.getTrans().getCharacter(
-			StringId.CLOSE_SINGLE_QUOTE);
-	private static char openDoubleQuote = Instance.getTrans().getCharacter(
-			StringId.OPEN_DOUBLE_QUOTE);
-	private static char closeDoubleQuote = Instance.getTrans().getCharacter(
-			StringId.CLOSE_DOUBLE_QUOTE);
+	private static char openQuote = Instance.getInstance().getTrans().getCharacter(StringId.OPEN_SINGLE_QUOTE);
+	private static char closeQuote = Instance.getInstance().getTrans().getCharacter(StringId.CLOSE_SINGLE_QUOTE);
+	private static char openDoubleQuote = Instance.getInstance().getTrans().getCharacter(StringId.OPEN_DOUBLE_QUOTE);
+	private static char closeDoubleQuote = Instance.getInstance().getTrans().getCharacter(StringId.CLOSE_DOUBLE_QUOTE);
 
 	// used by this class:
 	BasicSupportHelper bsHelper;
@@ -51,7 +47,8 @@ public class BasicSupportPara {
 	 * @param support
 	 *            the linked {@link BasicSupport}
 	 * @param source
-	 *            the source of the story
+	 *            the source of the story (for image lookup in the same path if
+	 *            the source is a file, can be NULL)
 	 * @param number
 	 *            the chapter number
 	 * @param name
@@ -63,7 +60,7 @@ public class BasicSupportPara {
 	 * @param html
 	 *            TRUE if the input content is in HTML mode
 	 * 
-	 * @return the {@link Chapter}
+	 * @return the {@link Chapter}, never NULL
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -76,9 +73,8 @@ public class BasicSupportPara {
 		// "Chapter 5: - Fun!" after the ": " was automatically added)
 		String chapterName = processPara(name, false)
 				.getContent().trim();
-		for (String lang : Instance.getConfig().getList(Config.CONF_CHAPTER)) {
-			String chapterWord = Instance.getConfig().getStringX(
-					Config.CONF_CHAPTER, lang);
+		for (String lang : Instance.getInstance().getConfig().getList(Config.CONF_CHAPTER)) {
+			String chapterWord = Instance.getInstance().getConfig().getStringX(Config.CONF_CHAPTER, lang);
 			if (chapterName.startsWith(chapterWord)) {
 				chapterName = chapterName.substring(chapterWord.length())
 						.trim();
@@ -206,7 +202,7 @@ public class BasicSupportPara {
 	 * @param html
 	 *            TRUE if the input content is in HTML mode
 	 * 
-	 * @return the processed {@link Paragraph}
+	 * @return the processed {@link Paragraph}, never NULL
 	 */
 	protected Paragraph processPara(String line, boolean html) {
 		if (html) {
@@ -415,10 +411,11 @@ public class BasicSupportPara {
 	 * Convert the given content into {@link Paragraph}s.
 	 * 
 	 * @param support
-	 *            the linked {@link BasicSupport} (can be NULL),
-	 *            used to download optional image content in []
+	 *            the linked {@link BasicSupport} (can be NULL), used to
+	 *            download optional image content in []
 	 * @param source
-	 *            the source URL of the story
+	 *            the source URL of the story (for image lookup in the same path
+	 *            if the source is a file, can be NULL)
 	 * @param content
 	 *            the textual content
 	 * @param html
@@ -426,7 +423,7 @@ public class BasicSupportPara {
 	 * @param pg
 	 *            the optional progress reporter
 	 * 
-	 * @return the {@link Paragraph}s
+	 * @return the {@link Paragraph}s (can be empty but never NULL)
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -507,16 +504,17 @@ public class BasicSupportPara {
 	 * Convert the given line into a single {@link Paragraph}.
 	 * 
 	 * @param support
-	 *            the linked {@link BasicSupport} (can be NULL),
-	 *            used to download optional image content in []
+	 *            the linked {@link BasicSupport} (can be NULL), used to
+	 *            download optional image content in []
 	 * @param source
-	 *            the source URL of the story
+	 *            the source URL of the story (for image lookup in the same path
+	 *            if the source is a file, can be NULL)
 	 * @param line
 	 *            the textual content of the paragraph
 	 * @param html
 	 *            TRUE if the input content is in HTML mode
 	 * 
-	 * @return the {@link Paragraph}
+	 * @return the {@link Paragraph}, never NULL
 	 */
 	protected Paragraph makeParagraph(BasicSupport support, URL source,
 			String line, boolean html) {