[no commit message]

[mikutoga/TogaGem.git] / src / main / java / jp / sourceforge / mikutoga / pmd / pmdloader / MorphBuilder.java

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 40b0789..e2b57cf 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java
@@ -14,13 +14,13 @@ import java.util.List;
 import java.util.Map;
 import jp.sourceforge.mikutoga.corelib.ListUtil;
 import jp.sourceforge.mikutoga.parser.ParseStage;
-import jp.sourceforge.mikutoga.parser.pmd.PmdMorphHandler;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.MorphVertex;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+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.Vertex;
+import jp.sourceforge.mikutoga.pmd.parser.PmdMorphHandler;
 
 /**
  * モーフ関係の通知をパーサから受け取る。
@@ -64,8 +64,6 @@ class MorphBuilder implements PmdMorphHandler {
      */
     @Override
     public void loopStart(ParseStage stage, int loops){
-        assert stage instanceof PmdMorphStage;
-
         if(stage == PmdMorphHandler.MORPH_LIST){
             ListUtil.prepareDefConsList(this.morphPartList,
                                         MorphPart.class,
@@ -80,6 +78,9 @@ class MorphBuilder implements PmdMorphHandler {
             // NOTHING
         }else if(stage == PmdMorphHandler.MORPHORDER_LIST){
             // NOTHING
+        }else{
+            assert false;
+            throw new AssertionError();
         }
 
         return;
@@ -91,8 +92,6 @@ class MorphBuilder implements PmdMorphHandler {
      */
     @Override
     public void loopNext(ParseStage stage){
-        assert stage instanceof PmdMorphStage;
-
         if(stage == PmdMorphHandler.MORPH_LIST){
             if(this.morphPartIt.hasNext()){
                 this.currentMorphPart = this.morphPartIt.next();
@@ -101,6 +100,9 @@ class MorphBuilder implements PmdMorphHandler {
             // NOTHING
         }else if(stage == PmdMorphHandler.MORPHORDER_LIST){
             // NOTHING
+        }else{
+            assert false;
+            throw new AssertionError();
         }
 
         return;
@@ -112,13 +114,15 @@ class MorphBuilder implements PmdMorphHandler {
      */
     @Override
     public void loopEnd(ParseStage stage){
-        assert stage instanceof PmdMorphStage;
         if(stage == PmdMorphHandler.MORPH_LIST){
             // NOTHING
         }else if(stage == PmdMorphHandler.MORPHVERTEX_LIST){
             // NOTHING
         }else if(stage == PmdMorphHandler.MORPHORDER_LIST){
             // NOTHING
+        }else{
+            assert false;
+            throw new AssertionError();
         }
         return;
     }