From f605ea9a49f65d6eeae8b3fbdfba12a3549855fb Mon Sep 17 00:00:00 2001 From: Olyutorskii Date: Thu, 7 Oct 2010 02:44:44 +0900 Subject: [PATCH] =?utf8?q?1.6=E5=8C=96=E3=81=AB=E4=BC=B4=E3=81=86@Override?= =?utf8?q?=E3=82=A2=E3=83=8E=E3=83=86=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?= =?utf8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../jp/sourceforge/mikutoga/corelib/I18nText.java | 3 +++ .../sourceforge/mikutoga/corelib/SerialNumbered.java | 1 + .../jp/sourceforge/mikutoga/parser/MmdSource.java | 1 + .../java/jp/sourceforge/mikutoga/pmd/BoneGroup.java | 3 +++ .../java/jp/sourceforge/mikutoga/pmd/BoneInfo.java | 2 ++ .../java/jp/sourceforge/mikutoga/pmd/IKChain.java | 1 + .../java/jp/sourceforge/mikutoga/pmd/Material.java | 1 + .../java/jp/sourceforge/mikutoga/pmd/MorphPart.java | 3 +++ .../jp/sourceforge/mikutoga/pmd/MorphVertex.java | 3 +++ .../java/jp/sourceforge/mikutoga/pmd/RigidGroup.java | 3 +++ .../java/jp/sourceforge/mikutoga/pmd/RigidInfo.java | 2 ++ .../java/jp/sourceforge/mikutoga/pmd/Surface.java | 3 +++ .../java/jp/sourceforge/mikutoga/pmd/Vertex.java | 2 ++ .../mikutoga/pmd/pmdloader/BoneBuilder.java | 10 ++++++++++ .../mikutoga/pmd/pmdloader/JointBuilder.java | 11 +++++++++++ .../mikutoga/pmd/pmdloader/MaterialBuilder.java | 8 ++++++++ .../mikutoga/pmd/pmdloader/MorphBuilder.java | 6 ++++++ .../mikutoga/pmd/pmdloader/RigidBuilder.java | 10 ++++++++++ .../mikutoga/pmd/pmdloader/ShapeBuilder.java | 9 +++++++++ .../mikutoga/pmd/pmdloader/TextBuilder.java | 12 ++++++++++++ .../mikutoga/pmd/pmdloader/ToonBuilder.java | 4 ++++ .../mikutoga/pmd/xml/PmdXmlResources.java | 4 ++-- .../java/jp/sourceforge/mikutoga/xml/DomUtils.java | 4 ++++ .../mikutoga/xml/XmlResourceResolver.java | 20 +++++++++++++++++++- 24 files changed, 123 insertions(+), 3 deletions(-) diff --git a/src/main/java/jp/sourceforge/mikutoga/corelib/I18nText.java b/src/main/java/jp/sourceforge/mikutoga/corelib/I18nText.java index 3cfffba..50e2fb7 100644 --- a/src/main/java/jp/sourceforge/mikutoga/corelib/I18nText.java +++ b/src/main/java/jp/sourceforge/mikutoga/corelib/I18nText.java @@ -265,6 +265,7 @@ public class I18nText implements CharSequence { * @param index {@inheritDoc} * @return {@inheritDoc} */ + @Override public char charAt(int index){ String text = getText(); char result = text.charAt(index); @@ -276,6 +277,7 @@ public class I18nText implements CharSequence { * {@link #getText()}に準ずる。 * @return {@inheritDoc} */ + @Override public int length(){ String text = getText(); int result = text.length(); @@ -289,6 +291,7 @@ public class I18nText implements CharSequence { * @param end {@inheritDoc} * @return {@inheritDoc} */ + @Override public CharSequence subSequence(int start, int end){ String text = getText(); CharSequence result = text.subSequence(start, end); diff --git a/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java b/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java index b1d9b84..4fb2fc9 100644 --- a/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java +++ b/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java @@ -50,6 +50,7 @@ public interface SerialNumbered { * @param o2 {@inheritDoc} * @return {@inheritDoc} */ + @Override public int compare(SerialNumbered o1, SerialNumbered o2){ if(o1 == o2) return 0; if(o1 == null) return -1; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/MmdSource.java b/src/main/java/jp/sourceforge/mikutoga/parser/MmdSource.java index 051660f..4c4b43e 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/MmdSource.java +++ b/src/main/java/jp/sourceforge/mikutoga/parser/MmdSource.java @@ -120,6 +120,7 @@ public class MmdSource implements Closeable { * @throws IOException IOエラー * @see java.io.InputStream#close() */ + @Override public void close() throws IOException{ this.istream.close(); this.readBuffer.clear(); diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java index 52f3394..e62ab54 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java @@ -64,6 +64,7 @@ public class BoneGroup implements SerialNumbered , Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Iterator iterator(){ return this.boneList.iterator(); } @@ -72,6 +73,7 @@ public class BoneGroup implements SerialNumbered , Iterable { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -81,6 +83,7 @@ public class BoneGroup implements SerialNumbered , Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java index 72e3c4b..d19efc4 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java @@ -148,6 +148,7 @@ public class BoneInfo implements SerialNumbered { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -157,6 +158,7 @@ public class BoneInfo implements SerialNumbered { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java b/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java index bb3738e..3b65a55 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java @@ -95,6 +95,7 @@ public class IKChain implements Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Iterator iterator(){ return this.chainList.iterator(); } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java b/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java index c88161f..c59d861 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java @@ -188,6 +188,7 @@ public class Material implements Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Iterator iterator(){ return this.surfaceList.iterator(); } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java b/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java index 50ac72b..fdab975 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java @@ -74,6 +74,7 @@ public class MorphPart implements SerialNumbered, Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Iterator iterator(){ return this.morphVertexList.iterator(); } @@ -82,6 +83,7 @@ public class MorphPart implements SerialNumbered, Iterable { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -91,6 +93,7 @@ public class MorphPart implements SerialNumbered, Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java index 719c3dd..f883e3e 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java @@ -63,6 +63,7 @@ public class MorphVertex implements SerialNumbered{ * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -72,6 +73,7 @@ public class MorphVertex implements SerialNumbered{ * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } @@ -114,6 +116,7 @@ public class MorphVertex implements SerialNumbered{ * @param o2 {@inheritDoc} * @return {@inheritDoc} */ + @Override public int compare(MorphVertex o1, MorphVertex o2){ if(o1 == o2) return 0; if(o1 == null) return -1; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java index a57a301..9252523 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java @@ -42,6 +42,7 @@ public class RigidGroup implements SerialNumbered, Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Iterator iterator(){ return this.rigidList.iterator(); } @@ -50,6 +51,7 @@ public class RigidGroup implements SerialNumbered, Iterable { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -59,6 +61,7 @@ public class RigidGroup implements SerialNumbered, Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java index b734602..7e87e44 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java @@ -150,6 +150,7 @@ public class RigidInfo implements SerialNumbered { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -159,6 +160,7 @@ public class RigidInfo implements SerialNumbered { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java b/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java index d2c5560..5343d54 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java @@ -107,6 +107,7 @@ public class Surface implements SerialNumbered, Iterable { * 反復子がnullを返す可能性もありうる。 * @return {@inheritDoc} */ + @Override public Iterator iterator(){ List list = new ArrayList(3); @@ -134,6 +135,7 @@ public class Surface implements SerialNumbered, Iterable { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -143,6 +145,7 @@ public class Surface implements SerialNumbered, Iterable { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java index 119bd46..07789dd 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java @@ -174,6 +174,7 @@ public class Vertex implements SerialNumbered { * {@inheritDoc} * @param num {@inheritDoc} */ + @Override public void setSerialNumber(int num){ this.serialNo = num; return; @@ -183,6 +184,7 @@ public class Vertex implements SerialNumbered { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public int getSerialNumber(){ return this.serialNo; } diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java index 9213010..3037a7a 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java @@ -57,6 +57,7 @@ class BoneBuilder implements PmdBoneHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage instanceof PmdBoneStage; @@ -107,6 +108,7 @@ class BoneBuilder implements PmdBoneHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage instanceof PmdBoneStage; @@ -137,6 +139,7 @@ class BoneBuilder implements PmdBoneHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage instanceof PmdBoneStage; @@ -178,6 +181,7 @@ class BoneBuilder implements PmdBoneHandler { * @param boneName {@inheritDoc} * @param boneKind {@inheritDoc} */ + @Override public void pmdBoneInfo(String boneName, byte boneKind){ this.currentBone.getBoneName().setPrimaryText(boneName); BoneType type = BoneType.decode(boneKind); @@ -191,6 +195,7 @@ class BoneBuilder implements PmdBoneHandler { * @param tailId {@inheritDoc} * @param ikId {@inheritDoc} */ + @Override public void pmdBoneLink(int parentId, int tailId, int ikId){ BoneInfo prevBone = null; if(0 <= parentId && parentId < PmdLimits.MAX_BONE){ @@ -224,6 +229,7 @@ class BoneBuilder implements PmdBoneHandler { * @param yPos {@inheritDoc} * @param zPos {@inheritDoc} */ + @Override public void pmdBonePosition(float xPos, float yPos, float zPos){ Pos3d position = this.currentBone.getPosition(); position.setXPos(xPos); @@ -239,6 +245,7 @@ class BoneBuilder implements PmdBoneHandler { * @param depth {@inheritDoc} * @param weight {@inheritDoc} */ + @Override public void pmdIKInfo(int boneId, int targetId, int depth, float weight){ BoneInfo bone = this.boneList.get(boneId); this.currentIkChain.setIkBone(bone); @@ -256,6 +263,7 @@ class BoneBuilder implements PmdBoneHandler { * {@inheritDoc} * @param childId {@inheritDoc} */ + @Override public void pmdIKChainInfo(int childId){ BoneInfo chain = this.boneList.get(childId); this.currentIkChain.getChainedBoneList().add(chain); @@ -266,6 +274,7 @@ class BoneBuilder implements PmdBoneHandler { * {@inheritDoc} * @param groupName {@inheritDoc} */ + @Override public void pmdBoneGroupInfo(String groupName){ this.currentBoneGroup.getGroupName().setPrimaryText(groupName); return; @@ -276,6 +285,7 @@ class BoneBuilder implements PmdBoneHandler { * @param boneId {@inheritDoc} * @param groupId {@inheritDoc} */ + @Override public void pmdGroupedBoneInfo(int boneId, int groupId){ BoneInfo bone = this.boneList.get(boneId); BoneGroup group = this.boneGroupList.get(groupId); diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java index 7ea24a6..5b10d75 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java @@ -47,6 +47,7 @@ class JointBuilder implements PmdJointHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage == PmdJointHandler.JOINT_LIST; @@ -64,6 +65,7 @@ class JointBuilder implements PmdJointHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage == PmdJointHandler.JOINT_LIST; @@ -78,6 +80,7 @@ class JointBuilder implements PmdJointHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage == PmdJointHandler.JOINT_LIST; return; @@ -87,6 +90,7 @@ class JointBuilder implements PmdJointHandler { * {@inheritDoc} * @param jointName {@inheritDoc} */ + @Override public void pmdJointName(String jointName){ this.currentJoint.getJointName().setPrimaryText(jointName); return; @@ -97,6 +101,7 @@ class JointBuilder implements PmdJointHandler { * @param rigidIdA {@inheritDoc} * @param rigidIdB {@inheritDoc} */ + @Override public void pmdJointLink(int rigidIdA, int rigidIdB){ RigidInfo rigidA = this.rigidList.get(rigidIdA); RigidInfo rigidB = this.rigidList.get(rigidIdB); @@ -110,6 +115,7 @@ class JointBuilder implements PmdJointHandler { * @param posY {@inheritDoc} * @param posZ {@inheritDoc} */ + @Override public void pmdJointPosition(float posX, float posY, float posZ){ Pos3d position = this.currentJoint.getPosition(); position.setXPos(posX); @@ -124,6 +130,7 @@ class JointBuilder implements PmdJointHandler { * @param rotY {@inheritDoc} * @param rotZ {@inheritDoc} */ + @Override public void pmdJointRotation(float rotX, float rotY, float rotZ){ Rad3d rotation = this.currentJoint.getRotation(); rotation.setXRad(rotX); @@ -141,6 +148,7 @@ class JointBuilder implements PmdJointHandler { * @param posZlim1 {@inheritDoc} * @param posZlim2 {@inheritDoc} */ + @Override public void pmdPositionLimit(float posXlim1, float posXlim2, float posYlim1, float posYlim2, float posZlim1, float posZlim2){ @@ -160,6 +168,7 @@ class JointBuilder implements PmdJointHandler { * @param rotZlim1 {@inheritDoc} * @param rotZlim2 {@inheritDoc} */ + @Override public void pmdRotationLimit(float rotXlim1, float rotXlim2, float rotYlim1, float rotYlim2, float rotZlim1, float rotZlim2){ @@ -176,6 +185,7 @@ class JointBuilder implements PmdJointHandler { * @param elasticPosY {@inheritDoc} * @param elasticPosZ {@inheritDoc} */ + @Override public void pmdElasticPosition(float elasticPosX, float elasticPosY, float elasticPosZ){ @@ -192,6 +202,7 @@ class JointBuilder implements PmdJointHandler { * @param elasticRotY {@inheritDoc} * @param elasticRotZ {@inheritDoc} */ + @Override public void pmdElasticRotation(float elasticRotX, float elasticRotY, float elasticRotZ){ diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java index 9ac8294..bf1935d 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java @@ -52,6 +52,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage == PmdMaterialHandler.MATERIAL_LIST; @@ -71,6 +72,7 @@ class MaterialBuilder implements PmdMaterialHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage == PmdMaterialHandler.MATERIAL_LIST; @@ -85,6 +87,7 @@ class MaterialBuilder implements PmdMaterialHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage == PmdMaterialHandler.MATERIAL_LIST; return; @@ -97,6 +100,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param blue {@inheritDoc} * @param alpha {@inheritDoc} */ + @Override public void pmdMaterialDiffuse(float red, float green, float blue, @@ -112,6 +116,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param green {@inheritDoc} * @param blue {@inheritDoc} */ + @Override public void pmdMaterialAmbient(float red, float green, float blue ){ @@ -127,6 +132,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param blue {@inheritDoc} * @param shininess {@inheritDoc} */ + @Override public void pmdMaterialSpecular(float red, float green, float blue, @@ -142,6 +148,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param hasEdge {@inheritDoc} * @param vertexNum {@inheritDoc} */ + @Override public void pmdMaterialInfo(boolean hasEdge, int vertexNum){ this.currentMaterial.setEdgeAppearance(hasEdge); @@ -162,6 +169,7 @@ class MaterialBuilder implements PmdMaterialHandler { * @param textureFile {@inheritDoc} * @param sphereFile {@inheritDoc} */ + @Override public void pmdMaterialShading(int toonIdx, String textureFile, String sphereFile ){ diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java index 4727439..7656d45 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java @@ -62,6 +62,7 @@ class MorphBuilder implements PmdMorphHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage instanceof PmdMorphStage; @@ -88,6 +89,7 @@ class MorphBuilder implements PmdMorphHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage instanceof PmdMorphStage; @@ -108,6 +110,7 @@ class MorphBuilder implements PmdMorphHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage instanceof PmdMorphStage; if(stage == PmdMorphHandler.MORPH_LIST){ @@ -125,6 +128,7 @@ class MorphBuilder implements PmdMorphHandler { * @param morphName {@inheritDoc} * @param morphType {@inheritDoc} */ + @Override public void pmdMorphInfo(String morphName, byte morphType){ this.currentMorphPart.getMorphName().setPrimaryText(morphName); MorphType type = MorphType.decode(morphType); @@ -140,6 +144,7 @@ class MorphBuilder implements PmdMorphHandler { * @param yPos {@inheritDoc} * @param zPos {@inheritDoc} */ + @Override public void pmdMorphVertexInfo(int serialId, float xPos, float yPos, float zPos){ MorphVertex morphVertex; @@ -167,6 +172,7 @@ class MorphBuilder implements PmdMorphHandler { * {@inheritDoc} * @param morphId {@inheritDoc} */ + @Override public void pmdMorphOrderInfo(int morphId){ MorphPart part = this.morphPartList.get(morphId); MorphType type = part.getMorphType(); diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java index 45a5d79..c088930 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java @@ -54,6 +54,7 @@ class RigidBuilder implements PmdRigidHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ ListUtil.prepareDefConsList(this.rigidList, RigidInfo.class, loops); ListUtil.assignIndexedSerial(this.rigidList); @@ -75,6 +76,7 @@ class RigidBuilder implements PmdRigidHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ if(this.rigidIt.hasNext()){ this.currentRigid = this.rigidIt.next(); @@ -86,6 +88,7 @@ class RigidBuilder implements PmdRigidHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ return; } @@ -94,6 +97,7 @@ class RigidBuilder implements PmdRigidHandler { * {@inheritDoc} * @param rigidName {@inheritDoc} */ + @Override public void pmdRigidName(String rigidName){ this.currentRigid.getRigidName().setPrimaryText(rigidName); return; @@ -104,6 +108,7 @@ class RigidBuilder implements PmdRigidHandler { * @param rigidGroupId {@inheritDoc} * @param linkedBoneId {@inheritDoc} */ + @Override public void pmdRigidInfo(int rigidGroupId, int linkedBoneId){ BoneInfo bone = this.boneList.get(linkedBoneId); RigidGroup group = this.rigidGroupList.get(rigidGroupId); @@ -122,6 +127,7 @@ class RigidBuilder implements PmdRigidHandler { * @param height {@inheritDoc} * @param depth {@inheritDoc} */ + @Override public void pmdRigidShape(byte shapeType, float width, float height, float depth){ RigidShape shape = this.currentRigid.getRigidShape(); @@ -142,6 +148,7 @@ class RigidBuilder implements PmdRigidHandler { * @param posY {@inheritDoc} * @param posZ {@inheritDoc} */ + @Override public void pmdRigidPosition(float posX, float posY, float posZ){ Pos3d position = this.currentRigid.getPosition(); position.setXPos(posX); @@ -156,6 +163,7 @@ class RigidBuilder implements PmdRigidHandler { * @param radY {@inheritDoc} * @param radZ {@inheritDoc} */ + @Override public void pmdRigidRotation(float radX, float radY, float radZ){ Rad3d rotation = this.currentRigid.getRotation(); rotation.setXRad(radX); @@ -172,6 +180,7 @@ class RigidBuilder implements PmdRigidHandler { * @param restitution {@inheritDoc} * @param friction {@inheritDoc} */ + @Override public void pmdRigidPhysics(float mass, float dampingPos, float dampingRot, @@ -193,6 +202,7 @@ class RigidBuilder implements PmdRigidHandler { * @param behaveType {@inheritDoc} * @param collisionMap {@inheritDoc} */ + @Override public void pmdRigidBehavior(byte behaveType, short collisionMap){ RigidBehaviorType type = RigidBehaviorType.decode(behaveType); this.currentRigid.setBehaviorType(type); diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java index 669ef9c..58ab97d 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java @@ -76,6 +76,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ if(stage == PmdShapeHandler.VERTEX_LIST){ ListUtil.prepareDefConsList(this.vertexList, Vertex.class, loops); @@ -105,6 +106,7 @@ class ShapeBuilder implements PmdShapeHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ if(stage == PmdShapeHandler.VERTEX_LIST){ if(this.vertexIt.hasNext()){ @@ -125,6 +127,7 @@ class ShapeBuilder implements PmdShapeHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ return; } @@ -135,6 +138,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param yPos {@inheritDoc} * @param zPos {@inheritDoc} */ + @Override public void pmdVertexPosition(float xPos, float yPos, float zPos){ Pos3d position = this.currentVertex.getPosition(); position.setXPos(xPos); @@ -149,6 +153,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param yVec {@inheritDoc} * @param zVec {@inheritDoc} */ + @Override public void pmdVertexNormal(float xVec, float yVec, float zVec){ Vec3d normal = this.currentVertex.getNormal(); normal.setXVal(xVec); @@ -162,6 +167,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param uVal {@inheritDoc} * @param vVal {@inheritDoc} */ + @Override public void pmdVertexUV(float uVal, float vVal){ Pos2d uv = this.currentVertex.getUVPosition(); uv.setXPos(uVal); @@ -175,6 +181,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param boneId2 {@inheritDoc} * @param weightForB1 {@inheritDoc} */ + @Override public void pmdVertexWeight(int boneId1, int boneId2, int weightForB1){ BoneInfo bone1 = prepareBone(boneId1); BoneInfo bone2 = prepareBone(boneId2); @@ -189,6 +196,7 @@ class ShapeBuilder implements PmdShapeHandler { * {@inheritDoc} * @param hideEdge {@inheritDoc} */ + @Override public void pmdVertexEdge(boolean hideEdge){ this.currentVertex.setEdgeAppearance( ! hideEdge ); return; @@ -200,6 +208,7 @@ class ShapeBuilder implements PmdShapeHandler { * @param vertexId2 {@inheritDoc} * @param vertexId3 {@inheritDoc} */ + @Override public void pmdSurfaceTriangle(int vertexId1, int vertexId2, int vertexId3 ){ diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java index 18b75e6..e34f621 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java @@ -73,6 +73,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { /** * {@inheritDoc} */ + @Override public void pmdParseStart(){ return; } @@ -81,6 +82,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param hasMoreData {@inheritDoc} */ + @Override public void pmdParseEnd(boolean hasMoreData){ this.hasMoreData = hasMoreData; return; @@ -91,6 +93,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage instanceof PmdEngStage; @@ -132,6 +135,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage instanceof PmdEngStage; @@ -158,6 +162,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage instanceof PmdEngStage; return; @@ -167,6 +172,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param ver {@inheritDoc} */ + @Override public void pmdHeaderInfo(float ver){ this.model.setHeaderVersion(ver); return; @@ -177,6 +183,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * @param modelName {@inheritDoc} * @param description {@inheritDoc} */ + @Override public void pmdModelInfo(String modelName, String description){ this.modelName .setPrimaryText(modelName); this.description.setPrimaryText(description); @@ -187,6 +194,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param hasEnglishInfo {@inheritDoc} */ + @Override public void pmdEngEnabled(boolean hasEnglishInfo){ return; } @@ -196,6 +204,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * @param modelName {@inheritDoc} * @param description {@inheritDoc} */ + @Override public void pmdEngModelInfo(String modelName, String description){ this.modelName .setGlobalText(modelName); this.description.setGlobalText(description); @@ -206,6 +215,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param boneName {@inheritDoc} */ + @Override public void pmdEngBoneInfo(String boneName){ this.currentBone.getBoneName().setGlobalText(boneName); return; @@ -215,6 +225,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param morphName {@inheritDoc} */ + @Override public void pmdEngMorphInfo(String morphName){ this.currentMorphPart.getMorphName().setGlobalText(morphName); return; @@ -224,6 +235,7 @@ class TextBuilder implements PmdBasicHandler, PmdEngHandler { * {@inheritDoc} * @param groupName {@inheritDoc} */ + @Override public void pmdEngBoneGroupInfo(String groupName){ this.currentBoneGroup.getGroupName().setGlobalText(groupName); return; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java index bc92e23..f4a28e1 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java @@ -37,6 +37,7 @@ class ToonBuilder implements PmdToonHandler { * @param stage {@inheritDoc} * @param loops {@inheritDoc} */ + @Override public void loopStart(ParseStage stage, int loops){ assert stage == PmdToonHandler.TOON_LIST; assert loops == PmdLimits.TOON_FIXEDNUM; @@ -51,6 +52,7 @@ class ToonBuilder implements PmdToonHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopNext(ParseStage stage){ assert stage == PmdToonHandler.TOON_LIST; this.index++; @@ -61,6 +63,7 @@ class ToonBuilder implements PmdToonHandler { * {@inheritDoc} * @param stage {@inheritDoc} */ + @Override public void loopEnd(ParseStage stage){ assert stage == PmdToonHandler.TOON_LIST; this.model.setToonMap(this.toonMap); @@ -71,6 +74,7 @@ class ToonBuilder implements PmdToonHandler { * {@inheritDoc} * @param toonFileName {@inheritDoc} */ + @Override public void pmdToonFileInfo(String toonFileName){ this.toonMap.setIndexedToon(this.index, toonFileName); return; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlResources.java b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlResources.java index 4e7b58e..b914575 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlResources.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlResources.java @@ -32,9 +32,9 @@ public final class PmdXmlResources { public static final String VER_PMDXML = "100923"; public static final String LOCAL_SCHEMA_PMDXML = - "./resources/pmdxml-100923.xsd"; + "resources/pmdxml-100923.xsd"; public static final String LOCAL_DTD_PMDXML = - "./resources/pmdxml-100923.dtd"; + "resources/pmdxml-100923.dtd"; public static final URI URI_SCHEMA_PMDXML = URI.create(SCHEMA_PMDXML); public static final URI URI_DTD_PMDXML = URI.create(DTD_PMDXML); diff --git a/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java b/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java index 6cd09ba..97b80d1 100644 --- a/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java +++ b/src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java @@ -265,6 +265,7 @@ public final class DomUtils { String childTag){ final Iterator iterator = getChildIterator(parent, childTag); Iterable result = new Iterable(){ + @Override public Iterator iterator(){ return iterator; } @@ -326,6 +327,7 @@ public final class DomUtils { * {@inheritDoc} * @return {@inheritDoc} */ + @Override public boolean hasNext(){ if(this.next == null) return false; return true; @@ -336,6 +338,7 @@ public final class DomUtils { * @return {@inheritDoc} * @throws NoSuchElementException {@inheritDoc} */ + @Override public Element next() throws NoSuchElementException{ if(this.next == null) throw new NoSuchElementException(); Element result = this.next; @@ -347,6 +350,7 @@ public final class DomUtils { * {@inheritDoc} * ※ 未サポート。 */ + @Override public void remove(){ throw new UnsupportedOperationException(); } diff --git a/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java b/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java index 779edec..9d5b258 100644 --- a/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java +++ b/src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java @@ -35,7 +35,7 @@ public class XmlResourceResolver "http://www.w3.org/2001/XMLSchema-instance"; private static final String LOCAL_SCHEMA_XML = - "./resources/xml-2009-01.xsd"; + "resources/xml-2009-01.xsd"; private static final URI EMPTY_URI = URI.create(""); private static final Class THISCLASS = XmlResourceResolver.class; @@ -147,6 +147,7 @@ public class XmlResourceResolver * @param baseURI {@inheritDoc} * @return {@inheritDoc} */ + @Override public LSInput resolveResource(String type, String namespaceURI, String publicId, @@ -186,6 +187,7 @@ public class XmlResourceResolver * @throws org.xml.sax.SAXException {@inheritDoc} * @throws java.io.IOException {@inheritDoc} */ + @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException{ if(systemId == null) return null; @@ -235,6 +237,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public String getBaseURI(){ return this.baseURI; } @@ -243,6 +246,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param baseURI {@inheritDoc} */ + @Override public void setBaseURI(String baseURI){ this.baseURI = baseURI; return; @@ -252,6 +256,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public InputStream getByteStream(){ return this.byteStream; } @@ -260,6 +265,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param byteStream {@inheritDoc} */ + @Override public void setByteStream(InputStream byteStream){ this.byteStream = byteStream; } @@ -268,6 +274,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public boolean getCertifiedText(){ return this.certifiedText; } @@ -276,6 +283,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param certifiedText {@inheritDoc} */ + @Override public void setCertifiedText(boolean certifiedText){ this.certifiedText = certifiedText; return; @@ -285,6 +293,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public Reader getCharacterStream(){ return this.characterStream; } @@ -293,6 +302,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param characterStream {@inheritDoc} */ + @Override public void setCharacterStream(Reader characterStream){ this.characterStream = characterStream; } @@ -301,6 +311,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public String getEncoding(){ return this.encoding; } @@ -309,6 +320,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param encoding {@inheritDoc} */ + @Override public void setEncoding(String encoding){ this.encoding = encoding; return; @@ -318,6 +330,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public String getPublicId(){ return this.publicId; } @@ -326,6 +339,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param publicId {@inheritDoc} */ + @Override public void setPublicId(String publicId){ this.publicId = publicId; return; @@ -335,6 +349,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public String getStringData(){ return this.stringData; } @@ -343,6 +358,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param stringData {@inheritDoc} */ + @Override public void setStringData(String stringData){ this.stringData = stringData; return; @@ -352,6 +368,7 @@ public class XmlResourceResolver * {@inheritDoc} * @return {@inheritDoc} */ + @Override public String getSystemId(){ return this.systemId; } @@ -360,6 +377,7 @@ public class XmlResourceResolver * {@inheritDoc} * @param systemId {@inheritDoc} */ + @Override public void setSystemId(String systemId){ this.systemId = systemId; return; -- 2.11.0