From cfb4377ced5bd794f5ebd1c689c495ced149b6b9 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Thu, 6 Dec 2012 23:22:39 +0900
Subject: [PATCH 1/1] =?utf8?q?MmdSource=E5=BB=83=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            | 76 ++++++++++++++------
 .../mikutoga/pmd/model/binio/PmdExporterBase.java  | 84 +++++++++++-----------
 .../mikutoga/pmd/model/binio/PmdExporterExt3.java  | 54 +++++++-------
 .../mikutoga/pmd/model/binio/PmdLoader.java        |  4 +-
 .../jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java   |  4 +-
 5 files changed, 128 insertions(+), 94 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98ec3fc..a47130c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
 
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.1.1</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
@@ -144,8 +144,14 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -167,7 +173,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.0</version>
                 <configuration>
                     <source>1.6</source>  <!-- for NetBeans IDE -->
                     <target>1.6</target>
@@ -182,7 +188,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.4</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -198,7 +204,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
+                <version>2.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -206,6 +212,7 @@
                           <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <artifactSet>
                                 <includes>
                                     <include>jp.sourceforge.mikutoga:togagem</include>
@@ -222,8 +229,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.4</version>
                 <configuration>
+                    <archiveBaseDirectory>.</archiveBaseDirectory>
                     <descriptors>
                         <descriptor>src/main/assembly/descriptor.xml</descriptor>
                     </descriptors>
@@ -233,7 +241,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>2.2.1</version>
                 <configuration>
                     <includePom>true</includePom>
                     <archive>
@@ -256,13 +264,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12.4</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -272,7 +280,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.2</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <locales>ja</locales>
@@ -284,14 +292,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <!-- config from property value -->
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -303,10 +311,27 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.2</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
+                    <!-- for Jenkins -->
+                    <findbugsXmlOutput>true</findbugsXmlOutput>
+                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+                    <xmlOutput>true</xmlOutput>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format> <!-- for Jenkins -->
+                    </formats>
                 </configuration>
             </plugin>
 
@@ -366,7 +391,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.6</version>
                 <configuration>
                     <linkOnly>true</linkOnly>
                     <offline>true</offline>
@@ -383,6 +408,7 @@
                             <report>project-team</report>
 <!--
                             <report>dependency-convergence</report>
+                            <report>dependency-info</report>
                             <report>dependency-management</report>
                             <report>distribution-management</report>
                             <report>issue-tracking</report>
@@ -398,7 +424,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9</version>
                 <configuration>
                     <skip>false</skip>
                     <notimestamp>true</notimestamp>
@@ -427,7 +453,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12.4</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -443,16 +469,20 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.1</version>
+                <version>2.5.2</version>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format> <!-- for Jenkins -->
+                    </formats>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <configuration>
                     <skip>false</skip>
                     <!-- config from property value -->
@@ -469,7 +499,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
@@ -490,11 +520,15 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.2</version>
                 <configuration>
                     <skip>false</skip>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
+                    <!-- for Jenkins -->
+                    <findbugsXmlOutput>true</findbugsXmlOutput>
+                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+                    <xmlOutput>true</xmlOutput>
                     <!-- excludeFilterFile/ -->
                 </configuration>
             </plugin>
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
index 6122d05..645265e 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
@@ -175,7 +175,7 @@ public class PmdExporterBase extends BinaryExporter{
         List<Vertex> vList = model.getVertexList();
 
         int vertexNum = vList.size();
-        dumpInt(vertexNum);
+        dumpLeInt(vertexNum);
 
         for(Vertex vertex : vList){
             dumpVertex(vertex);
@@ -231,15 +231,15 @@ public class PmdExporterBase extends BinaryExporter{
         for(Material material : materialList){
             surfaceNum += material.getSurfaceList().size();
         }
-        dumpInt(surfaceNum * 3);
+        dumpLeInt(surfaceNum * 3);
 
         Vertex[] triangle = new Vertex[3];
         for(Material material : materialList){
             for(Surface surface : material){
                 surface.getTriangle(triangle);
-                dumpShort(triangle[0].getSerialNumber());
-                dumpShort(triangle[1].getSerialNumber());
-                dumpShort(triangle[2].getSerialNumber());
+                dumpLeShort(triangle[0].getSerialNumber());
+                dumpLeShort(triangle[1].getSerialNumber());
+                dumpLeShort(triangle[2].getSerialNumber());
             }
         }
 
@@ -259,32 +259,32 @@ public class PmdExporterBase extends BinaryExporter{
         List<Material> materialList = model.getMaterialList();
 
         int materialNum = materialList.size();
-        dumpInt(materialNum);
+        dumpLeInt(materialNum);
 
         float[] rgba = new float[4];
 
         for(Material material : materialList){
             Color diffuse = material.getDiffuseColor();
             diffuse.getRGBComponents(rgba);
-            dumpFloat(rgba[0]);
-            dumpFloat(rgba[1]);
-            dumpFloat(rgba[2]);
-            dumpFloat(rgba[3]);
+            dumpLeFloat(rgba[0]);
+            dumpLeFloat(rgba[1]);
+            dumpLeFloat(rgba[2]);
+            dumpLeFloat(rgba[3]);
 
             float shininess = material.getShininess();
-            dumpFloat(shininess);
+            dumpLeFloat(shininess);
 
             Color specular = material.getSpecularColor();
             specular.getRGBComponents(rgba);
-            dumpFloat(rgba[0]);
-            dumpFloat(rgba[1]);
-            dumpFloat(rgba[2]);
+            dumpLeFloat(rgba[0]);
+            dumpLeFloat(rgba[1]);
+            dumpLeFloat(rgba[2]);
 
             Color ambient = material.getAmbientColor();
             ambient.getRGBComponents(rgba);
-            dumpFloat(rgba[0]);
-            dumpFloat(rgba[1]);
-            dumpFloat(rgba[2]);
+            dumpLeFloat(rgba[0]);
+            dumpLeFloat(rgba[1]);
+            dumpLeFloat(rgba[2]);
 
             ShadeInfo shade = material.getShadeInfo();
             int toonIdx = shade.getToonIndex();
@@ -297,7 +297,7 @@ public class PmdExporterBase extends BinaryExporter{
             dumpByte(edgeFlag);
 
             int surfaceNum = material.getSurfaceList().size();
-            dumpInt(surfaceNum * 3);
+            dumpLeInt(surfaceNum * 3);
 
             dumpShadeFileInfo(shade);
         }
@@ -347,7 +347,7 @@ public class PmdExporterBase extends BinaryExporter{
         List<BoneInfo> boneList = model.getBoneList();
 
         int boneNum = boneList.size();
-        dumpShort(boneNum);
+        dumpLeShort(boneNum);
 
         for(BoneInfo bone : boneList){
             dumpBone(bone);
@@ -371,22 +371,22 @@ public class PmdExporterBase extends BinaryExporter{
 
         BoneInfo prev = bone.getPrevBone();
         if(prev != null) dumpSerialIdAsShort(prev);
-        else             dumpShort(NOPREVBONE_ID);
+        else             dumpLeShort(NOPREVBONE_ID);
 
         BoneInfo next = bone.getNextBone();
         if(next != null) dumpSerialIdAsShort(next);
-        else             dumpShort(NONEXTBONE_ID);
+        else             dumpLeShort(NONEXTBONE_ID);
 
         BoneType type = bone.getBoneType();
         dumpByte(type.encode());
 
         if(type == BoneType.LINKEDROT){
             int ratio = bone.getRotationRatio();
-            dumpShort(ratio);
+            dumpLeShort(ratio);
         }else{
             BoneInfo ik = bone.getIKBone();
             if(ik != null) dumpSerialIdAsShort(ik);
-            else           dumpShort(NOIKBONE_ID);
+            else           dumpLeShort(NOIKBONE_ID);
         }
 
         MkPos3D position = bone.getPosition();
@@ -405,7 +405,7 @@ public class PmdExporterBase extends BinaryExporter{
         List<IKChain> ikChainList = model.getIKChainList();
 
         int ikNum = ikChainList.size();
-        dumpShort(ikNum);
+        dumpLeShort(ikNum);
 
         for(IKChain chain : ikChainList){
             dumpIKChain(chain);
@@ -438,8 +438,8 @@ public class PmdExporterBase extends BinaryExporter{
         int depth = chain.getIKDepth();
         float weight = chain.getIKWeight();
 
-        dumpShort(depth);
-        dumpFloat(weight);
+        dumpLeShort(depth);
+        dumpLeFloat(weight);
 
         for(int idx = 1; idx < boneNum; idx++){ // リストの2番目以降全て
             BoneInfo bone = boneList.get(idx);
@@ -469,20 +469,20 @@ public class PmdExporterBase extends BinaryExporter{
         }
 
         if(totalMorphPart <= 0){
-            dumpShort(0);
+            dumpLeShort(0);
             return;
         }else{
             totalMorphPart++;  // baseの分
-            dumpShort(totalMorphPart);
+            dumpLeShort(totalMorphPart);
         }
 
         dumpText("base", PmdLimits.MAXBYTES_MORPHNAME);
         int totalVertex = mergedMorphVertexList.size();
-        dumpInt(totalVertex);
+        dumpLeInt(totalVertex);
         dumpByte(MorphType.BASE.encode());
         for(MorphVertex morphVertex : mergedMorphVertexList){
             Vertex baseVertex = morphVertex.getBaseVertex();
-            dumpInt(baseVertex.getSerialNumber());
+            dumpLeInt(baseVertex.getSerialNumber());
             dumpPos3D(baseVertex.getPosition());
         }
 
@@ -493,11 +493,11 @@ public class PmdExporterBase extends BinaryExporter{
                 dumpText(part.getMorphName().getPrimaryText(),
                          PmdLimits.MAXBYTES_MORPHNAME );
                 List<MorphVertex> morphVertexList = part.getMorphVertexList();
-                dumpInt(morphVertexList.size());
+                dumpLeInt(morphVertexList.size());
                 dumpByte(part.getMorphType().encode());
 
                 for(MorphVertex morphVertex : morphVertexList){
-                    dumpInt(morphVertex.getSerialNumber());
+                    dumpLeInt(morphVertex.getSerialNumber());
                     dumpPos3D(morphVertex.getOffset());
                 }
             }
@@ -566,7 +566,7 @@ public class PmdExporterBase extends BinaryExporter{
                           PmdLimits.MAXBYTES_BONEGROUPNAME, LFFILLER );
             dispBoneNum += group.getBoneList().size();
         }
-        dumpInt(dispBoneNum);
+        dumpLeInt(dispBoneNum);
 
         for(BoneGroup group : groupList){
             if(group.isDefaultBoneGroup()) continue;
@@ -591,7 +591,7 @@ public class PmdExporterBase extends BinaryExporter{
     protected void dumpSerialIdAsShort(SerialNumbered obj)
             throws IOException{
         int serialId = obj.getSerialNumber();
-        dumpShort(serialId);
+        dumpLeShort(serialId);
         return;
     }
 
@@ -604,8 +604,8 @@ public class PmdExporterBase extends BinaryExporter{
         float xPos = (float) position.getXpos();
         float yPos = (float) position.getYpos();
 
-        dumpFloat(xPos);
-        dumpFloat(yPos);
+        dumpLeFloat(xPos);
+        dumpLeFloat(yPos);
 
         return;
     }
@@ -620,9 +620,9 @@ public class PmdExporterBase extends BinaryExporter{
         float yPos = (float) position.getYpos();
         float zPos = (float) position.getZpos();
 
-        dumpFloat(xPos);
-        dumpFloat(yPos);
-        dumpFloat(zPos);
+        dumpLeFloat(xPos);
+        dumpLeFloat(yPos);
+        dumpLeFloat(zPos);
 
         return;
     }
@@ -637,9 +637,9 @@ public class PmdExporterBase extends BinaryExporter{
         float yVal = (float) vector.getYVal();
         float zVal = (float) vector.getZVal();
 
-        dumpFloat(xVal);
-        dumpFloat(yVal);
-        dumpFloat(zVal);
+        dumpLeFloat(xVal);
+        dumpLeFloat(yVal);
+        dumpLeFloat(zVal);
 
         return;
     }
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java
index b496a54..173b1ab 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java
@@ -77,7 +77,7 @@ public class PmdExporterExt3 extends PmdExporterExt2{
             throws IOException, IllegalTextExportException{
         List<RigidInfo> rigidList = model.getRigidList();
         int rigidNum = rigidList.size();
-        dumpInt(rigidNum);
+        dumpLeInt(rigidNum);
 
         for(RigidInfo rigid : rigidList){
             dumpRigid(rigid);
@@ -101,9 +101,9 @@ public class PmdExporterExt3 extends PmdExporterExt2{
 
         BoneInfo linkedBone = rigid.getLinkedBone();
         if(linkedBone == null){
-            dumpShort(-1);
+            dumpLeShort(-1);
         }else{
-            dumpShort(linkedBone.getSerialNumber());
+            dumpLeShort(linkedBone.getSerialNumber());
         }
 
         RigidGroup group = rigid.getRigidGroup();
@@ -114,7 +114,7 @@ public class PmdExporterExt3 extends PmdExporterExt2{
             int serialId = throughGroup.getSerialNumber();
             mask &= ~(0x0001 << serialId);
         }
-        dumpShort(mask);
+        dumpLeShort(mask);
 
         dumpRigidShape(rigid.getRigidShape());
 
@@ -142,9 +142,9 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         float height = shape.getHeight();
         float depth = shape.getDepth();
 
-        dumpFloat(width);
-        dumpFloat(height);
-        dumpFloat(depth);
+        dumpLeFloat(width);
+        dumpLeFloat(height);
+        dumpLeFloat(depth);
 
         return;
     }
@@ -162,11 +162,11 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         float restitution = dynamics.getRestitution();
         float friction    = dynamics.getFriction();
 
-        dumpFloat(mass);
-        dumpFloat(dampPos);
-        dumpFloat(dampRot);
-        dumpFloat(restitution);
-        dumpFloat(friction);
+        dumpLeFloat(mass);
+        dumpLeFloat(dampPos);
+        dumpLeFloat(dampRot);
+        dumpLeFloat(restitution);
+        dumpLeFloat(friction);
 
         return;
     }
@@ -181,7 +181,7 @@ public class PmdExporterExt3 extends PmdExporterExt2{
             throws IOException, IllegalTextExportException{
         List<JointInfo> jointList = model.getJointList();
         int jointNum = jointList.size();
-        dumpInt(jointNum);
+        dumpLeInt(jointNum);
 
         for(JointInfo joint : jointList){
             dumpJoint(joint);
@@ -206,8 +206,8 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         RigidInfo rigidA = joint.getRigidA();
         RigidInfo rigidB = joint.getRigidB();
 
-        dumpInt(rigidA.getSerialNumber());
-        dumpInt(rigidB.getSerialNumber());
+        dumpLeInt(rigidA.getSerialNumber());
+        dumpLeInt(rigidB.getSerialNumber());
 
         dumpPos3D(joint.getPosition());
         dumpRad3d(joint.getRotation());
@@ -231,17 +231,17 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         float yFrom = range.getYFrom();
         float zFrom = range.getZFrom();
 
-        dumpFloat(xFrom);
-        dumpFloat(yFrom);
-        dumpFloat(zFrom);
+        dumpLeFloat(xFrom);
+        dumpLeFloat(yFrom);
+        dumpLeFloat(zFrom);
 
         float xTo = range.getXTo();
         float yTo = range.getYTo();
         float zTo = range.getZTo();
 
-        dumpFloat(xTo);
-        dumpFloat(yTo);
-        dumpFloat(zTo);
+        dumpLeFloat(xTo);
+        dumpLeFloat(yTo);
+        dumpLeFloat(zTo);
 
         return;
     }
@@ -256,9 +256,9 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         float yVal = rad.getYRad();
         float zVal = rad.getZRad();
 
-        dumpFloat(xVal);
-        dumpFloat(yVal);
-        dumpFloat(zVal);
+        dumpLeFloat(xVal);
+        dumpLeFloat(yVal);
+        dumpLeFloat(zVal);
 
         return;
     }
@@ -273,9 +273,9 @@ public class PmdExporterExt3 extends PmdExporterExt2{
         float yVal = deg.getYDeg();
         float zVal = deg.getZDeg();
 
-        dumpFloat(xVal);
-        dumpFloat(yVal);
-        dumpFloat(zVal);
+        dumpLeFloat(xVal);
+        dumpLeFloat(yVal);
+        dumpLeFloat(zVal);
 
         return;
     }
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 921cfed..8d1ca67 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
@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import jp.sourceforge.mikutoga.parser.MmdFormatException;
-import jp.sourceforge.mikutoga.parser.MmdSource;
+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(MmdSource source){
+    public PmdLoader(MmdInputStream 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 20d1192..6769b70 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
@@ -20,7 +20,7 @@ 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.MmdSource;
+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,7 +356,7 @@ public final class Pmd2Xml {
      */
     private static PmdModel pmdRead(InputStream is)
             throws IOException, MmdFormatException{
-        MmdSource source = new MmdSource(is);
+        MmdInputStream source = new MmdInputStream(is);
         PmdLoader loader = new PmdLoader(source);
 
         PmdModel model = loader.load();
-- 
2.11.0