From dfb9a7edcac6b0ec05449ae000606c1e956e4a56 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 23 Aug 2011 08:23:08 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E4=B8=AD?=
 =?utf8?q?=E9=96=93=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E7=94=9F=E6=88=90?=
 =?utf8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=8C=E5=A4=B1=E6=95=97?=
 =?utf8?q?=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AF=E4=BE=8B=E5=A4=96?=
 =?utf8?q?=E3=81=A7=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/conv/ConvertToVideoHook.java | 57 ++++++++--------------
 frontend/src/saccubus/worker/Convert.java          |  2 +-
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/frontend/src/saccubus/conv/ConvertToVideoHook.java b/frontend/src/saccubus/conv/ConvertToVideoHook.java
index c0c3038..4991c29 100644
--- a/frontend/src/saccubus/conv/ConvertToVideoHook.java
+++ b/frontend/src/saccubus/conv/ConvertToVideoHook.java
@@ -1,8 +1,6 @@
 package saccubus.conv;
 
 import java.io.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.xml.sax.*;
 import javax.xml.parsers.*;
 
@@ -26,41 +24,28 @@ import javax.xml.parsers.*;
  * @author 未入力
  * @version 1.0
  */
-public class ConvertToVideoHook {
+public final class ConvertToVideoHook {
 
-    private static final Logger logger = Logger.getLogger(ConvertToVideoHook.class.getName());
+    private ConvertToVideoHook() {
+    }
 
-	public static boolean convert(File file, File out, String ng_id,
-			String ng_word) {
-		try {
-			Packet packet = new Packet();
-			// SAXパーサーファクトリを生成
-			SAXParserFactory spfactory = SAXParserFactory.newInstance();
-			// SAXパーサーを生成
-			SAXParser parser = spfactory.newSAXParser();
-			// XMLファイルを指定されたデフォルトハンドラーで処理します
-			NicoXMLReader nico_reader = null;
-			try {
-				nico_reader = new NicoXMLReader(packet, ng_id, ng_word);
-			} catch (java.util.regex.PatternSyntaxException e) {
-				logger.log(Level.SEVERE, null, e);
-				return false;
-			}
-			if (nico_reader != null) {
-				parser.parse(file, nico_reader);
-			}
-			// 変換結果の書き込み
-			FileOutputStream fos = new FileOutputStream(out);
-			packet.write(fos);
-			fos.close();
-			return true;
-		} catch (IOException ex) {
-			logger.log(Level.SEVERE, null, ex);
-		} catch (SAXException ex) {
-			logger.log(Level.SEVERE, null, ex);
-		} catch (ParserConfigurationException ex) {
-			logger.log(Level.SEVERE, null, ex);
-		}
-		return false;
+    public static void convert(File file, File out, String ng_id, String ng_word) throws IOException {
+        try {
+            final Packet packet = new Packet();
+            // SAXパーサーファクトリを生成
+            final SAXParserFactory spfactory = SAXParserFactory.newInstance();
+            // SAXパーサーを生成
+            final SAXParser parser = spfactory.newSAXParser();
+            // XMLファイルを指定されたデフォルトハンドラーで処理します
+            final NicoXMLReader nico_reader = new NicoXMLReader(packet, ng_id, ng_word);
+
+            parser.parse(file, nico_reader);
+
+            try (final FileOutputStream fos = new FileOutputStream(out)) {
+                packet.write(fos);
+            }
+        } catch (IOException | SAXException | ParserConfigurationException ex) {
+            throw new IOException("コメント変換に失敗。ファイル名に使用できない文字が含まれているか正規表現の間違い？", ex);
+        }
 	}
 }
diff --git a/frontend/src/saccubus/worker/Convert.java b/frontend/src/saccubus/worker/Convert.java
index 2cd23b1..a89090b 100644
--- a/frontend/src/saccubus/worker/Convert.java
+++ b/frontend/src/saccubus/worker/Convert.java
@@ -75,7 +75,7 @@ public class Convert extends SwingWorker<ConvertResult, ConvertProgress> {
                 transformedComment = File.createTempFile("vhk", ".tmp", profile.getTempDir());
                 final HideCondition hide = profile.getNgSetting();
                 publish(new ConvertProgress("コメントの中間ファイルへの変換中"));
-                final boolean conv = ConvertToVideoHook.convert(commentFile, transformedComment, hide.getId(), hide.
+                ConvertToVideoHook.convert(commentFile, transformedComment, hide.getId(), hide.
                         getWord());
                 if (!conv) {
                     throw new IOException("コメント変換に失敗。ファイル名に使用できない文字が含まれているか正規表現の間違い？");
-- 
2.11.0