PMX対応に先立ちメソッド名の修正

diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/CommonParser.java b/src/main/java/jp/sourceforge/mikutoga/parser/CommonParser.java
index 1dc8934..0faa85e 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/parser/CommonParser.java
+++ b/src/main/java/jp/sourceforge/mikutoga/parser/CommonParser.java
@@ -283,7 +283,7 @@ public class CommonParser {
      * @throws MmdEofException 読み込む途中でストリーム終端に達した。
      * @throws MmdFormatException 不正な文字エンコーディングが検出された。
      */
-    protected String parseZeroTermString(int maxlen)
+    protected String parseZeroTermWin31J(int maxlen)
             throws IOException,
                    IllegalArgumentException,
                    MmdEofException,

diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java
index c505d67..b82a118 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java
@@ -222,16 +222,16 @@ public class PmdParserBase extends CommonParser {
      * @throws MmdFormatException フォーマットエラー
      */
     private void parsePmdHeader() throws IOException, MmdFormatException{
-        String magic = parseZeroTermString(MAGIC_SZ);
+        String magic = parseZeroTermWin31J(MAGIC_SZ);
         if( ! magic.equals(MAGIC) ){
             throw new MmdFormatException("unrecognized magic data");
         }
 
         float ver = parseFloat();
         String modelName   =
-                parseZeroTermString(PmdLimits.MAXBYTES_MODELNAME);
+                parseZeroTermWin31J(PmdLimits.MAXBYTES_MODELNAME);
         String description =
-                parseZeroTermString(PmdLimits.MAXBYTES_MODELDESC);
+                parseZeroTermWin31J(PmdLimits.MAXBYTES_MODELDESC);
         description = description.replace(CRLF, LF);
 
         if(this.basicHandler != null){
@@ -363,7 +363,7 @@ public class PmdParserBase extends CommonParser {
             boolean hasEdge = parseBoolean();
             int surfaceCount = parseInteger();
             String shadingFile =
-                    parseZeroTermString(PmdLimits.MAXBYTES_TEXTUREFILENAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_TEXTUREFILENAME);
             String[] splitted = splitShadingFileInfo(shadingFile);
             String textureFile = splitted[0];
             String sphereFile = splitted[1];
@@ -397,7 +397,7 @@ public class PmdParserBase extends CommonParser {
 
         for(int ct = 0; ct < this.boneCount; ct++){
             String boneName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_BONENAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_BONENAME);
             int parentId = parseUShortAsInteger();
             int tailId = parseUShortAsInteger();
             byte boneKind = parseByte();
@@ -497,7 +497,7 @@ public class PmdParserBase extends CommonParser {
 
         for(int ct = 0; ct < this.morphCount; ct++){
             String morphName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_MORPHNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_MORPHNAME);
             int vertexCount = parseInteger();
             byte morphType = parseByte();
 
@@ -597,7 +597,7 @@ public class PmdParserBase extends CommonParser {
 
         for(int ct = 0; ct < this.boneGroupCount; ct++){
             String groupName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_BONEGROUPNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_BONEGROUPNAME);
             groupName = chopLastLF(groupName);
             this.boneHandler.pmdBoneGroupInfo(groupName);
 

diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java
index 26fd3c8..8368ab7 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java
+++ b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java
@@ -75,9 +75,9 @@ public class PmdParserExt1 extends PmdParserBase {
         if( ! this.hasEnglishInfo ) return;
 
         String modelName =
-                parseZeroTermString(PmdLimits.MAXBYTES_MODELNAME);
+                parseZeroTermWin31J(PmdLimits.MAXBYTES_MODELNAME);
         String description =
-                parseZeroTermString(PmdLimits.MAXBYTES_MODELDESC);
+                parseZeroTermWin31J(PmdLimits.MAXBYTES_MODELDESC);
         description = description.replace(CRLF, LF);
 
         if(this.engHandler != null){
@@ -105,7 +105,7 @@ public class PmdParserExt1 extends PmdParserBase {
 
         for(int ct = 0; ct < boneNum; ct++){
             String boneName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_BONENAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_BONENAME);
             this.engHandler.pmdEngBoneInfo(boneName);
 
             this.engHandler.loopNext(PmdEngHandler.ENGBONE_LIST);
@@ -134,7 +134,7 @@ public class PmdParserExt1 extends PmdParserBase {
 
         for(int ct = 0; ct < morphNum; ct++){
             String morphName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_MORPHNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_MORPHNAME);
             this.engHandler.pmdEngMorphInfo(morphName);
 
             this.engHandler.loopNext(PmdEngHandler.ENGMORPH_LIST);
@@ -163,7 +163,7 @@ public class PmdParserExt1 extends PmdParserBase {
 
         for(int ct = 0; ct < groupNum; ct++){
             String boneGroupName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_BONEGROUPNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_BONEGROUPNAME);
             this.engHandler.pmdEngBoneGroupInfo(boneGroupName);
 
             this.engHandler.loopNext(PmdEngHandler.ENGBONEGROUP_LIST);

diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java
index a888d45..b87fb95 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java
+++ b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java
@@ -70,7 +70,7 @@ public class PmdParserExt2 extends PmdParserExt1 {
 
         for(int ct = 0; ct < PmdLimits.TOON_FIXEDNUM; ct++){
             String toonName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_TOONFILENAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_TOONFILENAME);
             this.toonHandler.pmdToonFileInfo(toonName);
 
             this.toonHandler.loopNext(PmdToonHandler.TOON_LIST);

diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java
index 1081901..2e5df35 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java
+++ b/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java
@@ -85,7 +85,7 @@ public class PmdParserExt3 extends PmdParserExt2 {
 
         for(int ct = 0; ct < rigidNum; ct++){
             String rigidName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_RIGIDNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_RIGIDNAME);
             this.rigidHandler.pmdRigidName(rigidName);
 
             int linkedBoneId = parseUShortAsInteger();
@@ -146,7 +146,7 @@ public class PmdParserExt3 extends PmdParserExt2 {
 
         for(int ct = 0; ct < jointNum; ct++){
             String jointName =
-                    parseZeroTermString(PmdLimits.MAXBYTES_JOINTNAME);
+                    parseZeroTermWin31J(PmdLimits.MAXBYTES_JOINTNAME);
             this.jointHandler.pmdJointName(jointName);
 
             int rigidIdA = parseInteger();