From 863254f60516fe947455b7336d07c25eddca3bb7 Mon Sep 17 00:00:00 2001 From: Olyutorskii Date: Tue, 23 Aug 2011 23:13:02 +0900 Subject: [PATCH] [no commit message] --- .../{pmdexporter => model/binio}/AbstractExporter.java | 2 +- .../pmd/{pmdloader => model/binio}/BoneBuilder.java | 2 +- .../{pmdexporter => model/binio}/IllegalPmdException.java | 2 +- .../binio}/IllegalPmdTextException.java | 2 +- .../pmd/{pmdloader => model/binio}/JointBuilder.java | 2 +- .../pmd/{pmdloader => model/binio}/MaterialBuilder.java | 2 +- .../pmd/{pmdloader => model/binio}/MorphBuilder.java | 2 +- .../pmd/{pmdexporter => model/binio}/PmdExporter.java | 2 +- .../pmd/{pmdexporter => model/binio}/PmdExporterBase.java | 2 +- .../pmd/{pmdexporter => model/binio}/PmdExporterExt1.java | 2 +- .../pmd/{pmdexporter => model/binio}/PmdExporterExt2.java | 2 +- .../pmd/{pmdexporter => model/binio}/PmdExporterExt3.java | 2 +- .../pmd/{pmdloader => model/binio}/PmdLoader.java | 2 +- .../pmd/{pmdloader => model/binio}/RigidBuilder.java | 2 +- .../pmd/{pmdloader => model/binio}/ShapeBuilder.java | 2 +- .../pmd/{pmdloader => model/binio}/TextBuilder.java | 2 +- .../pmd/{pmdloader => model/binio}/ToonBuilder.java | 2 +- .../pmd/{pmdexporter => model/binio}/package-info.java | 4 ++-- .../sourceforge/mikutoga/pmd/pmdloader/package-info.java | 15 --------------- 19 files changed, 19 insertions(+), 34 deletions(-) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/AbstractExporter.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/BoneBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/IllegalPmdException.java (92%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/IllegalPmdTextException.java (94%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/JointBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/MaterialBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/MorphBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/PmdExporter.java (93%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/PmdExporterBase.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/PmdExporterExt1.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/PmdExporterExt2.java (97%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/PmdExporterExt3.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/PmdLoader.java (98%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/RigidBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/ShapeBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/TextBuilder.java (99%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdloader => model/binio}/ToonBuilder.java (97%) rename src/main/java/jp/sourceforge/mikutoga/pmd/{pmdexporter => model/binio}/package-info.java (54%) delete mode 100644 src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/package-info.java diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/AbstractExporter.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/AbstractExporter.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/AbstractExporter.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/AbstractExporter.java index dcff552..6f21bfc 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/AbstractExporter.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/AbstractExporter.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/BoneBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/BoneBuilder.java index 9722683..8b50024 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/BoneBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.Iterator; import java.util.LinkedList; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdException.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdException.java similarity index 92% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdException.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdException.java index 6beb293..c744d1c 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdException.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdException.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; /** * モデルデータの不備を発見した場合の例外。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdTextException.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdTextException.java similarity index 94% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdTextException.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdTextException.java index fdb3d46..6b5cac8 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/IllegalPmdTextException.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/IllegalPmdTextException.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; /** * 不正なテキスト情報をモデルデータ中に発見した場合の例外。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/JointBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/JointBuilder.java index 0d65342..a4531e1 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/JointBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MaterialBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MaterialBuilder.java index bdc5e5a..8797967 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MaterialBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.awt.Color; import java.util.Iterator; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MorphBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MorphBuilder.java index e2b57cf..725068d 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/MorphBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporter.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporter.java similarity index 93% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporter.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporter.java index c08946f..0cc9280 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporter.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporter.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.OutputStream; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java index f076253..1e06c04 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.awt.Color; import java.io.IOException; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt1.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt1.java index b8a1d90..38f629c 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt1.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt2.java similarity index 97% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt2.java index 6ffc330..290c150 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt2.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java index daf75d2..f5738f0 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterExt3.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java index d11fd10..921cfed 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdLoader.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/RigidBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/RigidBuilder.java index 0e03f7c..efccc62 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/RigidBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ShapeBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ShapeBuilder.java index e74bfc0..8a0c119 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ShapeBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/TextBuilder.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/TextBuilder.java index dd532d2..51c0ac8 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/TextBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ToonBuilder.java similarity index 97% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ToonBuilder.java index f5ddb0f..a143d80 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/ToonBuilder.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.pmd.pmdloader; +package jp.sourceforge.mikutoga.pmd.model.binio; import jp.sourceforge.mikutoga.parser.ParseStage; import jp.sourceforge.mikutoga.pmd.model.PmdModel; diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/package-info.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/package-info.java similarity index 54% rename from src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/package-info.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/package-info.java index a1eb5a8..09c41bc 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/package-info.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/package-info.java @@ -6,9 +6,9 @@ */ /** - * PMDモデルファイル(*.pmd)用エクスポーター。 + * PMDモデルファイル(*.pmd)用入出力。 */ -package jp.sourceforge.mikutoga.pmd.pmdexporter; +package jp.sourceforge.mikutoga.pmd.model.binio; /* EOF */ diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/package-info.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/package-info.java deleted file mode 100644 index 3d9a418..0000000 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/package-info.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * package information for Javadoc - * - * License : The MIT License - * Copyright(c) 2010 MikuToga Partners - */ - -/** - * PMDモデルファイルをパースし、 - * 内容を反映したオブジェクト群を構築するためのライブラリ。 - */ - -package jp.sourceforge.mikutoga.pmd.pmdloader; - -/* EOF */ -- 2.11.0