[no commit message]

diff --git a/src/main/java/jp/sourceforge/mikutoga/corelib/ListUtil.java b/src/main/java/jp/sourceforge/mikutoga/corelib/ListUtil.java
index be0fe89..5e3545c 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/corelib/ListUtil.java
+++ b/src/main/java/jp/sourceforge/mikutoga/corelib/ListUtil.java
@@ -10,6 +10,7 @@ package jp.sourceforge.mikutoga.corelib;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;

+import jp.sourceforge.mikutoga.pmd.model.SerialNumbered;

 
 /**
  * リスト構造の各種ユーティリティ。
 
 /**
  * リスト構造の各種ユーティリティ。

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
index a9688e6..6c598d2 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import java.util.Iterator;
 import java.util.List;
 import jp.sourceforge.mikutoga.corelib.I18nText;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 
 /**
  * ボーングループ。
 
 /**
  * ボーングループ。

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
index 987a27b..35452a8 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
@@ -8,7 +8,6 @@
 package jp.sourceforge.mikutoga.pmd.model;
 
 import jp.sourceforge.mikutoga.corelib.I18nText;
 package jp.sourceforge.mikutoga.pmd.model;
 
 import jp.sourceforge.mikutoga.corelib.I18nText;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 
 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
index 1744c7d..6e6e26c 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import java.util.Iterator;
 import java.util.List;
 import jp.sourceforge.mikutoga.corelib.I18nText;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.MorphType;
 
 /**
 import jp.sourceforge.mikutoga.pmd.MorphType;
 
 /**

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
index 24c49e4..0a32e9a 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
@@ -8,7 +8,6 @@
 package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.Comparator;
 package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.Comparator;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.Pos3d;
 
 /**
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 
 /**

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
index 8c4ee40..266964c 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
@@ -10,7 +10,6 @@ package jp.sourceforge.mikutoga.pmd.model;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 
 /**
  * 剛体グループ情報。
 
 /**
  * 剛体グループ情報。

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
index f8ee9dd..b196dfd 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
@@ -7,12 +7,9 @@
 
 package jp.sourceforge.mikutoga.pmd.model;
 
 
 package jp.sourceforge.mikutoga.pmd.model;
 

-import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
-import jp.sourceforge.mikutoga.pmd.model.BoneInfo;

 import java.util.ArrayList;
 import java.util.Collection;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import java.util.ArrayList;
 import java.util.Collection;
 import jp.sourceforge.mikutoga.corelib.I18nText;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
 import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
 import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;

diff --git a/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/SerialNumbered.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/SerialNumbered.java
index 4925ebe..fdecaf5 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/corelib/SerialNumbered.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/SerialNumbered.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
  * Copyright(c) 2010 MikuToga Partners
  */
 

-package jp.sourceforge.mikutoga.corelib;
+package jp.sourceforge.mikutoga.pmd.model;

 
 import java.util.Comparator;
 
 
 import java.util.Comparator;
 

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
index 0bb81b4..b710c12 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
@@ -10,7 +10,6 @@ package jp.sourceforge.mikutoga.pmd.model;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 
 /**
  * 3頂点の三角形からなる面情報。
 
 /**
  * 3頂点の三角形からなる面情報。

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
index 751f3cf..0e565eb 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
@@ -7,8 +7,6 @@
 
 package jp.sourceforge.mikutoga.pmd.model;
 
 
 package jp.sourceforge.mikutoga.pmd.model;
 

-import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Vec3d;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Vec3d;

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
index 1e06c04..416bb81 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/binio/PmdExporterBase.java
@@ -15,7 +15,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.MorphType;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.MorphType;
 import jp.sourceforge.mikutoga.pmd.Pos2d;


@@ -28,6 +27,7 @@ import jp.sourceforge.mikutoga.pmd.model.Material;
 import jp.sourceforge.mikutoga.pmd.model.MorphPart;
 import jp.sourceforge.mikutoga.pmd.model.MorphVertex;
 import jp.sourceforge.mikutoga.pmd.model.PmdModel;
 import jp.sourceforge.mikutoga.pmd.model.MorphPart;
 import jp.sourceforge.mikutoga.pmd.model.MorphVertex;
 import jp.sourceforge.mikutoga.pmd.model.PmdModel;

+import jp.sourceforge.mikutoga.pmd.model.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.model.ShadeInfo;
 import jp.sourceforge.mikutoga.pmd.model.Surface;
 import jp.sourceforge.mikutoga.pmd.model.Vertex;
 import jp.sourceforge.mikutoga.pmd.model.ShadeInfo;
 import jp.sourceforge.mikutoga.pmd.model.Surface;
 import jp.sourceforge.mikutoga.pmd.model.Vertex;

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
index ab23212..3cd685a 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
@@ -13,7 +13,6 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import java.util.List;
 import java.util.Map;
 import jp.sourceforge.mikutoga.corelib.I18nText;

-import jp.sourceforge.mikutoga.corelib.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Deg3d;
 import jp.sourceforge.mikutoga.pmd.MorphType;
 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Deg3d;
 import jp.sourceforge.mikutoga.pmd.MorphType;


@@ -35,6 +34,7 @@ import jp.sourceforge.mikutoga.pmd.model.PmdModel;
 import jp.sourceforge.mikutoga.pmd.model.RigidGroup;
 import jp.sourceforge.mikutoga.pmd.model.RigidInfo;
 import jp.sourceforge.mikutoga.pmd.model.RigidShape;
 import jp.sourceforge.mikutoga.pmd.model.RigidGroup;
 import jp.sourceforge.mikutoga.pmd.model.RigidInfo;
 import jp.sourceforge.mikutoga.pmd.model.RigidShape;

+import jp.sourceforge.mikutoga.pmd.model.SerialNumbered;

 import jp.sourceforge.mikutoga.pmd.model.ShadeInfo;
 import jp.sourceforge.mikutoga.pmd.model.Surface;
 import jp.sourceforge.mikutoga.pmd.model.ToonMap;
 import jp.sourceforge.mikutoga.pmd.model.ShadeInfo;
 import jp.sourceforge.mikutoga.pmd.model.Surface;
 import jp.sourceforge.mikutoga.pmd.model.ToonMap;