From 51ee6546e4c70583f31f357636a6c9bf9991c0cd Mon Sep 17 00:00:00 2001 From: Olyutorskii Date: Thu, 27 Dec 2012 21:45:44 +0900 Subject: [PATCH] =?utf8?q?MmdInputStream=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/jp/sourceforge/mikutoga/vmd/model/binio/VmdLoader.java | 4 ++-- src/main/java/jp/sourceforge/mikutoga/vmd2xml/Vmd2Xml.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/jp/sourceforge/mikutoga/vmd/model/binio/VmdLoader.java b/src/main/java/jp/sourceforge/mikutoga/vmd/model/binio/VmdLoader.java index 20add65..35c9ad8 100644 --- a/src/main/java/jp/sourceforge/mikutoga/vmd/model/binio/VmdLoader.java +++ b/src/main/java/jp/sourceforge/mikutoga/vmd/model/binio/VmdLoader.java @@ -8,8 +8,8 @@ package jp.sourceforge.mikutoga.vmd.model.binio; import java.io.IOException; +import java.io.InputStream; import jp.sourceforge.mikutoga.parser.MmdFormatException; -import jp.sourceforge.mikutoga.parser.MmdInputStream; import jp.sourceforge.mikutoga.vmd.model.VmdMotion; import jp.sourceforge.mikutoga.vmd.parser.VmdParser; @@ -35,7 +35,7 @@ public final class VmdLoader { * @throws IOException 入力エラー * @throws MmdFormatException VMDファイルフォーマットの異常を検出 */ - public static VmdMotion load(MmdInputStream source) + public static VmdMotion load(InputStream source) throws IOException, MmdFormatException { VmdParser parser = new VmdParser(source); diff --git a/src/main/java/jp/sourceforge/mikutoga/vmd2xml/Vmd2Xml.java b/src/main/java/jp/sourceforge/mikutoga/vmd2xml/Vmd2Xml.java index c042d6a..3e2a831 100644 --- a/src/main/java/jp/sourceforge/mikutoga/vmd2xml/Vmd2Xml.java +++ b/src/main/java/jp/sourceforge/mikutoga/vmd2xml/Vmd2Xml.java @@ -21,7 +21,6 @@ import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import jp.sourceforge.mikutoga.binio.FileUtils; import jp.sourceforge.mikutoga.parser.MmdFormatException; -import jp.sourceforge.mikutoga.parser.MmdInputStream; import jp.sourceforge.mikutoga.vmd.IllegalVmdDataException; import jp.sourceforge.mikutoga.vmd.model.VmdMotion; import jp.sourceforge.mikutoga.vmd.model.binio.VmdExporter; @@ -308,8 +307,7 @@ public final class Vmd2Xml { */ private static VmdMotion vmdRead(InputStream is) throws IOException, MmdFormatException{ - MmdInputStream source = new MmdInputStream(is); - VmdMotion vmdMotion = VmdLoader.load(source); + VmdMotion vmdMotion = VmdLoader.load(is); return vmdMotion; } -- 2.11.0