svnno****@sourc*****
svnno****@sourc*****
2009年 4月 6日 (月) 02:37:18 JST
Revision: 3132
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3132
Author: j5ik2o
Date: 2009-04-06 02:37:18 +0900 (Mon, 06 Apr 2009)
Log Message:
-----------
リファクタリング
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/impl/PropertyMetaFactoryImpl.java
charon/jiemamy-jpa-importer/trunk/src/test/java/org/jiemamy/composer/importer/JpaImporterTest.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 17:25:36 UTC (rev 3131)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-05 17:37:18 UTC (rev 3132)
@@ -23,6 +23,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.jiemamy.Jiemamy;
import org.jiemamy.composer.ImportException;
import org.jiemamy.composer.Importer;
import org.jiemamy.composer.importer.meta.EntityMeta;
@@ -37,6 +38,8 @@
import org.jiemamy.composer.importer.utils.ClassUtil;
import org.jiemamy.composer.importer.utils.CollectionsUtil;
import org.jiemamy.model.RootModel;
+import org.jiemamy.model.datatype.DomainModel;
+import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.LogMarker;
/**
@@ -79,14 +82,20 @@
EntityMetaReader entityMetaReader = new EntityMetaReaderImpl(context);
try {
+ Jiemamy jiemamy = rootModel.getJiemamy();
+ DomainModel dm = jiemamy.getFactory().newModel(DomainModel.class);
+ rootModel.getDomains().add(dm);
List<EntityMeta> entityMetas = entityMetaReader.read();
for (EntityMeta em : entityMetas) {
LOG.debug(LogMarker.DETAIL, em.toString());
+ TableModel tm = jiemamy.getFactory().newModel(TableModel.class);
+ tm.setName(em.getName());
+
}
} catch (IOException e) {
- e.printStackTrace();
+ throw new ImportException(e);
} catch (EntityClassNotFoundException e) {
- e.printStackTrace();
+ throw new ImportException(e);
}
return false;
Modified: charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/impl/PropertyMetaFactoryImpl.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/impl/PropertyMetaFactoryImpl.java 2009-04-05 17:25:36 UTC (rev 3131)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/meta/impl/PropertyMetaFactoryImpl.java 2009-04-05 17:37:18 UTC (rev 3132)
@@ -52,7 +52,7 @@
doField(propertyMeta, field, entityMeta);
doName(propertyMeta, field, entityMeta);
doTransient(propertyMeta, field, entityMeta);
- if (!propertyMeta.isTransient()) {
+ if (propertyMeta.isTransient() == false) {
Object relationshipAnnotation = getRelationshipAnnotation(field);
if (relationshipAnnotation == null) {
doColumnMeta(propertyMeta, field, entityMeta);
Modified: charon/jiemamy-jpa-importer/trunk/src/test/java/org/jiemamy/composer/importer/JpaImporterTest.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/test/java/org/jiemamy/composer/importer/JpaImporterTest.java 2009-04-05 17:25:36 UTC (rev 3131)
+++ charon/jiemamy-jpa-importer/trunk/src/test/java/org/jiemamy/composer/importer/JpaImporterTest.java 2009-04-05 17:37:18 UTC (rev 3132)
@@ -51,6 +51,17 @@
private RootModel rootModel;
+ private String getBuildDir() {
+ try {
+ String buildDir = ResourceUtil.getBuildDir(example.entity.Employee.class).getCanonicalPath();
+ return buildDir;
+ } catch (ResourceNotFoundException ignore) {
+ return null;
+ } catch (IOException ignore) {
+ return null;
+ }
+ }
+
/**
* テストを初期化する。
*
@@ -70,12 +81,7 @@
@Test
public void testImportModel() throws IOException {
- String buildDir = null;
- try {
- buildDir = ResourceUtil.getBuildDir(example.entity.Employee.class).getCanonicalPath();
- } catch (ResourceNotFoundException e1) {
- e1.printStackTrace();
- }
+ String buildDir = getBuildDir();
DefaultJpaImportConfig config = new DefaultJpaImportConfig();
List<String> classPathDirs = new ArrayList<String>();