テスト修正

[ea2ddl/ea2ddl.git] / ea2ddl-dao / src / main / java / jp / sourceforge / ea2ddl / dao / exbhv / TPackageBhv.java

diff --git a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
index 62596b3..7198ef7 100644 (file)
--- a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
+++ b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
@@ -2,52 +2,44 @@ package jp.sourceforge.ea2ddl.dao.exbhv;
 \r
 import javax.persistence.EntityNotFoundException;\r
 \r
-import org.seasar.framework.container.annotation.tiger.Binding;\r
-\r
-import jp.sourceforge.ea2ddl.common.config.Config;\r
 import jp.sourceforge.ea2ddl.dao.cbean.TPackageCB;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TPackage;\r
 \r
 /**\r
  * The behavior of t_package.\r
  * <p>\r
- * You can implement your original methods here.\r
- * This class is NOT overrided when re-generating.\r
+ * You can implement your original methods here. This class is NOT overrided\r
+ * when re-generating.\r
  * </p>\r
+ * \r
  * @author DBFlute(AutoGenerator)\r
  */\r
 public class TPackageBhv extends jp.sourceforge.ea2ddl.dao.bsbhv.BsTPackageBhv {\r
-       private Config _config;\r
-\r
-       @Binding\r
-       public void setConfig(Config config) {\r
-               _config = config;\r
-       }\r
 \r
        /**\r
         * パッケージツリーから対象のパッケージオブジェクトを検索する。\r
-        * @param packageTree 対象パッケージのルートからのパス\r
+        * \r
+        * @param packageTree\r
+        *            対象パッケージのルートからのパス\r
         * @return パッケージ\r
         */\r
        public TPackage selectPackage(String packageTree) {\r
                final String[] packageNames = packageTree.split("[/.]");\r
 \r
-               TPackage pkg = selectRoot();\r
+               TPackage pkg = null;\r
                for (int i = 0; i < packageNames.length; i++) {\r
                        final TPackageCB cb = new TPackageCB();\r
-                       cb.query().setParentId_Equal(pkg.getPackageId());\r
+                       if (pkg != null) {\r
+                               cb.query().setParentId_Equal(pkg.getPackageId());\r
+                       }\r
                        cb.query().setName_Equal(packageNames[i]);\r
                        pkg = selectEntity(cb);\r
                        if (pkg == null) {\r
-                               throw new EntityNotFoundException("Package " + packageNames[i] + " in " + packageTree + " is not found.");\r
+                               throw new EntityNotFoundException("Package " + packageNames[i] + " in " + packageTree\r
+                                               + " is not found.");\r
                        }\r
                }\r
                return pkg;\r
        }\r
-       \r
-       public TPackage selectRoot() {\r
-               final TPackageCB cb = new TPackageCB();\r
-               cb.query().setName_Equal(_config.getProperty("root.package.name"));\r
-               return selectEntity(cb);\r
-       }\r
+\r
 }\r