svnno****@sourc*****
svnno****@sourc*****
2009年 3月 9日 (月) 22:05:03 JST
Revision: 2854
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2854
Author: daisuke_m
Date: 2009-03-09 22:05:03 +0900 (Mon, 09 Mar 2009)
Log Message:
-----------
refactor
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilderImpl.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilderImpl.java 2009-03-09 12:58:03 UTC (rev 2853)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilderImpl.java 2009-03-09 13:05:03 UTC (rev 2854)
@@ -40,7 +40,7 @@
*/
public class ForeignKeyBuilderImpl extends AbstractJiemamyBuilder<ForeignKey> implements ForeignKeyBuilder {
- private final TableModel constraintTable;
+ private final TableModel constrainedTable;
private final TableModel referenceTable;
@@ -51,16 +51,16 @@
* インスタンスを生成する。
*
* @param factory モデル生成のためのファクトリ
- * @param source 参照元テーブル
- * @param target 参照先テーブル
+ * @param constrainedTable 参照元テーブル
+ * @param referenceTable 参照先テーブル
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
- public ForeignKeyBuilderImpl(JiemamyFactory factory, TableModel source, TableModel target) {
+ public ForeignKeyBuilderImpl(JiemamyFactory factory, TableModel constrainedTable, TableModel referenceTable) {
super(factory, ForeignKey.class);
- constraintTable = source;
- referenceTable = target;
- Validate.notNull(source);
- Validate.notNull(target);
+ this.constrainedTable = constrainedTable;
+ this.referenceTable = referenceTable;
+ Validate.notNull(constrainedTable);
+ Validate.notNull(referenceTable);
localKeys = TableUtil.getAttributes(referenceTable, LocalKeyConstraint.class);
}
@@ -73,12 +73,12 @@
Validate.notNull(referenceColumn);
Validate.notNull(keyColumn);
- ReferenceResolver resolver = constraintTable.getJiemamy().getReferenceResolver();
+ ReferenceResolver resolver = constrainedTable.getJiemamy().getReferenceResolver();
if (referenceTable.getAttributes().contains(resolver.resolve(referenceColumn)) == false) {
throw new ModelConsistenceException();
}
- if (constraintTable.getAttributes().contains(resolver.resolve(keyColumn)) == false) {
+ if (constrainedTable.getAttributes().contains(resolver.resolve(keyColumn)) == false) {
throw new ModelConsistenceException();
}
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2009-03-09 12:58:03 UTC (rev 2853)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2009-03-09 13:05:03 UTC (rev 2854)
@@ -39,7 +39,7 @@
* @return {@code this}
* @throws ElementNotFoundException referenceColumnが、所属テーブルにおいてキー指定されていない場合
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
- * @throws ModelConsistenceException foreignKeyColumnがconstraintTableに所属していない場合
+ * @throws ModelConsistenceException foreignKeyColumnがconstrainedTableに所属していない場合
* @throws ModelConsistenceException keyColumnがreferenceTableに所属していない場合
* @since 0.2
*/