OSDN Git Service
(root)
/
mikutoga
/
TogaGem.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
206cd3d
)
1.6化に伴う@Overrideアノテーション対応
author
Olyutorskii
<olyutorskii@users.osdn.me>
Wed, 6 Oct 2010 17:44:44 +0000
(
02:44
+0900)
committer
Olyutorskii
<olyutorskii@users.osdn.me>
Wed, 6 Oct 2010 17:44:44 +0000
(
02:44
+0900)
24 files changed:
src/main/java/jp/sourceforge/mikutoga/corelib/I18nText.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/parser/MmdSource.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/Material.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlResources.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/xml/DomUtils.java
patch
|
blob
|
history
src/main/java/jp/sourceforge/mikutoga/xml/XmlResourceResolver.java
patch
|
blob
|
history
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
(file)
--- 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}
\r
* @return {@inheritDoc}
\r
*/
\r
* @param index {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public char charAt(int index){
\r
String text = getText();
\r
char result = text.charAt(index);
\r
public char charAt(int index){
\r
String text = getText();
\r
char result = text.charAt(index);
\r
@@
-276,6
+277,7
@@
public class I18nText implements CharSequence {
* {@link #getText()}に準ずる。
\r
* @return {@inheritDoc}
\r
*/
\r
* {@link #getText()}に準ずる。
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int length(){
\r
String text = getText();
\r
int result = text.length();
\r
public int length(){
\r
String text = getText();
\r
int result = text.length();
\r
@@
-289,6
+291,7
@@
public class I18nText implements CharSequence {
* @param end {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* @param end {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public CharSequence subSequence(int start, int end){
\r
String text = getText();
\r
CharSequence result = text.subSequence(start, end);
\r
public CharSequence subSequence(int start, int end){
\r
String text = getText();
\r
CharSequence result = text.subSequence(start, end);
\r
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
(file)
--- 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}
\r
* @return {@inheritDoc}
\r
*/
\r
* @param o2 {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int compare(SerialNumbered o1, SerialNumbered o2){
\r
if(o1 == o2) return 0;
\r
if(o1 == null) return -1;
\r
public int compare(SerialNumbered o1, SerialNumbered o2){
\r
if(o1 == o2) return 0;
\r
if(o1 == null) return -1;
\r
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
(file)
--- 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エラー
\r
* @see java.io.InputStream#close()
\r
*/
\r
* @throws IOException IOエラー
\r
* @see java.io.InputStream#close()
\r
*/
\r
+ @Override
\r
public void close() throws IOException{
\r
this.istream.close();
\r
this.readBuffer.clear();
\r
public void close() throws IOException{
\r
this.istream.close();
\r
this.readBuffer.clear();
\r
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
(file)
--- 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<BoneInfo> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<BoneInfo> iterator(){
\r
return this.boneList.iterator();
\r
}
\r
public Iterator<BoneInfo> iterator(){
\r
return this.boneList.iterator();
\r
}
\r
@@
-72,6
+73,7
@@
public class BoneGroup implements SerialNumbered , Iterable<BoneInfo> {
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-81,6
+83,7
@@
public class BoneGroup implements SerialNumbered , Iterable<BoneInfo> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-157,6
+158,7
@@
public class BoneInfo implements SerialNumbered {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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<BoneInfo> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<BoneInfo> iterator(){
\r
return this.chainList.iterator();
\r
}
\r
public Iterator<BoneInfo> iterator(){
\r
return this.chainList.iterator();
\r
}
\r
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
(file)
--- 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<Surface> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<Surface> iterator(){
\r
return this.surfaceList.iterator();
\r
}
\r
public Iterator<Surface> iterator(){
\r
return this.surfaceList.iterator();
\r
}
\r
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
(file)
--- 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<MorphVertex> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<MorphVertex> iterator(){
\r
return this.morphVertexList.iterator();
\r
}
\r
public Iterator<MorphVertex> iterator(){
\r
return this.morphVertexList.iterator();
\r
}
\r
@@
-82,6
+83,7
@@
public class MorphPart implements SerialNumbered, Iterable<MorphVertex> {
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-91,6
+93,7
@@
public class MorphPart implements SerialNumbered, Iterable<MorphVertex> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-72,6
+73,7
@@
public class MorphVertex implements SerialNumbered{
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
@@
-114,6
+116,7
@@
public class MorphVertex implements SerialNumbered{
* @param o2 {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* @param o2 {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int compare(MorphVertex o1, MorphVertex o2){
\r
if(o1 == o2) return 0;
\r
if(o1 == null) return -1;
\r
public int compare(MorphVertex o1, MorphVertex o2){
\r
if(o1 == o2) return 0;
\r
if(o1 == null) return -1;
\r
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
(file)
--- 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<RigidInfo> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<RigidInfo> iterator(){
\r
return this.rigidList.iterator();
\r
}
\r
public Iterator<RigidInfo> iterator(){
\r
return this.rigidList.iterator();
\r
}
\r
@@
-50,6
+51,7
@@
public class RigidGroup implements SerialNumbered, Iterable<RigidInfo> {
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-59,6
+61,7
@@
public class RigidGroup implements SerialNumbered, Iterable<RigidInfo> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-159,6
+160,7
@@
public class RigidInfo implements SerialNumbered {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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<Vertex> {
* 反復子がnullを返す可能性もありうる。
\r
* @return {@inheritDoc}
\r
*/
\r
* 反復子がnullを返す可能性もありうる。
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Iterator<Vertex> iterator(){
\r
List<Vertex> list = new ArrayList<Vertex>(3);
\r
\r
public Iterator<Vertex> iterator(){
\r
List<Vertex> list = new ArrayList<Vertex>(3);
\r
\r
@@
-134,6
+135,7
@@
public class Surface implements SerialNumbered, Iterable<Vertex> {
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-143,6
+145,7
@@
public class Surface implements SerialNumbered, Iterable<Vertex> {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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}
\r
* @param num {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param num {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
public void setSerialNumber(int num){
\r
this.serialNo = num;
\r
return;
\r
@@
-183,6
+184,7
@@
public class Vertex implements SerialNumbered {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
public int getSerialNumber(){
\r
return this.serialNo;
\r
}
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdBoneStage;
\r
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdBoneStage;
\r
\r
@@
-107,6
+108,7
@@
class BoneBuilder implements PmdBoneHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdBoneStage;
\r
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdBoneStage;
\r
\r
@@
-137,6
+139,7
@@
class BoneBuilder implements PmdBoneHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdBoneStage;
\r
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdBoneStage;
\r
\r
@@
-178,6
+181,7
@@
class BoneBuilder implements PmdBoneHandler {
* @param boneName {@inheritDoc}
\r
* @param boneKind {@inheritDoc}
\r
*/
\r
* @param boneName {@inheritDoc}
\r
* @param boneKind {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdBoneInfo(String boneName, byte boneKind){
\r
this.currentBone.getBoneName().setPrimaryText(boneName);
\r
BoneType type = BoneType.decode(boneKind);
\r
public void pmdBoneInfo(String boneName, byte boneKind){
\r
this.currentBone.getBoneName().setPrimaryText(boneName);
\r
BoneType type = BoneType.decode(boneKind);
\r
@@
-191,6
+195,7
@@
class BoneBuilder implements PmdBoneHandler {
* @param tailId {@inheritDoc}
\r
* @param ikId {@inheritDoc}
\r
*/
\r
* @param tailId {@inheritDoc}
\r
* @param ikId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdBoneLink(int parentId, int tailId, int ikId){
\r
BoneInfo prevBone = null;
\r
if(0 <= parentId && parentId < PmdLimits.MAX_BONE){
\r
public void pmdBoneLink(int parentId, int tailId, int ikId){
\r
BoneInfo prevBone = null;
\r
if(0 <= parentId && parentId < PmdLimits.MAX_BONE){
\r
@@
-224,6
+229,7
@@
class BoneBuilder implements PmdBoneHandler {
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdBonePosition(float xPos, float yPos, float zPos){
\r
Pos3d position = this.currentBone.getPosition();
\r
position.setXPos(xPos);
\r
public void pmdBonePosition(float xPos, float yPos, float zPos){
\r
Pos3d position = this.currentBone.getPosition();
\r
position.setXPos(xPos);
\r
@@
-239,6
+245,7
@@
class BoneBuilder implements PmdBoneHandler {
* @param depth {@inheritDoc}
\r
* @param weight {@inheritDoc}
\r
*/
\r
* @param depth {@inheritDoc}
\r
* @param weight {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdIKInfo(int boneId, int targetId, int depth, float weight){
\r
BoneInfo bone = this.boneList.get(boneId);
\r
this.currentIkChain.setIkBone(bone);
\r
public void pmdIKInfo(int boneId, int targetId, int depth, float weight){
\r
BoneInfo bone = this.boneList.get(boneId);
\r
this.currentIkChain.setIkBone(bone);
\r
@@
-256,6
+263,7
@@
class BoneBuilder implements PmdBoneHandler {
* {@inheritDoc}
\r
* @param childId {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param childId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdIKChainInfo(int childId){
\r
BoneInfo chain = this.boneList.get(childId);
\r
this.currentIkChain.getChainedBoneList().add(chain);
\r
public void pmdIKChainInfo(int childId){
\r
BoneInfo chain = this.boneList.get(childId);
\r
this.currentIkChain.getChainedBoneList().add(chain);
\r
@@
-266,6
+274,7
@@
class BoneBuilder implements PmdBoneHandler {
* {@inheritDoc}
\r
* @param groupName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param groupName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdBoneGroupInfo(String groupName){
\r
this.currentBoneGroup.getGroupName().setPrimaryText(groupName);
\r
return;
\r
public void pmdBoneGroupInfo(String groupName){
\r
this.currentBoneGroup.getGroupName().setPrimaryText(groupName);
\r
return;
\r
@@
-276,6
+285,7
@@
class BoneBuilder implements PmdBoneHandler {
* @param boneId {@inheritDoc}
\r
* @param groupId {@inheritDoc}
\r
*/
\r
* @param boneId {@inheritDoc}
\r
* @param groupId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdGroupedBoneInfo(int boneId, int groupId){
\r
BoneInfo bone = this.boneList.get(boneId);
\r
BoneGroup group = this.boneGroupList.get(groupId);
\r
public void pmdGroupedBoneInfo(int boneId, int groupId){
\r
BoneInfo bone = this.boneList.get(boneId);
\r
BoneGroup group = this.boneGroupList.get(groupId);
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
\r
@@
-64,6
+65,7
@@
class JointBuilder implements PmdJointHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
\r
@@
-78,6
+80,7
@@
class JointBuilder implements PmdJointHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
return;
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdJointHandler.JOINT_LIST;
\r
return;
\r
@@
-87,6
+90,7
@@
class JointBuilder implements PmdJointHandler {
* {@inheritDoc}
\r
* @param jointName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param jointName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdJointName(String jointName){
\r
this.currentJoint.getJointName().setPrimaryText(jointName);
\r
return;
\r
public void pmdJointName(String jointName){
\r
this.currentJoint.getJointName().setPrimaryText(jointName);
\r
return;
\r
@@
-97,6
+101,7
@@
class JointBuilder implements PmdJointHandler {
* @param rigidIdA {@inheritDoc}
\r
* @param rigidIdB {@inheritDoc}
\r
*/
\r
* @param rigidIdA {@inheritDoc}
\r
* @param rigidIdB {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdJointLink(int rigidIdA, int rigidIdB){
\r
RigidInfo rigidA = this.rigidList.get(rigidIdA);
\r
RigidInfo rigidB = this.rigidList.get(rigidIdB);
\r
public void pmdJointLink(int rigidIdA, int rigidIdB){
\r
RigidInfo rigidA = this.rigidList.get(rigidIdA);
\r
RigidInfo rigidB = this.rigidList.get(rigidIdB);
\r
@@
-110,6
+115,7
@@
class JointBuilder implements PmdJointHandler {
* @param posY {@inheritDoc}
\r
* @param posZ {@inheritDoc}
\r
*/
\r
* @param posY {@inheritDoc}
\r
* @param posZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdJointPosition(float posX, float posY, float posZ){
\r
Pos3d position = this.currentJoint.getPosition();
\r
position.setXPos(posX);
\r
public void pmdJointPosition(float posX, float posY, float posZ){
\r
Pos3d position = this.currentJoint.getPosition();
\r
position.setXPos(posX);
\r
@@
-124,6
+130,7
@@
class JointBuilder implements PmdJointHandler {
* @param rotY {@inheritDoc}
\r
* @param rotZ {@inheritDoc}
\r
*/
\r
* @param rotY {@inheritDoc}
\r
* @param rotZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdJointRotation(float rotX, float rotY, float rotZ){
\r
Rad3d rotation = this.currentJoint.getRotation();
\r
rotation.setXRad(rotX);
\r
public void pmdJointRotation(float rotX, float rotY, float rotZ){
\r
Rad3d rotation = this.currentJoint.getRotation();
\r
rotation.setXRad(rotX);
\r
@@
-141,6
+148,7
@@
class JointBuilder implements PmdJointHandler {
* @param posZlim1 {@inheritDoc}
\r
* @param posZlim2 {@inheritDoc}
\r
*/
\r
* @param posZlim1 {@inheritDoc}
\r
* @param posZlim2 {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdPositionLimit(float posXlim1, float posXlim2,
\r
float posYlim1, float posYlim2,
\r
float posZlim1, float posZlim2){
\r
public void pmdPositionLimit(float posXlim1, float posXlim2,
\r
float posYlim1, float posYlim2,
\r
float posZlim1, float posZlim2){
\r
@@
-160,6
+168,7
@@
class JointBuilder implements PmdJointHandler {
* @param rotZlim1 {@inheritDoc}
\r
* @param rotZlim2 {@inheritDoc}
\r
*/
\r
* @param rotZlim1 {@inheritDoc}
\r
* @param rotZlim2 {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRotationLimit(float rotXlim1, float rotXlim2,
\r
float rotYlim1, float rotYlim2,
\r
float rotZlim1, float rotZlim2){
\r
public void pmdRotationLimit(float rotXlim1, float rotXlim2,
\r
float rotYlim1, float rotYlim2,
\r
float rotZlim1, float rotZlim2){
\r
@@
-176,6
+185,7
@@
class JointBuilder implements PmdJointHandler {
* @param elasticPosY {@inheritDoc}
\r
* @param elasticPosZ {@inheritDoc}
\r
*/
\r
* @param elasticPosY {@inheritDoc}
\r
* @param elasticPosZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdElasticPosition(float elasticPosX,
\r
float elasticPosY,
\r
float elasticPosZ){
\r
public void pmdElasticPosition(float elasticPosX,
\r
float elasticPosY,
\r
float elasticPosZ){
\r
@@
-192,6
+202,7
@@
class JointBuilder implements PmdJointHandler {
* @param elasticRotY {@inheritDoc}
\r
* @param elasticRotZ {@inheritDoc}
\r
*/
\r
* @param elasticRotY {@inheritDoc}
\r
* @param elasticRotZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdElasticRotation(float elasticRotX,
\r
float elasticRotY,
\r
float elasticRotZ){
\r
public void pmdElasticRotation(float elasticRotX,
\r
float elasticRotY,
\r
float elasticRotZ){
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
\r
@@
-71,6
+72,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
\r
@@
-85,6
+87,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
return;
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdMaterialHandler.MATERIAL_LIST;
\r
return;
\r
@@
-97,6
+100,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* @param blue {@inheritDoc}
\r
* @param alpha {@inheritDoc}
\r
*/
\r
* @param blue {@inheritDoc}
\r
* @param alpha {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMaterialDiffuse(float red,
\r
float green,
\r
float blue,
\r
public void pmdMaterialDiffuse(float red,
\r
float green,
\r
float blue,
\r
@@
-112,6
+116,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* @param green {@inheritDoc}
\r
* @param blue {@inheritDoc}
\r
*/
\r
* @param green {@inheritDoc}
\r
* @param blue {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMaterialAmbient(float red,
\r
float green,
\r
float blue ){
\r
public void pmdMaterialAmbient(float red,
\r
float green,
\r
float blue ){
\r
@@
-127,6
+132,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* @param blue {@inheritDoc}
\r
* @param shininess {@inheritDoc}
\r
*/
\r
* @param blue {@inheritDoc}
\r
* @param shininess {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMaterialSpecular(float red,
\r
float green,
\r
float blue,
\r
public void pmdMaterialSpecular(float red,
\r
float green,
\r
float blue,
\r
@@
-142,6
+148,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* @param hasEdge {@inheritDoc}
\r
* @param vertexNum {@inheritDoc}
\r
*/
\r
* @param hasEdge {@inheritDoc}
\r
* @param vertexNum {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMaterialInfo(boolean hasEdge, int vertexNum){
\r
this.currentMaterial.setEdgeAppearance(hasEdge);
\r
\r
public void pmdMaterialInfo(boolean hasEdge, int vertexNum){
\r
this.currentMaterial.setEdgeAppearance(hasEdge);
\r
\r
@@
-162,6
+169,7
@@
class MaterialBuilder implements PmdMaterialHandler {
* @param textureFile {@inheritDoc}
\r
* @param sphereFile {@inheritDoc}
\r
*/
\r
* @param textureFile {@inheritDoc}
\r
* @param sphereFile {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMaterialShading(int toonIdx,
\r
String textureFile,
\r
String sphereFile ){
\r
public void pmdMaterialShading(int toonIdx,
\r
String textureFile,
\r
String sphereFile ){
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdMorphStage;
\r
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdMorphStage;
\r
\r
@@
-88,6
+89,7
@@
class MorphBuilder implements PmdMorphHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdMorphStage;
\r
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdMorphStage;
\r
\r
@@
-108,6
+110,7
@@
class MorphBuilder implements PmdMorphHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdMorphStage;
\r
if(stage == PmdMorphHandler.MORPH_LIST){
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdMorphStage;
\r
if(stage == PmdMorphHandler.MORPH_LIST){
\r
@@
-125,6
+128,7
@@
class MorphBuilder implements PmdMorphHandler {
* @param morphName {@inheritDoc}
\r
* @param morphType {@inheritDoc}
\r
*/
\r
* @param morphName {@inheritDoc}
\r
* @param morphType {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMorphInfo(String morphName, byte morphType){
\r
this.currentMorphPart.getMorphName().setPrimaryText(morphName);
\r
MorphType type = MorphType.decode(morphType);
\r
public void pmdMorphInfo(String morphName, byte morphType){
\r
this.currentMorphPart.getMorphName().setPrimaryText(morphName);
\r
MorphType type = MorphType.decode(morphType);
\r
@@
-140,6
+144,7
@@
class MorphBuilder implements PmdMorphHandler {
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMorphVertexInfo(int serialId,
\r
float xPos, float yPos, float zPos){
\r
MorphVertex morphVertex;
\r
public void pmdMorphVertexInfo(int serialId,
\r
float xPos, float yPos, float zPos){
\r
MorphVertex morphVertex;
\r
@@
-167,6
+172,7
@@
class MorphBuilder implements PmdMorphHandler {
* {@inheritDoc}
\r
* @param morphId {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param morphId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdMorphOrderInfo(int morphId){
\r
MorphPart part = this.morphPartList.get(morphId);
\r
MorphType type = part.getMorphType();
\r
public void pmdMorphOrderInfo(int morphId){
\r
MorphPart part = this.morphPartList.get(morphId);
\r
MorphType type = part.getMorphType();
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
ListUtil.prepareDefConsList(this.rigidList, RigidInfo.class, loops);
\r
ListUtil.assignIndexedSerial(this.rigidList);
\r
public void loopStart(ParseStage stage, int loops){
\r
ListUtil.prepareDefConsList(this.rigidList, RigidInfo.class, loops);
\r
ListUtil.assignIndexedSerial(this.rigidList);
\r
@@
-75,6
+76,7
@@
class RigidBuilder implements PmdRigidHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
if(this.rigidIt.hasNext()){
\r
this.currentRigid = this.rigidIt.next();
\r
public void loopNext(ParseStage stage){
\r
if(this.rigidIt.hasNext()){
\r
this.currentRigid = this.rigidIt.next();
\r
@@
-86,6
+88,7
@@
class RigidBuilder implements PmdRigidHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
return;
\r
}
\r
public void loopEnd(ParseStage stage){
\r
return;
\r
}
\r
@@
-94,6
+97,7
@@
class RigidBuilder implements PmdRigidHandler {
* {@inheritDoc}
\r
* @param rigidName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param rigidName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidName(String rigidName){
\r
this.currentRigid.getRigidName().setPrimaryText(rigidName);
\r
return;
\r
public void pmdRigidName(String rigidName){
\r
this.currentRigid.getRigidName().setPrimaryText(rigidName);
\r
return;
\r
@@
-104,6
+108,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param rigidGroupId {@inheritDoc}
\r
* @param linkedBoneId {@inheritDoc}
\r
*/
\r
* @param rigidGroupId {@inheritDoc}
\r
* @param linkedBoneId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidInfo(int rigidGroupId, int linkedBoneId){
\r
BoneInfo bone = this.boneList.get(linkedBoneId);
\r
RigidGroup group = this.rigidGroupList.get(rigidGroupId);
\r
public void pmdRigidInfo(int rigidGroupId, int linkedBoneId){
\r
BoneInfo bone = this.boneList.get(linkedBoneId);
\r
RigidGroup group = this.rigidGroupList.get(rigidGroupId);
\r
@@
-122,6
+127,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param height {@inheritDoc}
\r
* @param depth {@inheritDoc}
\r
*/
\r
* @param height {@inheritDoc}
\r
* @param depth {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidShape(byte shapeType,
\r
float width, float height, float depth){
\r
RigidShape shape = this.currentRigid.getRigidShape();
\r
public void pmdRigidShape(byte shapeType,
\r
float width, float height, float depth){
\r
RigidShape shape = this.currentRigid.getRigidShape();
\r
@@
-142,6
+148,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param posY {@inheritDoc}
\r
* @param posZ {@inheritDoc}
\r
*/
\r
* @param posY {@inheritDoc}
\r
* @param posZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidPosition(float posX, float posY, float posZ){
\r
Pos3d position = this.currentRigid.getPosition();
\r
position.setXPos(posX);
\r
public void pmdRigidPosition(float posX, float posY, float posZ){
\r
Pos3d position = this.currentRigid.getPosition();
\r
position.setXPos(posX);
\r
@@
-156,6
+163,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param radY {@inheritDoc}
\r
* @param radZ {@inheritDoc}
\r
*/
\r
* @param radY {@inheritDoc}
\r
* @param radZ {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidRotation(float radX, float radY, float radZ){
\r
Rad3d rotation = this.currentRigid.getRotation();
\r
rotation.setXRad(radX);
\r
public void pmdRigidRotation(float radX, float radY, float radZ){
\r
Rad3d rotation = this.currentRigid.getRotation();
\r
rotation.setXRad(radX);
\r
@@
-172,6
+180,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param restitution {@inheritDoc}
\r
* @param friction {@inheritDoc}
\r
*/
\r
* @param restitution {@inheritDoc}
\r
* @param friction {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidPhysics(float mass,
\r
float dampingPos,
\r
float dampingRot,
\r
public void pmdRigidPhysics(float mass,
\r
float dampingPos,
\r
float dampingRot,
\r
@@
-193,6
+202,7
@@
class RigidBuilder implements PmdRigidHandler {
* @param behaveType {@inheritDoc}
\r
* @param collisionMap {@inheritDoc}
\r
*/
\r
* @param behaveType {@inheritDoc}
\r
* @param collisionMap {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdRigidBehavior(byte behaveType, short collisionMap){
\r
RigidBehaviorType type = RigidBehaviorType.decode(behaveType);
\r
this.currentRigid.setBehaviorType(type);
\r
public void pmdRigidBehavior(byte behaveType, short collisionMap){
\r
RigidBehaviorType type = RigidBehaviorType.decode(behaveType);
\r
this.currentRigid.setBehaviorType(type);
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
if(stage == PmdShapeHandler.VERTEX_LIST){
\r
ListUtil.prepareDefConsList(this.vertexList, Vertex.class, loops);
\r
public void loopStart(ParseStage stage, int loops){
\r
if(stage == PmdShapeHandler.VERTEX_LIST){
\r
ListUtil.prepareDefConsList(this.vertexList, Vertex.class, loops);
\r
@@
-105,6
+106,7
@@
class ShapeBuilder implements PmdShapeHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
if(stage == PmdShapeHandler.VERTEX_LIST){
\r
if(this.vertexIt.hasNext()){
\r
public void loopNext(ParseStage stage){
\r
if(stage == PmdShapeHandler.VERTEX_LIST){
\r
if(this.vertexIt.hasNext()){
\r
@@
-125,6
+127,7
@@
class ShapeBuilder implements PmdShapeHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
return;
\r
}
\r
public void loopEnd(ParseStage stage){
\r
return;
\r
}
\r
@@
-135,6
+138,7
@@
class ShapeBuilder implements PmdShapeHandler {
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
* @param yPos {@inheritDoc}
\r
* @param zPos {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdVertexPosition(float xPos, float yPos, float zPos){
\r
Pos3d position = this.currentVertex.getPosition();
\r
position.setXPos(xPos);
\r
public void pmdVertexPosition(float xPos, float yPos, float zPos){
\r
Pos3d position = this.currentVertex.getPosition();
\r
position.setXPos(xPos);
\r
@@
-149,6
+153,7
@@
class ShapeBuilder implements PmdShapeHandler {
* @param yVec {@inheritDoc}
\r
* @param zVec {@inheritDoc}
\r
*/
\r
* @param yVec {@inheritDoc}
\r
* @param zVec {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdVertexNormal(float xVec, float yVec, float zVec){
\r
Vec3d normal = this.currentVertex.getNormal();
\r
normal.setXVal(xVec);
\r
public void pmdVertexNormal(float xVec, float yVec, float zVec){
\r
Vec3d normal = this.currentVertex.getNormal();
\r
normal.setXVal(xVec);
\r
@@
-162,6
+167,7
@@
class ShapeBuilder implements PmdShapeHandler {
* @param uVal {@inheritDoc}
\r
* @param vVal {@inheritDoc}
\r
*/
\r
* @param uVal {@inheritDoc}
\r
* @param vVal {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdVertexUV(float uVal, float vVal){
\r
Pos2d uv = this.currentVertex.getUVPosition();
\r
uv.setXPos(uVal);
\r
public void pmdVertexUV(float uVal, float vVal){
\r
Pos2d uv = this.currentVertex.getUVPosition();
\r
uv.setXPos(uVal);
\r
@@
-175,6
+181,7
@@
class ShapeBuilder implements PmdShapeHandler {
* @param boneId2 {@inheritDoc}
\r
* @param weightForB1 {@inheritDoc}
\r
*/
\r
* @param boneId2 {@inheritDoc}
\r
* @param weightForB1 {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdVertexWeight(int boneId1, int boneId2, int weightForB1){
\r
BoneInfo bone1 = prepareBone(boneId1);
\r
BoneInfo bone2 = prepareBone(boneId2);
\r
public void pmdVertexWeight(int boneId1, int boneId2, int weightForB1){
\r
BoneInfo bone1 = prepareBone(boneId1);
\r
BoneInfo bone2 = prepareBone(boneId2);
\r
@@
-189,6
+196,7
@@
class ShapeBuilder implements PmdShapeHandler {
* {@inheritDoc}
\r
* @param hideEdge {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param hideEdge {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdVertexEdge(boolean hideEdge){
\r
this.currentVertex.setEdgeAppearance( ! hideEdge );
\r
return;
\r
public void pmdVertexEdge(boolean hideEdge){
\r
this.currentVertex.setEdgeAppearance( ! hideEdge );
\r
return;
\r
@@
-200,6
+208,7
@@
class ShapeBuilder implements PmdShapeHandler {
* @param vertexId2 {@inheritDoc}
\r
* @param vertexId3 {@inheritDoc}
\r
*/
\r
* @param vertexId2 {@inheritDoc}
\r
* @param vertexId3 {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdSurfaceTriangle(int vertexId1,
\r
int vertexId2,
\r
int vertexId3 ){
\r
public void pmdSurfaceTriangle(int vertexId1,
\r
int vertexId2,
\r
int vertexId3 ){
\r
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
(file)
--- 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 {
/**
\r
* {@inheritDoc}
\r
*/
\r
/**
\r
* {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdParseStart(){
\r
return;
\r
}
\r
public void pmdParseStart(){
\r
return;
\r
}
\r
@@
-81,6
+82,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param hasMoreData {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param hasMoreData {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdParseEnd(boolean hasMoreData){
\r
this.hasMoreData = hasMoreData;
\r
return;
\r
public void pmdParseEnd(boolean hasMoreData){
\r
this.hasMoreData = hasMoreData;
\r
return;
\r
@@
-91,6
+93,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdEngStage;
\r
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage instanceof PmdEngStage;
\r
\r
@@
-132,6
+135,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdEngStage;
\r
\r
public void loopNext(ParseStage stage){
\r
assert stage instanceof PmdEngStage;
\r
\r
@@
-158,6
+162,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdEngStage;
\r
return;
\r
public void loopEnd(ParseStage stage){
\r
assert stage instanceof PmdEngStage;
\r
return;
\r
@@
-167,6
+172,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param ver {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param ver {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdHeaderInfo(float ver){
\r
this.model.setHeaderVersion(ver);
\r
return;
\r
public void pmdHeaderInfo(float ver){
\r
this.model.setHeaderVersion(ver);
\r
return;
\r
@@
-177,6
+183,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* @param modelName {@inheritDoc}
\r
* @param description {@inheritDoc}
\r
*/
\r
* @param modelName {@inheritDoc}
\r
* @param description {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdModelInfo(String modelName, String description){
\r
this.modelName .setPrimaryText(modelName);
\r
this.description.setPrimaryText(description);
\r
public void pmdModelInfo(String modelName, String description){
\r
this.modelName .setPrimaryText(modelName);
\r
this.description.setPrimaryText(description);
\r
@@
-187,6
+194,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param hasEnglishInfo {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param hasEnglishInfo {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdEngEnabled(boolean hasEnglishInfo){
\r
return;
\r
}
\r
public void pmdEngEnabled(boolean hasEnglishInfo){
\r
return;
\r
}
\r
@@
-196,6
+204,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* @param modelName {@inheritDoc}
\r
* @param description {@inheritDoc}
\r
*/
\r
* @param modelName {@inheritDoc}
\r
* @param description {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdEngModelInfo(String modelName, String description){
\r
this.modelName .setGlobalText(modelName);
\r
this.description.setGlobalText(description);
\r
public void pmdEngModelInfo(String modelName, String description){
\r
this.modelName .setGlobalText(modelName);
\r
this.description.setGlobalText(description);
\r
@@
-206,6
+215,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param boneName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param boneName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdEngBoneInfo(String boneName){
\r
this.currentBone.getBoneName().setGlobalText(boneName);
\r
return;
\r
public void pmdEngBoneInfo(String boneName){
\r
this.currentBone.getBoneName().setGlobalText(boneName);
\r
return;
\r
@@
-215,6
+225,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param morphName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param morphName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdEngMorphInfo(String morphName){
\r
this.currentMorphPart.getMorphName().setGlobalText(morphName);
\r
return;
\r
public void pmdEngMorphInfo(String morphName){
\r
this.currentMorphPart.getMorphName().setGlobalText(morphName);
\r
return;
\r
@@
-224,6
+235,7
@@
class TextBuilder implements PmdBasicHandler, PmdEngHandler {
* {@inheritDoc}
\r
* @param groupName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param groupName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdEngBoneGroupInfo(String groupName){
\r
this.currentBoneGroup.getGroupName().setGlobalText(groupName);
\r
return;
\r
public void pmdEngBoneGroupInfo(String groupName){
\r
this.currentBoneGroup.getGroupName().setGlobalText(groupName);
\r
return;
\r
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
(file)
--- 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}
\r
* @param loops {@inheritDoc}
\r
*/
\r
* @param stage {@inheritDoc}
\r
* @param loops {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
assert loops == PmdLimits.TOON_FIXEDNUM;
\r
public void loopStart(ParseStage stage, int loops){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
assert loops == PmdLimits.TOON_FIXEDNUM;
\r
@@
-51,6
+52,7
@@
class ToonBuilder implements PmdToonHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
this.index++;
\r
public void loopNext(ParseStage stage){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
this.index++;
\r
@@
-61,6
+63,7
@@
class ToonBuilder implements PmdToonHandler {
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stage {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
this.model.setToonMap(this.toonMap);
\r
public void loopEnd(ParseStage stage){
\r
assert stage == PmdToonHandler.TOON_LIST;
\r
this.model.setToonMap(this.toonMap);
\r
@@
-71,6
+74,7
@@
class ToonBuilder implements PmdToonHandler {
* {@inheritDoc}
\r
* @param toonFileName {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param toonFileName {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void pmdToonFileInfo(String toonFileName){
\r
this.toonMap.setIndexedToon(this.index, toonFileName);
\r
return;
\r
public void pmdToonFileInfo(String toonFileName){
\r
this.toonMap.setIndexedToon(this.index, toonFileName);
\r
return;
\r
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
(file)
--- 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 =
\r
"100923";
\r
public static final String LOCAL_SCHEMA_PMDXML =
\r
public static final String VER_PMDXML =
\r
"100923";
\r
public static final String LOCAL_SCHEMA_PMDXML =
\r
- "
./
resources/pmdxml-100923.xsd";
\r
+ "resources/pmdxml-100923.xsd";
\r
public static final String LOCAL_DTD_PMDXML =
\r
public static final String LOCAL_DTD_PMDXML =
\r
- "
./
resources/pmdxml-100923.dtd";
\r
+ "resources/pmdxml-100923.dtd";
\r
\r
public static final URI URI_SCHEMA_PMDXML = URI.create(SCHEMA_PMDXML);
\r
public static final URI URI_DTD_PMDXML = URI.create(DTD_PMDXML);
\r
\r
public static final URI URI_SCHEMA_PMDXML = URI.create(SCHEMA_PMDXML);
\r
public static final URI URI_DTD_PMDXML = URI.create(DTD_PMDXML);
\r
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
(file)
--- 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){
\r
final Iterator<Element> iterator = getChildIterator(parent, childTag);
\r
Iterable<Element> result = new Iterable<Element>(){
\r
String childTag){
\r
final Iterator<Element> iterator = getChildIterator(parent, childTag);
\r
Iterable<Element> result = new Iterable<Element>(){
\r
+ @Override
\r
public Iterator<Element> iterator(){
\r
return iterator;
\r
}
\r
public Iterator<Element> iterator(){
\r
return iterator;
\r
}
\r
@@
-326,6
+327,7
@@
public final class DomUtils {
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public boolean hasNext(){
\r
if(this.next == null) return false;
\r
return true;
\r
public boolean hasNext(){
\r
if(this.next == null) return false;
\r
return true;
\r
@@
-336,6
+338,7
@@
public final class DomUtils {
* @return {@inheritDoc}
\r
* @throws NoSuchElementException {@inheritDoc}
\r
*/
\r
* @return {@inheritDoc}
\r
* @throws NoSuchElementException {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Element next() throws NoSuchElementException{
\r
if(this.next == null) throw new NoSuchElementException();
\r
Element result = this.next;
\r
public Element next() throws NoSuchElementException{
\r
if(this.next == null) throw new NoSuchElementException();
\r
Element result = this.next;
\r
@@
-347,6
+350,7
@@
public final class DomUtils {
* {@inheritDoc}
\r
* ※ 未サポート。
\r
*/
\r
* {@inheritDoc}
\r
* ※ 未サポート。
\r
*/
\r
+ @Override
\r
public void remove(){
\r
throw new UnsupportedOperationException();
\r
}
\r
public void remove(){
\r
throw new UnsupportedOperationException();
\r
}
\r
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
(file)
--- 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";
\r
\r
private static final String LOCAL_SCHEMA_XML =
\r
"http://www.w3.org/2001/XMLSchema-instance";
\r
\r
private static final String LOCAL_SCHEMA_XML =
\r
- "
./
resources/xml-2009-01.xsd";
\r
+ "resources/xml-2009-01.xsd";
\r
private static final URI EMPTY_URI = URI.create("");
\r
private static final Class THISCLASS = XmlResourceResolver.class;
\r
\r
private static final URI EMPTY_URI = URI.create("");
\r
private static final Class THISCLASS = XmlResourceResolver.class;
\r
\r
@@
-147,6
+147,7
@@
public class XmlResourceResolver
* @param baseURI {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* @param baseURI {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public LSInput resolveResource(String type,
\r
String namespaceURI,
\r
String publicId,
\r
public LSInput resolveResource(String type,
\r
String namespaceURI,
\r
String publicId,
\r
@@
-186,6
+187,7
@@
public class XmlResourceResolver
* @throws org.xml.sax.SAXException {@inheritDoc}
\r
* @throws java.io.IOException {@inheritDoc}
\r
*/
\r
* @throws org.xml.sax.SAXException {@inheritDoc}
\r
* @throws java.io.IOException {@inheritDoc}
\r
*/
\r
+ @Override
\r
public InputSource resolveEntity(String publicId, String systemId)
\r
throws SAXException, IOException{
\r
if(systemId == null) return null;
\r
public InputSource resolveEntity(String publicId, String systemId)
\r
throws SAXException, IOException{
\r
if(systemId == null) return null;
\r
@@
-235,6
+237,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public String getBaseURI(){
\r
return this.baseURI;
\r
}
\r
public String getBaseURI(){
\r
return this.baseURI;
\r
}
\r
@@
-243,6
+246,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param baseURI {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param baseURI {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setBaseURI(String baseURI){
\r
this.baseURI = baseURI;
\r
return;
\r
public void setBaseURI(String baseURI){
\r
this.baseURI = baseURI;
\r
return;
\r
@@
-252,6
+256,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public InputStream getByteStream(){
\r
return this.byteStream;
\r
}
\r
public InputStream getByteStream(){
\r
return this.byteStream;
\r
}
\r
@@
-260,6
+265,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param byteStream {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param byteStream {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setByteStream(InputStream byteStream){
\r
this.byteStream = byteStream;
\r
}
\r
public void setByteStream(InputStream byteStream){
\r
this.byteStream = byteStream;
\r
}
\r
@@
-268,6
+274,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public boolean getCertifiedText(){
\r
return this.certifiedText;
\r
}
\r
public boolean getCertifiedText(){
\r
return this.certifiedText;
\r
}
\r
@@
-276,6
+283,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param certifiedText {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param certifiedText {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setCertifiedText(boolean certifiedText){
\r
this.certifiedText = certifiedText;
\r
return;
\r
public void setCertifiedText(boolean certifiedText){
\r
this.certifiedText = certifiedText;
\r
return;
\r
@@
-285,6
+293,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public Reader getCharacterStream(){
\r
return this.characterStream;
\r
}
\r
public Reader getCharacterStream(){
\r
return this.characterStream;
\r
}
\r
@@
-293,6
+302,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param characterStream {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param characterStream {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setCharacterStream(Reader characterStream){
\r
this.characterStream = characterStream;
\r
}
\r
public void setCharacterStream(Reader characterStream){
\r
this.characterStream = characterStream;
\r
}
\r
@@
-301,6
+311,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public String getEncoding(){
\r
return this.encoding;
\r
}
\r
public String getEncoding(){
\r
return this.encoding;
\r
}
\r
@@
-309,6
+320,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param encoding {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param encoding {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setEncoding(String encoding){
\r
this.encoding = encoding;
\r
return;
\r
public void setEncoding(String encoding){
\r
this.encoding = encoding;
\r
return;
\r
@@
-318,6
+330,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public String getPublicId(){
\r
return this.publicId;
\r
}
\r
public String getPublicId(){
\r
return this.publicId;
\r
}
\r
@@
-326,6
+339,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param publicId {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param publicId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setPublicId(String publicId){
\r
this.publicId = publicId;
\r
return;
\r
public void setPublicId(String publicId){
\r
this.publicId = publicId;
\r
return;
\r
@@
-335,6
+349,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public String getStringData(){
\r
return this.stringData;
\r
}
\r
public String getStringData(){
\r
return this.stringData;
\r
}
\r
@@
-343,6
+358,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param stringData {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param stringData {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setStringData(String stringData){
\r
this.stringData = stringData;
\r
return;
\r
public void setStringData(String stringData){
\r
this.stringData = stringData;
\r
return;
\r
@@
-352,6
+368,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @return {@inheritDoc}
\r
*/
\r
+ @Override
\r
public String getSystemId(){
\r
return this.systemId;
\r
}
\r
public String getSystemId(){
\r
return this.systemId;
\r
}
\r
@@
-360,6
+377,7
@@
public class XmlResourceResolver
* {@inheritDoc}
\r
* @param systemId {@inheritDoc}
\r
*/
\r
* {@inheritDoc}
\r
* @param systemId {@inheritDoc}
\r
*/
\r
+ @Override
\r
public void setSystemId(String systemId){
\r
this.systemId = systemId;
\r
return;
\r
public void setSystemId(String systemId){
\r
this.systemId = systemId;
\r
return;
\r