svnno****@sourc*****
svnno****@sourc*****
2009年 4月 3日 (金) 20:21:05 JST
Revision: 3083
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3083
Author: daisuke_m
Date: 2009-04-03 20:21:05 +0900 (Fri, 03 Apr 2009)
Log Message:
-----------
refactor
Modified Paths:
--------------
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/meta/EntityMeta.java
charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/utils/ClassLoaderUtil.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-03 09:42:24 UTC (rev 3082)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-03 11:21:05 UTC (rev 3083)
@@ -18,6 +18,8 @@
import java.util.List;
import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jiemamy.composer.ImportException;
import org.jiemamy.composer.Importer;
@@ -36,6 +38,9 @@
*/
public class JpaImporter implements Importer<JpaImportConfig> {
+ private static Logger logger = LoggerFactory.getLogger(JpaImporter.class);
+
+
public String getName() {
return "JPA Importer";
}
@@ -72,7 +77,7 @@
EntityMetaReader entityMetaReader = new EntityMetaReaderImpl(context);
List<EntityMeta> entityMetas = entityMetaReader.read();
for (EntityMeta em : entityMetas) {
- System.out.println(em);
+ logger.debug(em.toString());
}
return false;
}
Modified: charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/EntityMeta.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/EntityMeta.java 2009-04-03 09:42:24 UTC (rev 3082)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/EntityMeta.java 2009-04-03 11:21:05 UTC (rev 3083)
@@ -18,12 +18,11 @@
*/
package org.jiemamy.composer.importer.meta;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jiemamy.composer.importer.exception.PropertyNotFoundException;
+import org.jiemamy.utils.CollectionsUtil;
/**
* JPA用のエンティティメタデータクラス。
@@ -39,10 +38,10 @@
protected TableMeta tableMeta;
/** IDプロパティメタデータのリスト */
- protected List<PropertyMeta> idPropertyMetas = new ArrayList<PropertyMeta>();
+ protected List<PropertyMeta> idPropertyMetas = CollectionsUtil.newArrayList();
/** プロパティメタデータのマップ */
- protected Map<String, PropertyMeta> propertyMetas = new HashMap<String, PropertyMeta>();
+ protected Map<String, PropertyMeta> propertyMetas = CollectionsUtil.newHashMap();
/** バージョンのプロパティメタデータ */
protected PropertyMeta versionPropertyMeta;
Modified: charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/utils/ClassLoaderUtil.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/utils/ClassLoaderUtil.java 2009-04-03 09:42:24 UTC (rev 3082)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/utils/ClassLoaderUtil.java 2009-04-03 11:21:05 UTC (rev 3083)
@@ -154,61 +154,6 @@
throw new IllegalStateException();
}
- private static Method getDefineClassMethod() {
- try {
- Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "defineClass", new Class[] {
- String.class,
- byte[].class,
- int.class,
- int.class
- });
- method.setAccessible(true);
- return method;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private static Method getDefinePackageMethod() {
- try {
- Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "definePackage", new Class[] {
- String.class,
- String.class,
- String.class,
- String.class,
- String.class,
- String.class,
- String.class,
- URL.class
- });
- method.setAccessible(true);
- return method;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private static Method getFindLoadedClassMethod() {
- try {
- Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "findLoadedClass", new Class[] {
- String.class
- });
- method.setAccessible(true);
- return method;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
- return null;
- }
-
/**
* {@link #getClassLoader(Class)}が返すクラスローダから指定された名前を持つすべてのリソースを検索する。
*
@@ -249,6 +194,18 @@
}
/**
+ * 指定されたバイナリ名を持つクラスをロードする。
+ *
+ * @param loader クラスローダ
+ * @param className クラスのバイナリ名
+ * @return 結果の<code>Class</code>オブジェクト
+ * @throws ClassNotFoundException クラスが見つからなかった場合
+ */
+ public static Class<?> loadClass(final ClassLoader loader, final String className) throws ClassNotFoundException {
+ return loader.loadClass(className);
+ }
+
+ /**
* クラスローダ<code>other</code>がクラスローダ<code>cl</code>の祖先なら<code>true</code>を取得する。
*
* @param cl クラスローダ
@@ -265,18 +222,61 @@
return false;
}
- /**
- * 指定されたバイナリ名を持つクラスをロードする。
- *
- * @param loader クラスローダ
- * @param className クラスのバイナリ名
- * @return 結果の<code>Class</code>オブジェクト
- * @throws ClassNotFoundException クラスが見つからなかった場合
- */
- public static Class<?> loadClass(final ClassLoader loader, final String className) throws ClassNotFoundException {
- return loader.loadClass(className);
+ private static Method getDefineClassMethod() {
+ try {
+ Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "defineClass", new Class[] {
+ String.class,
+ byte[].class,
+ int.class,
+ int.class
+ });
+ method.setAccessible(true);
+ return method;
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ private static Method getDefinePackageMethod() {
+ try {
+ Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "definePackage", new Class[] {
+ String.class,
+ String.class,
+ String.class,
+ String.class,
+ String.class,
+ String.class,
+ String.class,
+ URL.class
+ });
+ method.setAccessible(true);
+ return method;
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private static Method getFindLoadedClassMethod() {
+ try {
+ Method method = ClassUtil.getDeclaredMethod(ClassLoader.class, "findLoadedClass", new Class[] {
+ String.class
+ });
+ method.setAccessible(true);
+ return method;
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
private ClassLoaderUtil() {
}