From: seraphy <seraphy@5b6e9025-a2e8-4882-b233-f889982098c5>
Date: Sat, 23 Nov 2013 15:22:27 +0000 (+0000)
Subject: ・ AboutボックスでHTMLが表示できなかった問題の修正
X-Git-Tag: ver0.996~14
X-Git-Url: http://git.osdn.net/view?p=charactermanaj%2FCharacterManaJ.git;a=commitdiff_plain;h=dfb3c6b378be9ee2aed59c8d6afdfc5f0e098d84

・ AboutボックスでHTMLが表示できなかった問題の修正
・ 外部リソースからはAboutのテキストを読み込まないように修正

git-svn-id: https://svn.sourceforge.jp/svnroot/charactermanaj/trunk@80 5b6e9025-a2e8-4882-b233-f889982098c5
---

diff --git a/resources/appinfo/about.html b/resources/appinfo/about.html
index 4b23292..a11f13c 100644
--- a/resources/appinfo/about.html
+++ b/resources/appinfo/about.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <style type="text/css">
 <!--
 p {
@@ -76,7 +76,7 @@ h2 {
 <p>ãã­ã£ã©ã¯ã¿ã¼ãªãã¨ãJãã¯ãªã¼ãã³ã½ã¼ã¹ã½ããã¦ã§ã¢ã§ããã½ã¼ã¹ã³ã¼ãã¯ãThe Apache License Version 2.0ãã§ãã</p>
 <p><font color="red">æ¬ã½ããã¦ã§ã¢ã¯å®å¨ã«ç¡ä¿è¨¼ã§ãã</font>æ¬ã½ããã¦ã§ã¢ã¯ãç¾ç¶ã®ã¾ã¾ãããã¤æç¤ºãæé»ã§ããããåãããä¸åã®ä¿è¨¼ãä»ããã«æä¾ããã¾ãã</p>
 <p><a href="http://sourceforge.jp/projects/charactermanaj/releases/">ããããææ°ãªãªã¼ã¹</a> ã
-ããã³<a href="http://sourceforge.jp/projects/charactermanaj/svn/view/tags/?root=charactermanaj">ææ°ãªãªã¼ã¹ã®ã½ã¼ã¹ã³ã¼ã</a>ãåå¾ãããã¨ãã§ãã¾ãã</p>
+ããã³<a href="http://sourceforge.jp/projects/charactermanaj/scm/svn/">ææ°ãªãªã¼ã¹ã®ã½ã¼ã¹ã³ã¼ã</a>ãåå¾ãããã¨ãã§ãã¾ãã</p>
 <p>åç¨å©ç¨ã§ããããå¦ããåãããã©ãªãã§ããèªç±ã«ãä½¿ãããã ãã¾ããç»é²ãè²»ç¨ã¯ä¸åå¿è¦ããã¾ãããåéå¸ãèªç±ã«ãªãã£ã¦ãã¾ãã¾ããã</p> 
 <p></p>
 <p>ãã®ã¢ããªã±ã¼ã·ã§ã³èªèº«(javaã³ã¼ã)ã¯<a href="http://hp.vector.co.jp/authors/VA017626/">seraphy</a>ã«ãã£ã¦æ¸ããã¾ããã<br>
diff --git a/resources/appinfo/about_ja.html b/resources/appinfo/about_ja.html
index 6f76fed..135a46a 100644
--- a/resources/appinfo/about_ja.html
+++ b/resources/appinfo/about_ja.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <style type="text/css">
 <!--
 p {
@@ -30,7 +30,7 @@ h2 {
 <p>ãã­ã£ã©ã¯ã¿ã¼ãªãã¨ãJãã¯ãªã¼ãã³ã½ã¼ã¹ã½ããã¦ã§ã¢ã§ããã½ã¼ã¹ã³ã¼ãã¯ãThe Apache License Version 2.0ãã§ãã</p>
 <p><font color="red">æ¬ã½ããã¦ã§ã¢ã¯å®å¨ã«ç¡ä¿è¨¼ã§ãã</font>æ¬ã½ããã¦ã§ã¢ã¯ãç¾ç¶ã®ã¾ã¾ãããã¤æç¤ºãæé»ã§ããããåãããä¸åã®ä¿è¨¼ãä»ããã«æä¾ããã¾ãã</p>
 <p><a href="http://sourceforge.jp/projects/charactermanaj/releases/">ããããææ°ãªãªã¼ã¹</a> ã
-ããã³<a href="http://sourceforge.jp/projects/charactermanaj/svn/view/tags/?root=charactermanaj">ææ°ãªãªã¼ã¹ã®ã½ã¼ã¹ã³ã¼ã</a>ãåå¾ãããã¨ãã§ãã¾ãã</p>
+ããã³<a href="http://sourceforge.jp/projects/charactermanaj/scm/svn/">ææ°ãªãªã¼ã¹ã®ã½ã¼ã¹ã³ã¼ã</a>ãåå¾ãããã¨ãã§ãã¾ãã</p>
 <p>åç¨å©ç¨ã§ããããå¦ããåãããã©ãªãã§ããèªç±ã«ãä½¿ãããã ãã¾ããç»é²ãè²»ç¨ã¯ä¸åå¿è¦ããã¾ãããåéå¸ãèªç±ã«ãªãã£ã¦ãã¾ãã¾ããã</p> 
 <p></p>
 <p>ãã®ã¢ããªã±ã¼ã·ã§ã³èªèº«(javaã³ã¼ã)ã¯<a href="http://hp.vector.co.jp/authors/VA017626/">seraphy</a>ã«ãã£ã¦æ¸ããã¾ããã<br>
diff --git a/src/charactermanaj/ui/AboutBox.java b/src/charactermanaj/ui/AboutBox.java
index 19a1515..9cb6546 100644
--- a/src/charactermanaj/ui/AboutBox.java
+++ b/src/charactermanaj/ui/AboutBox.java
@@ -6,6 +6,7 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
+import java.io.StringReader;
 import java.io.Writer;
 import java.net.URL;
 import java.nio.charset.Charset;
@@ -14,6 +15,8 @@ import java.util.Enumeration;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -29,12 +32,14 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
 
 import charactermanaj.model.AppConfig;
 import charactermanaj.util.DesktopUtilities;
 import charactermanaj.util.DirectoryConfig;
 import charactermanaj.util.ErrorMessageHelper;
-import charactermanaj.util.LocalizedResourceTextLoader;
+import charactermanaj.util.LocalizedTextResource;
 import charactermanaj.util.SystemUtil;
 
 
@@ -44,7 +49,12 @@ import charactermanaj.util.SystemUtil;
  * @author seraphy
  */
 public class AboutBox {
-	
+
+	/**
+	 * ã­ã¬ã¼
+	 */
+	private static Logger logger = Logger.getLogger(AboutBox.class.getName());
+
 	private JFrame parent;
 	
 	public AboutBox(JFrame parent) {
@@ -87,7 +97,15 @@ public class AboutBox {
 	}
 	
 	protected JPanel createAboutPanel() {
-		String message = LocalizedResourceTextLoader.getInstance().getText("appinfo/about.html", Charset.forName("UTF-8"));
+		LocalizedTextResource textResource = new LocalizedTextResource() {
+			@Override
+			protected URL getResource(String resourceName) {
+				return getClass().getClassLoader().getResource(resourceName);
+			}
+		};
+
+		String message = textResource.getText("appinfo/about.html",
+				Charset.forName("UTF-8"));
 
 		AppConfig appConfig = AppConfig.getInstance();
 
@@ -120,7 +138,26 @@ public class AboutBox {
 		editorPane.setEditable(false);
 		editorPane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
 		editorPane.setContentType("text/html");
-		editorPane.setText(message);
+
+		// HTMLä¸ã®charsetã®æå®ãç¡è¦ãã.
+		Document doc = editorPane.getDocument();
+		doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE);
+
+		// editorPane.setText(message);
+		// HTMLä¸ã®content-typeãç¡è¦ããè¨­å®ã¯readæã®ã¿æå¹ã®ãããªã®ã§readãä½¿ã.
+		EditorKit editorKit = editorPane.getEditorKit();
+		try {
+			StringReader rd = new StringReader(message);
+			try {
+				editorKit.read(rd, doc, 0);
+
+			} finally {
+				rd.close();
+			}
+		} catch (Exception ex) {
+			logger.log(Level.SEVERE, ex.toString(), ex);
+		}
+
 		editorPane.setSelectionStart(0);
 		editorPane.setSelectionEnd(0);
 		aboutPanel.add(new JScrollPane(editorPane), BorderLayout.CENTER);
@@ -168,7 +205,7 @@ public class AboutBox {
 		
 		buf.append("<h2>Character Database</h2>");
 		buf.append("<table border=\"1\">");
-		buf.append("<tr><td>User</td>");
+		buf.append("<tr><td>Location</td>");
 		buf.append("<td>" + escape(charactersDir) + "</td></tr>");
 		buf.append("</table>");
 		
@@ -261,7 +298,7 @@ public class AboutBox {
 		}
 
 		// HTMLã¨ãã¦æå­åãè¿ã.
-		
+
 		buf.append("</html>");
 		return buf.toString();
 	}
diff --git a/src/charactermanaj/util/LocalizedResourceTextLoader.java b/src/charactermanaj/util/LocalizedResourceTextLoader.java
index c5fd936..38adee8 100644
--- a/src/charactermanaj/util/LocalizedResourceTextLoader.java
+++ b/src/charactermanaj/util/LocalizedResourceTextLoader.java
@@ -1,9 +1,5 @@
 package charactermanaj.util;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Locale;
@@ -11,13 +7,21 @@ import java.util.Locale;
 
 /**
  * ãªã½ã¼ã¹ããã­ã¼ã«ã©ã¤ãºããããã­ã¹ããåå¾ãã.<br>
+ * 
  * @author seraphy
- *
+ * 
  */
 public class LocalizedResourceTextLoader extends ResourceLoader {
 
 	private static final LocalizedResourceTextLoader inst = new LocalizedResourceTextLoader();
 	
+	private LocalizedTextResource textResource = new LocalizedTextResource() {
+		@Override
+		protected URL getResource(String resourceName) {
+			return LocalizedResourceTextLoader.this.getResource(resourceName);
+		}
+	};
+
 	private LocalizedResourceTextLoader() {
 		super();
 	}
@@ -30,82 +34,18 @@ public class LocalizedResourceTextLoader extends ResourceLoader {
 	 * ãªã½ã¼ã¹åãæå®ãã¦ããã­ã¹ããã¡ã¤ã«ãèª­ã¿è¾¼ãã§ããã®æå­åãè¿ã.<br>
 	 * ãªã½ã¼ã¹ã¯ç¾å¨ã®ããã©ã«ãã­ã±ã¼ã«ãåªåã§æ¤ç´¢ããã¾ã.<br>
 	 * ãã¡ã¤ã«ã¨ã³ã³ã¼ãã£ã³ã°ãå¼æ°csã§æå®ãã.<br>
-	 * @param name ãªã½ã¼ã¹å
-	 * @param cs ãã¡ã¤ã«ã®ã¨ã³ã³ã¼ãã£ã³ã°
+	 * 
+	 * @param name
+	 *            ãªã½ã¼ã¹å
+	 * @param cs
+	 *            ãã¡ã¤ã«ã®ã¨ã³ã³ã¼ãã£ã³ã°
 	 * @return ãã¡ã¤ã«ã®åå®¹(ãã­ã¹ã)
 	 */
 	public String getText(String name, Charset cs) {
-		return getText(name, cs, Locale.getDefault());
+		return textResource.getText(name, cs);
 	}
 
 	public String getText(String name, Charset cs, Locale locale) {
-		if (name == null || name.length() == 0 || cs == null || locale == null) {
-			throw new IllegalArgumentException();
-		}
-		
-		String language = locale.getLanguage();
-		String country = locale.getCountry();
-		String variant = locale.getVariant();
-
-		int extpos = name.lastIndexOf(".");
-		int folderpos = name.lastIndexOf("/");
-		
-		String basename;
-		String ext;
-		if (folderpos > extpos) {
-			basename = name;
-			ext = "";
-		} else {
-			basename = name.substring(0, extpos);
-			ext = name.substring(extpos);
-		}
-		
-		String[] resourceNamesStr = {
-			basename + "_" + language + "_" + country + "_" + variant + ext,
-			basename + "_" + language + "_" + country + ext,
-			basename + "_" + language + ext,
-			basename + ext,
-		};
-
-		ResourceNames resourceNames = new ResourceNames(resourceNamesStr);
-		String text = loadText(resourceNames, cs);
-		if (text == null) {
-			throw new RuntimeException("resource not found: " + resourceNames);
-		}
-		return text;
-	}
-
-	protected String loadText(ResourceNames resourceNames, Charset cs) {
-		if (resourceNames == null || cs == null) {
-			throw new IllegalArgumentException();
-		}
-
-		for (String resourceName : resourceNames) {
-			URL url = getResource(resourceName);
-			if (url == null) {
-				continue;
-			}
-			StringBuilder buf = new StringBuilder();
-			try {
-				InputStream is = url.openStream();
-				try {
-					BufferedReader rd = new BufferedReader(new InputStreamReader(is, cs));
-					try {
-						int ch;
-						while ((ch = rd.read()) != -1) {
-							buf.append((char) ch);
-						}
-					} finally {
-						rd.close();
-					}
-				} finally {
-					is.close();
-				}
-			} catch (IOException ex) {
-				throw new RuntimeException("resource loading error: " + ex, ex);
-			}
-			return buf.toString();
-		}
-		return null;
+		return textResource.getText(name, cs, locale);
 	}
 }
diff --git a/src/charactermanaj/util/LocalizedTextResource.java b/src/charactermanaj/util/LocalizedTextResource.java
new file mode 100644
index 0000000..f3bdd6e
--- /dev/null
+++ b/src/charactermanaj/util/LocalizedTextResource.java
@@ -0,0 +1,152 @@
+package charactermanaj.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
+/**
+ * ãªã½ã¼ã¹åãæå®ãã¦ã­ã¼ã«ã©ã¤ãºããããã­ã¹ããåå¾ããããã®æ½è±¡å®è£.<br>
+ * ãªã½ã¼ã¹ã®åå¾é¨ã¯æ´¾çã¯ã©ã¹ã«ã¦å®è£ããå¿è¦ããã.<br>
+ * 
+ * @author seraphy
+ */
+public abstract class LocalizedTextResource {
+
+	/**
+	 * ãªã½ã¼ã¹åãæå®ãã¦ããã­ã¹ããã¡ã¤ã«ãèª­ã¿è¾¼ãã§ããã®æå­åãè¿ã.<br>
+	 * ãªã½ã¼ã¹ã¯ç¾å¨ã®ããã©ã«ãã­ã±ã¼ã«ãåªåã§æ¤ç´¢ããã¾ã.<br>
+	 * ãã¡ã¤ã«ã¨ã³ã³ã¼ãã£ã³ã°ãå¼æ°csã§æå®ãã.<br>
+	 * 
+	 * @param name
+	 *            ãªã½ã¼ã¹å
+	 * @param cs
+	 *            ãã¡ã¤ã«ã®ã¨ã³ã³ã¼ãã£ã³ã°
+	 * @return ãã¡ã¤ã«ã®åå®¹(ãã­ã¹ã)
+	 */
+	public String getText(String name, Charset cs) {
+		return getText(name, cs, Locale.getDefault());
+	}
+
+	/**
+	 * ãªã½ã¼ã¹åã¨æå­ã³ã¼ããæå®ãã¦ãã­ã±ã¼ã«ã«å¯¾å¿ããæå­åãåå¾ãã.<br>
+	 * ãªã½ã¼ã¹ããªããã°å®è¡æä¾å¤ãçºçãã.
+	 * 
+	 * @param name
+	 *            ãªã½ã¼ã¹å
+	 * @param cs
+	 *            æå­ã³ã¼ã
+	 * @param locale
+	 *            åå¾ããã­ã±ã¼ã«
+	 * @return ãã­ã¹ã
+	 */
+	public String getText(String name, Charset cs, Locale locale) {
+		ResourceNames resourceNames = createResourceNames(name, locale);
+		String text = loadText(resourceNames, cs);
+		if (text == null) {
+			throw new RuntimeException("resource not found: " + resourceNames);
+		}
+		return text;
+	}
+
+	/**
+	 * ãªã½ã¼ã¹åã¨ã­ã±ã¼ã«ãæå®ãã¦èª­ã¿è¾¼ãå®ãªã½ã¼ã¹åã®ã°ã«ã¼ããä½æãã¦è¿ã.
+	 * 
+	 * @param name
+	 *            ãªã½ã¼ã¹å
+	 * @param locale
+	 *            ã­ã±ã¼ã«
+	 * @return ãªã½ã¼ã¹åã°ã«ã¼ã(åªåé )
+	 */
+	protected ResourceNames createResourceNames(String name, Locale locale) {
+		if (name == null || name.length() == 0 || locale == null) {
+			throw new IllegalArgumentException();
+		}
+
+		String language = locale.getLanguage();
+		String country = locale.getCountry();
+		String variant = locale.getVariant();
+
+		int extpos = name.lastIndexOf(".");
+		int folderpos = name.lastIndexOf("/");
+
+		String basename;
+		String ext;
+		if (folderpos > extpos) {
+			basename = name;
+			ext = "";
+		} else {
+			basename = name.substring(0, extpos);
+			ext = name.substring(extpos);
+		}
+
+		String[] resourceNamesStr = {
+				basename + "_" + language + "_" + country + "_" + variant + ext,
+				basename + "_" + language + "_" + country + ext,
+				basename + "_" + language + ext, basename + ext,};
+
+		return new ResourceNames(resourceNamesStr);
+	}
+
+	/**
+	 * ãªã½ã¼ã¹åã°ã«ã¼ããæå®ãã¦ããªã½ã¼ã¹ããã­ã¹ãã¨ãã¦åå¾ãã.<br>
+	 * ãªã½ã¼ã¹åã°ã«ã¼ãã®åªåé ã«ãªã½ã¼ã¹ã®åå¾ãè©¦ã¿ã¦æåã«æåãããã®ãè¿ã.<br>
+	 * ã²ã¨ã¤ãæåããªããã°nullãè¿ããã.<br>
+	 * 
+	 * @param resourceNames
+	 *            ãªã½ã¼ã¹åã°ã«ã¼ã
+	 * @param cs
+	 *            æå­ã³ã¼ã
+	 * @return ãªã½ã¼ã¹ã®ãã­ã¹ã
+	 */
+	protected String loadText(ResourceNames resourceNames, Charset cs) {
+		if (resourceNames == null || cs == null) {
+			throw new IllegalArgumentException();
+		}
+
+		for (String resourceName : resourceNames) {
+			URL url = getResource(resourceName);
+			if (url == null) {
+				// ãªã½ã¼ã¹ããªããã°æ¬¡ã®åè£ã¸ã¹ã­ãããã.
+				continue;
+			}
+			StringBuilder buf = new StringBuilder();
+			try {
+				InputStream is = url.openStream();
+				try {
+					BufferedReader rd = new BufferedReader(
+							new InputStreamReader(is, cs));
+					try {
+						int ch;
+						while ((ch = rd.read()) != -1) {
+							buf.append((char) ch);
+						}
+					} finally {
+						rd.close();
+					}
+				} finally {
+					is.close();
+				}
+			} catch (IOException ex) {
+				throw new RuntimeException("resource loading error: " + ex, ex);
+			}
+			// 1ã¤ã§ãæåããã°ãããã§çµäºãã.
+			return buf.toString();
+		}
+		// ä¸ã¤ãæåããªãã£ãå ´å
+		return null;
+	}
+
+	/**
+	 * ãªã½ã¼ã¹åãããªã½ã¼ã¹ãåå¾ãã.<br>
+	 * å­å¨ããªããã°nullãè¿ã.<br>
+	 * 
+	 * @param resourceName
+	 *            ãªã½ã¼ã¹å
+	 * @return ãªã½ã¼ã¹ãã¾ãã¯null
+	 */
+	protected abstract URL getResource(String resourceName);
+}
diff --git a/src/charactermanaj/util/SetupLocalization.java b/src/charactermanaj/util/SetupLocalization.java
index 8b1ec15..af16b45 100644
--- a/src/charactermanaj/util/SetupLocalization.java
+++ b/src/charactermanaj/util/SetupLocalization.java
@@ -54,8 +54,7 @@ public class SetupLocalization extends ResourceLoader {
 		ArrayList<String> resources = new ArrayList<String>();
 
 		// ãªã½ã¼ã¹ã¨ãã¦ã³ãã¼å¯¾è±¡ã¨ããããã±ã¼ã¸å
-		String[] names = new String[]{"appinfo", "languages", "menu",
-				"template"};
+		String[] names = new String[]{"languages", "menu", "template"};
 
 		ClassLoader cl = getClass().getClassLoader();
 
