From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Thu, 27 Dec 2012 12:45:32 +0000 (+0900)
Subject: MmdInputStream廃止
X-Git-Tag: fromMercurial~16
X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FPmd2XML.git;a=commitdiff_plain;h=b08edf7e9f7fa4372585b6e701c17096a56a8b38

MmdInputStream廃止
---

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java
index 8d1ca67..9a5f2ac 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java
@@ -8,10 +8,10 @@
 package jp.sourceforge.mikutoga.pmd.model.binio;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import jp.sourceforge.mikutoga.parser.MmdFormatException;
-import jp.sourceforge.mikutoga.parser.MmdInputStream;
 import jp.sourceforge.mikutoga.pmd.model.MorphPart;
 import jp.sourceforge.mikutoga.pmd.model.PmdModel;
 import jp.sourceforge.mikutoga.pmd.parser.PmdParser;
@@ -32,7 +32,7 @@ public class PmdLoader {
      * コンストラクタ。
      * @param source PMDファイル入力ソース
      */
-    public PmdLoader(MmdInputStream source){
+    public PmdLoader(InputStream source){
         super();
 
         this.model = new PmdModel();
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java b/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
index 6769b70..0dd61ee 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
@@ -20,7 +20,6 @@ import java.util.Properties;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 import jp.sourceforge.mikutoga.parser.MmdFormatException;
-import jp.sourceforge.mikutoga.parser.MmdInputStream;
 import jp.sourceforge.mikutoga.pmd.IllegalPmdDataException;
 import jp.sourceforge.mikutoga.pmd.model.PmdModel;
 import jp.sourceforge.mikutoga.pmd.model.binio.PmdExporter;
@@ -356,8 +355,7 @@ public final class Pmd2Xml {
      */
     private static PmdModel pmdRead(InputStream is)
             throws IOException, MmdFormatException{
-        MmdInputStream source = new MmdInputStream(is);
-        PmdLoader loader = new PmdLoader(source);
+        PmdLoader loader = new PmdLoader(is);
 
         PmdModel model = loader.load();