svnno****@sourc*****
svnno****@sourc*****
2009年 4月 5日 (日) 20:37:22 JST
Revision: 3116
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3116
Author: j5ik2o
Date: 2009-04-05 20:37:21 +0900 (Sun, 05 Apr 2009)
Log Message:
-----------
リファクタリング
Modified Paths:
--------------
charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java
-------------- next part --------------
Modified: charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-05 11:35:21 UTC (rev 3115)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-05 11:37:21 UTC (rev 3116)
@@ -17,6 +17,7 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
+import java.util.regex.Pattern;
import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
@@ -56,21 +57,21 @@
Validate.notNull(config.getRootPackageName());
Validate.notNull(config.getEntityPackageName());
Validate.notNull(config.getJavaFileEncoding());
-// Validate.notNull(config.getJavaFileSrcDirs());
-// Validate.notEmpty(config.getJavaFileSrcDirs());
-// Validate.notNull(config.getEntityClassNamePatterns());
-// Validate.notEmpty(config.getEntityClassNamePatterns());
-// Validate.notNull(config.getIgnoreEntityClassNamePatterns());
-// Validate.notEmpty(config.getIgnoreEntityClassNamePatterns());
EntityMetaReaderContext context = new EntityMetaReaderContext();
context.setClassPathDirs(toFiles(config.getClassPathDirs()));
-// context.setJavaFileSrcDirs(toFiles(config.getJavaFileSrcDirs()));
+ if (config.getJavaFileSrcDirs() != null) {
+ context.setJavaSrcFileDirs(toFiles(config.getJavaFileSrcDirs()));
+ }
+ if (config.getEntityClassNamePatterns() != null) {
+ context.setShortClassNamePatterns(toPatterns(config.getEntityClassNamePatterns()));
+ }
+ if (config.getIgnoreEntityClassNamePatterns() != null) {
+ context.setIgnoreShortClassNamePatterns(toPatterns(config.getIgnoreEntityClassNamePatterns()));
+ }
context.setPackageName(ClassUtil.concatName(config.getRootPackageName(), config.getEntityPackageName()));
context.setJavaFileEncoding(config.getJavaFileEncoding());
-
context.setEntityMetaFactory(new EntityMetaFactoryImpl(new TableMetaFactoryImpl()));
-
EntityMetaReader entityMetaReader = new EntityMetaReaderImpl(context);
try {
@@ -94,4 +95,12 @@
}
return result;
}
+
+ private List<Pattern> toPatterns(List<String> patterns) {
+ List<Pattern> result = CollectionsUtil.newArrayList();
+ for (String pattern : patterns) {
+ result.add(Pattern.compile(pattern));
+ }
+ return result;
+ }
}