svnno****@sourc*****
svnno****@sourc*****
2008年 9月 18日 (木) 23:46:26 JST
Revision: 1938
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1938
Author: daisuke_m
Date: 2008-09-18 23:46:25 +0900 (Thu, 18 Sep 2008)
Log Message:
-----------
[GEN-59] パッケージ整理に対する、diconの変更追従。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon
artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
artemis/trunk/org.jiemamy.core/src/test/resources/jiemamy-aop-test.dicon
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java 2008-09-18 02:00:36 UTC (rev 1937)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java 2008-09-18 14:46:25 UTC (rev 1938)
@@ -22,9 +22,8 @@
import java.util.List;
import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.utils.ForEachUtil;
import org.jiemamy.core.utils.processor.SetDefaultColumnsProcessor;
-import org.jiemamy.core.utils.visitor.impl.PrimaryKeyVisitor;
+import org.jiemamy.core.utils.processor.entity.table.GetPrimaryKeyColumnsProcessor;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.connection.ForeignKeyMapping;
import org.jiemamy.spec.model.connection.ForeignKeyModel;
@@ -112,7 +111,7 @@
mappings.clear();
TableModel tableModel = (TableModel) getTarget();
- List<ColumnModel> referencePkColumns = ForEachUtil.accept(tableModel.getColumns(), new PrimaryKeyVisitor());
+ List<ColumnModel> referencePkColumns = tableModel.process(GetPrimaryKeyColumnsProcessor.getInstance());
for (ColumnModel referencePkColumn : referencePkColumns) {
ForeignKeyMapping mapping = new ForeignKeyMappingImpl();
mapping.process(new SetDefaultColumnsProcessor((TableModel) getSource(), referencePkColumn, createColumn));
Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon 2008-09-18 02:00:36 UTC (rev 1937)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon 2008-09-18 14:46:25 UTC (rev 1938)
@@ -7,13 +7,13 @@
<component class="org.jiemamy.core.model.node.TableModelImpl" instance="prototype">
<aspect pointcut="set.*">setterInterceptor</aspect>
</component>
- <component class="org.jiemamy.core.model.typedef.ColumnModelImpl" instance="prototype" autoBinding="none">
+ <component class="org.jiemamy.core.model.ColumnModelImpl" instance="prototype" autoBinding="none">
<aspect pointcut="set.*">setterInterceptor</aspect>
</component>
- <component class="org.jiemamy.core.model.node.index.IndexModelImpl" instance="prototype">
+ <component class="org.jiemamy.core.model.index.IndexModelImpl" instance="prototype">
<aspect pointcut="set.*">setterInterceptor</aspect>
</component>
- <component class="org.jiemamy.core.model.typedef.constraint.CheckConstraintModelImpl" instance="prototype">
+ <component class="org.jiemamy.core.model.constraint.CheckConstraintModelImpl" instance="prototype">
<aspect pointcut="set.*">setterInterceptor</aspect>
</component>
Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-09-18 02:00:36 UTC (rev 1937)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-09-18 14:46:25 UTC (rev 1938)
@@ -8,8 +8,8 @@
<component class="org.jiemamy.core.model.RootModelImpl" instance="prototype"/>
<component class="org.jiemamy.core.model.node.ViewModelImpl" instance="prototype"/>
<component class="org.jiemamy.core.model.node.StickyModelImpl" instance="prototype"/>
- <component class="org.jiemamy.core.model.connection.ForeignKeyModelImpl" instance="prototype"/>
- <component class="org.jiemamy.core.model.typedef.DomainModelImpl" instance="prototype" autoBinding="none"/>
+ <component class="org.jiemamy.core.model.connection.ForeignKeyModelImpl" instance="prototype" autoBinding="none"/>
+ <component class="org.jiemamy.core.model.DomainModelImpl" instance="prototype" autoBinding="none"/>
<component class="org.jiemamy.core.model.presentation.DiagramPresentationModelImpl" instance="prototype"/>
<component class="org.jiemamy.core.model.dataset.InsertDataSetModelImpl" instance="prototype"/>
Modified: artemis/trunk/org.jiemamy.core/src/test/resources/jiemamy-aop-test.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/resources/jiemamy-aop-test.dicon 2008-09-18 02:00:36 UTC (rev 1937)
+++ artemis/trunk/org.jiemamy.core/src/test/resources/jiemamy-aop-test.dicon 2008-09-18 14:46:25 UTC (rev 1938)
@@ -3,7 +3,7 @@
"http://www.seasar.org/dtd/components24.dtd">
<components>
<component name="setterInterceptor" class="org.jiemamy.core.event.SetterInterceptor"/>
- <component name="tableModel" class="org.jiemamy.core.model.node.TableModel">
+ <component name="tableModel" class="org.jiemamy.core.model.node.TableModelImpl">
<aspect pointcut="set.*">setterInterceptor</aspect>
</component>
</components>