svnno****@sourc*****
svnno****@sourc*****
2008年 10月 23日 (木) 18:49:02 JST
Revision: 2026
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2026
Author: daisuke_m
Date: 2008-10-23 18:49:02 +0900 (Thu, 23 Oct 2008)
Log Message:
-----------
ApplicationModelCreatorで、Recordも作るように修正。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ApplicationModelCreator.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java 2008-10-22 17:20:54 UTC (rev 2025)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java 2008-10-23 09:49:02 UTC (rev 2026)
@@ -21,6 +21,8 @@
import java.util.List;
import java.util.Map;
+import org.seasar.framework.container.annotation.tiger.Binding;
+
import org.jiemamy.core.model.AbstractModel;
import org.jiemamy.spec.model.dataset.InsertDataSetModel;
import org.jiemamy.spec.model.dataset.RecordModel;
@@ -37,6 +39,7 @@
private String name;
/** レコード情報 */
+ @Binding("map")
private Map<AbstractEntityModel, List<RecordModel>> records;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java 2008-10-22 17:20:54 UTC (rev 2025)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java 2008-10-23 09:49:02 UTC (rev 2026)
@@ -20,6 +20,8 @@
import java.util.Map;
+import org.seasar.framework.container.annotation.tiger.Binding;
+
import org.jiemamy.core.model.AbstractModel;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.dataset.RecordModel;
@@ -43,6 +45,7 @@
* どちらもnullを返すが、containsKeyメソッドで、両者を判別可能である。
* 詳しくは{@link Map#get(Object)}のjavadocを参照のこと。
*/
+ @Binding("map")
private Map<ColumnModel, String> values;
Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-10-22 17:20:54 UTC (rev 2025)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-10-23 09:49:02 UTC (rev 2026)
@@ -24,6 +24,7 @@
<component class="org.jiemamy.core.model.connection.ForeignKeyMappingImpl" instance="prototype" autoBinding="none"/>
<component class="org.jiemamy.core.model.DomainModelImpl" instance="prototype" autoBinding="none"/>
<component class="org.jiemamy.core.model.dataset.InsertDataSetModelImpl" instance="prototype"/>
+ <component class="org.jiemamy.core.model.dataset.RecordModelImpl" instance="prototype"/>
<component class="org.jiemamy.core.model.node.TableModelImpl" instance="prototype"/>
<component class="org.jiemamy.core.model.ColumnModelImpl" instance="prototype"/>
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ApplicationModelCreator.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ApplicationModelCreator.java 2008-10-22 17:20:54 UTC (rev 2025)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ApplicationModelCreator.java 2008-10-23 09:49:02 UTC (rev 2026)
@@ -1,15 +1,13 @@
package org.jiemamy.core.model;
+
import java.util.ArrayList;
import java.util.List;
import org.jiemamy.core.S2FactoryStrategy;
-import org.jiemamy.core.model.dataset.RecordModelImpl;
import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.NumericDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
-import org.jiemamy.core.utils.processor.entity.table.GetColumnProcessor;
-import org.jiemamy.core.utils.processor.root.SetRecordProcessor;
import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.spec.exception.ElementNotFoundException;
import org.jiemamy.spec.exception.JiemamyRuntimeException;
@@ -23,6 +21,7 @@
import org.jiemamy.spec.model.constraint.NotNullConstraintModel;
import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
import org.jiemamy.spec.model.constraint.UniqueConstraintModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
import org.jiemamy.spec.model.dataset.RecordModel;
import org.jiemamy.spec.model.node.StickyModel;
import org.jiemamy.spec.model.node.TableModel;
@@ -44,7 +43,7 @@
* @param args
*/
public static void main(String[] args) {
- RootModel rootModel = new ApplicationModelCreator().createModel();
+ RootModel rootModel = (new ApplicationModelCreator()).createModel();
System.out.println(rootModel);
}
@@ -52,6 +51,14 @@
* テスト用モデルを生成する。
* @return モデル
*/
+ /**
+ * TODO for daisuke
+ * @return
+ */
+ /**
+ * TODO for daisuke
+ * @return
+ */
public RootModel createModel() {
JiemamyModelFactory.init(new S2FactoryStrategy("jiemamy-view.dicon"));
int offset = 50;
@@ -122,54 +129,52 @@
presentation.getNodeLayouts().put(highSalView, new JmRectangle(270, 270));
presentation.getConnectionLayouts().put(fkEmpDept, new ArrayList<JmPoint>()); // bendpount無し
-// // データセットの生成・追加(1)
-// InsertDataSetModel dataSet = rootModel.createJiemamyModel(InsertDataSetModel.class).init("データ群en");
-// rootModel.getAdapter(InsertDataSetModel.class).add(dataSet);
-// dataSet.getRecords().put(deptTable, createDeptDataSetEn(deptTable));
-// dataSet.getRecords().put(empTable, createEmpDataSetEn(empTable));
-//
-// // データセットの生成・追加(2)
-// dataSet = rootModel.createJiemamyModel(InsertDataSetModel.class).init("データ群ja");
-// rootModel.getAdapter(InsertDataSetModel.class).add(dataSet);
-// dataSet.getRecords().put(deptTable, createDeptDataSetJa(deptTable));
-// dataSet.getRecords().put(empTable, createEmpDataSetJa(empTable));
+ // データセットの生成・追加(1)
+ InsertDataSetModel dataSetEn = rootModel.createJiemamyModel(InsertDataSetModel.class).init("データ群en");
+ rootModel.getInsertDataSets().add(dataSetEn);
+ dataSetEn.getRecords().put(deptTable, createDeptDataSetEn(rootModel, deptTable));
+ dataSetEn.getRecords().put(empTable, createEmpDataSetEn(rootModel, empTable));
+ // データセットの生成・追加(2)
+ InsertDataSetModel dataSetJa = rootModel.createJiemamyModel(InsertDataSetModel.class).init("データ群ja");
+ rootModel.getInsertDataSets().add(dataSetJa);
+ dataSetJa.getRecords().put(deptTable, createDeptDataSetJa(rootModel, deptTable));
+ dataSetJa.getRecords().put(empTable, createEmpDataSetJa(rootModel, empTable));
+
return rootModel;
}
- private List<RecordModel> createDeptDataSetEn(TableModel deptTable) {
+ private List<RecordModel> createDeptDataSetEn(RootModel rootModel, TableModel deptTable) {
List<RecordModel> result = new ArrayList<RecordModel>();
try {
- RecordModel record = new RecordModelImpl();
+ RecordModel record = rootModel.createJiemamyModel(RecordModel.class).init();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "1"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "10"));
- record
- .process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "ACCOUNTING"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "NEW YORK"));
+ record.getValues().put(deptTable.getColumn("ID"), "1");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "10");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "ACCOUNTING");
+ record.getValues().put(deptTable.getColumn("LOC"), "NEW YORK");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "2"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "20"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "RESEARCH"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "DALLAS"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "2");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "20");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "RESEARCH");
+ record.getValues().put(deptTable.getColumn("LOC"), "DALLAS");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "3"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "30"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "SALES"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "CHICAGO"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "3");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "30");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "SALES");
+ record.getValues().put(deptTable.getColumn("LOC"), "CHICAGO");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "4"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "40"));
- record
- .process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "OPERATIONS"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "BOSTON"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "4");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "40");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "OPERATIONS");
+ record.getValues().put(deptTable.getColumn("LOC"), "BOSTON");
result.add(record);
} catch (TooManyElementsException e) {
throw new JiemamyRuntimeException("test code error", e);
@@ -178,36 +183,36 @@
return result;
}
- private List<RecordModel> createDeptDataSetJa(TableModel deptTable) {
+ private List<RecordModel> createDeptDataSetJa(RootModel rootModel, TableModel deptTable) {
List<RecordModel> result = new ArrayList<RecordModel>();
try {
- RecordModel record = new RecordModelImpl();
+ RecordModel record = rootModel.createJiemamyModel(RecordModel.class).init();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "1"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "10"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "経理部"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "広島"));
+ record.getValues().put(deptTable.getColumn("ID"), "1");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "10");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "経理部");
+ record.getValues().put(deptTable.getColumn("LOC"), "広島");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "2"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "20"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "研究開発部"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "京都"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "2");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "20");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "研究開発部");
+ record.getValues().put(deptTable.getColumn("LOC"), "京都");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "3"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "30"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "営業部"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "東京"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "3");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "30");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "営業部");
+ record.getValues().put(deptTable.getColumn("LOC"), "東京");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "4"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "40"));
- record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "経営本部"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(deptTable.getColumn("ID"), "4");
+ record.getValues().put(deptTable.getColumn("DEPT_NO"), "40");
+ record.getValues().put(deptTable.getColumn("DEPT_NAME"), "経営本部");
// locは指定せず、特定しない状態
result.add(record);
} catch (TooManyElementsException e) {
@@ -255,89 +260,89 @@
return deptTable;
}
- private List<RecordModel> createEmpDataSetEn(TableModel empTable) {
+ private List<RecordModel> createEmpDataSetEn(RootModel rootModel, TableModel empTable) {
List<RecordModel> result = new ArrayList<RecordModel>();
try {
- RecordModel record = new RecordModelImpl();
+ RecordModel record = rootModel.createJiemamyModel(RecordModel.class).init();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "10"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "SMITH"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2003-02-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "40"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
+ record.getValues().put(empTable.getColumn("ID"), "1");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "10");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "SMITH");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2003-02-01");
+ record.getValues().put(empTable.getColumn("SAL"), "40");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "3");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "2"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "20"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "ALLEN"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2000-03-04"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "50"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "2");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "20");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "ALLEN");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2000-03-04");
+ record.getValues().put(empTable.getColumn("SAL"), "50");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "4");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "WARD"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), null));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "1993-12-05"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "60"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "3");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "30");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "WARD");
+ record.getValues().put(empTable.getColumn("MGR_ID"), null);
+ record.getValues().put(empTable.getColumn("HIREDATE"), "1993-12-05");
+ record.getValues().put(empTable.getColumn("SAL"), "60");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "4");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "4"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "40"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "JONES"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "2"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2007-04-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "36"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "4");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "40");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "JONES");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "2");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2007-04-01");
+ record.getValues().put(empTable.getColumn("SAL"), "36");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "5"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "50"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "MARTIN"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2002-05-30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "5");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "50");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "MARTIN");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "1");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2002-05-30");
+ record.getValues().put(empTable.getColumn("SAL"), "30");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "3");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "6"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "60"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "BLAKE"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2007-04-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "25"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "6");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "60");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "BLAKE");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2007-04-01");
+ record.getValues().put(empTable.getColumn("SAL"), "25");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "7"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "70"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "CLARK"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2004-09-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "1"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "7");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "70");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "CLARK");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "1");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2004-09-01");
+ record.getValues().put(empTable.getColumn("SAL"), "30");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "1");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "8"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "80"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "SCOTT"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "4"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2008-03-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "25"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "8");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "80");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "SCOTT");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "4");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2008-03-01");
+ record.getValues().put(empTable.getColumn("SAL"), "25");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
} catch (TooManyElementsException e) {
throw new JiemamyRuntimeException("test code error", e);
@@ -346,89 +351,89 @@
return result;
}
- private List<RecordModel> createEmpDataSetJa(TableModel empTable) {
+ private List<RecordModel> createEmpDataSetJa(RootModel rootModel, TableModel empTable) {
List<RecordModel> result = new ArrayList<RecordModel>();
try {
- RecordModel record = new RecordModelImpl();
+ RecordModel record = rootModel.createJiemamyModel(RecordModel.class).init();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "10"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "山本"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2003-02-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "40"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
+ record.getValues().put(empTable.getColumn("ID"), "1");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "10");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "山本");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2003-02-01");
+ record.getValues().put(empTable.getColumn("SAL"), "40");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "3");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "2"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "20"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "内海"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2000-03-04"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "50"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "2");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "20");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "内海");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2000-03-04");
+ record.getValues().put(empTable.getColumn("SAL"), "50");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "4");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "村瀬"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), null));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "1993-12-05"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "60"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "3");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "30");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "村瀬");
+ record.getValues().put(empTable.getColumn("MGR_ID"), null);
+ record.getValues().put(empTable.getColumn("HIREDATE"), "1993-12-05");
+ record.getValues().put(empTable.getColumn("SAL"), "60");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "4");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "4"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "40"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "近藤"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "2"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2007-04-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "36"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "4");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "40");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "近藤");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "2");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2007-04-01");
+ record.getValues().put(empTable.getColumn("SAL"), "36");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "5"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "50"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "小峰"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2002-05-30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "5");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "50");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "小峰");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "1");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2002-05-30");
+ record.getValues().put(empTable.getColumn("SAL"), "30");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "3");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "6"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "60"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "三浦"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "3"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2007-04-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "25"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "6");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "60");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "三浦");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "3");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2007-04-01");
+ record.getValues().put(empTable.getColumn("SAL"), "25");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "7"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "70"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "前島"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "1"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2004-09-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "30"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "1"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "7");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "70");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "前島");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "1");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2004-09-01");
+ record.getValues().put(empTable.getColumn("SAL"), "30");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "1");
result.add(record);
- record = new RecordModelImpl();
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "8"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "80"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "島崎"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("MGR_ID")), "4"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("HIREDATE")), "2008-03-01"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("SAL")), "25"));
- record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
+ record = rootModel.createJiemamyModel(RecordModel.class).init();
+ record.getValues().put(empTable.getColumn("ID"), "8");
+ record.getValues().put(empTable.getColumn("EMP_NO"), "80");
+ record.getValues().put(empTable.getColumn("EMP_NAME"), "島崎");
+ record.getValues().put(empTable.getColumn("MGR_ID"), "4");
+ record.getValues().put(empTable.getColumn("HIREDATE"), "2008-03-01");
+ record.getValues().put(empTable.getColumn("SAL"), "25");
+ record.getValues().put(empTable.getColumn("DEPT_ID"), "2");
result.add(record);
} catch (TooManyElementsException e) {
throw new JiemamyRuntimeException("test code error", e);
@@ -470,7 +475,10 @@
nameColumn.setSimpleIndex(true);
nameColumn.setRepresentation(true);
- rootModel.createJiemamyModel(ColumnModel.class).init("MGR_ID", new IntegerDataTypeMock());
+ ColumnModel mgrColumn =
+ rootModel.createJiemamyModel(ColumnModel.class).init("MGR_ID", new IntegerDataTypeMock());
+ empTable.getColumns().add(mgrColumn);
+ nameColumn.setLogicalName("上司ID");
ColumnModel hireColumn =
rootModel.createJiemamyModel(ColumnModel.class).init("HIREDATE", new TimestampDataTypeMock());
@@ -501,7 +509,7 @@
*/
private ForeignKeyModel createForeignKey(RootModel rootModel, TableModel target, TableModel source,
String sourceColumnName) {
- String[] sourceColumnNames = new String[] {
+ String[] sourceColumnNames = {
sourceColumnName
};