svnno****@sourc*****
svnno****@sourc*****
2008年 11月 20日 (木) 01:17:29 JST
Revision: 2182
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2182
Author: daisuke_m
Date: 2008-11-20 01:17:28 +0900 (Thu, 20 Nov 2008)
Log Message:
-----------
javadoc & refactor /
jcl-over-slf4j の artifactId が古かったので更新。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
artemis/trunk/org.jiemamy.core/pom.xml
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/CheckConstraintAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ColumnAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/DomainAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/IndexAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/InsertDataSetsAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/Expression.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmIOUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ValueCheckUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/package-info.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/package-info.java
artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/ResetBendpointProcessorTest.java
artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetColorProcessorTest.java
artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetConstraintProcessorTest.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java
Added Paths:
-----------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/Migration.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/JiemamyModelAppender.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/accessor/
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -55,7 +55,7 @@
throw new ExportException("Cannot create directory: " + outputDir.getAbsolutePath());
}
- // TODO
+ // TODO for Keisuke.K
return true;
}
Modified: artemis/trunk/org.jiemamy.core/pom.xml
===================================================================
--- artemis/trunk/org.jiemamy.core/pom.xml 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/pom.xml 2008-11-19 16:17:28 UTC (rev 2182)
@@ -204,7 +204,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<version>1.5.5</version>
</dependency>
<dependency>
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/Migration.java (from rev 2180, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/Migration.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/Migration.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/30
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core;
+
+/**
+ * bacchusからartemisへの拡張にあたって、足りていない情報を定数で与えるためのクラス。
+ *
+ * <p>将来、動的に動作すべき箇所が参照しており、そのあかつきには消されなければならないクラス。</p>
+ *
+ * @author daisuke
+ */
+public class Migration {
+
+ /**
+ * ダイアグラム番号
+ *
+ * マルチダイアグラム対応後に、削除されなければいけない。
+ */
+ public static final int DIAGRAM_INDEX = 0;
+
+
+ private Migration() {
+ }
+
+}
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,41 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/30
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core;
-
-/**
- * bacchusからartemisへの拡張にあたって、足りていない情報を定数で与えるためのクラス。
- *
- * <p>将来、動的に動作すべき箇所が参照しており、そのあかつきには消されなければならないクラス。</p>
- *
- * @author daisuke
- */
-public class MustBeMulti {
-
- /**
- * ダイアグラム番号
- *
- * マルチダイアグラム対応後に、削除されなければいけない。
- */
- public static final int ZERO = 0;
-
-
- private MustBeMulti() {
- }
-
-}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/CheckConstraintAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/CheckConstraintAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/CheckConstraintAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.node.TableModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.constraint.CheckConstraintModel;
import org.jiemamy.spec.model.node.TableModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ColumnAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ColumnAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ColumnAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.node.TableModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.node.TableModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.node.NodeModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractConnectionModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/DomainAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/DomainAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/DomainAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.RootModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.DomainModel;
import org.jiemamy.spec.model.RootModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/IndexAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/IndexAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/IndexAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.node.TableModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.index.IndexModel;
import org.jiemamy.spec.model.node.TableModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/InsertDataSetsAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/InsertDataSetsAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/InsertDataSetsAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.RootModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.dataset.InsertDataSetModel;
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/JiemamyModelAppender.java (from rev 2180, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/JiemamyModelAppender.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/JiemamyModelAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/10/02
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core.appender;
+
+import org.jiemamy.spec.model.JiemamyModel;
+
+/**
+ * {@link JiemamyModel}に対して、子にあたる {@link JiemamyModel}を追加/削除する責務を持つクラス。
+ * @param <P> 親モデル
+ * @param <C> 子モデル
+ * @author daisuke
+ */
+public interface JiemamyModelAppender<P extends JiemamyModel, C extends JiemamyModel> {
+
+ /**
+ * 親モデルに対して、子モデルを追加する。
+ * @param parent 親モデル
+ * @param child 子モデル
+ */
+ void append(P parent, C child);
+
+ /**
+ * 親モデルから、子モデルを削除する。
+ * @param parent 親モデル
+ * @param child 子モデル。
+ */
+ void remove(P parent, C child);
+
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/JiemamyModelAppender.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.ClassUtils;
import org.jiemamy.core.accessor.RootModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/Expression.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/Expression.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/Expression.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -19,7 +19,7 @@
package org.jiemamy.core.extension.dialect.parser;
/**
- * 式解析クラス。
+ * 式解析インターフェイス。
* @author j5ik2o
*/
public interface Expression {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -28,6 +28,7 @@
import org.seasar.framework.util.tiger.CollectionsUtil;
import org.jiemamy.core.accessor.JiemamyModelAccessor;
+import org.jiemamy.core.appender.JiemamyModelAppender;
import org.jiemamy.spec.Processor;
import org.jiemamy.spec.exception.JiemamyRuntimeException;
import org.jiemamy.spec.model.JiemamyModel;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -26,7 +26,7 @@
import org.jiemamy.spec.model.datatype.DataType;
/**
- * ドメイン定義モデル
+ * ドメイン定義モデル。
*
* @author daisuke
*/
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/10/02
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core.model;
-
-import org.jiemamy.spec.model.JiemamyModel;
-
-/**
- * {@link JiemamyModel}に対して、子にあたる {@link JiemamyModel}を追加/削除する責務を持つクラス。
- * @author daisuke
- * @param <P> 親モデル
- * @param <C> 子モデル
- */
-public interface JiemamyModelAppender<P extends JiemamyModel, C extends JiemamyModel> {
-
- /**
- * 親モデルに対して、子モデルを追加する。
- * @param parent 親モデル
- * @param child 子モデル
- */
- void append(P parent, C child);
-
- /**
- * 親モデルから、子モデルを削除する。
- * @param parent 親モデル
- * @param child 子モデル。
- */
- void remove(P parent, C child);
-
-}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -25,6 +25,7 @@
import org.seasar.framework.container.annotation.tiger.Binding;
import org.jiemamy.core.accessor.RootModelAccessor;
+import org.jiemamy.core.appender.JiemamyModelAppender;
import org.jiemamy.core.utils.ValueCheckUtil;
import org.jiemamy.core.utils.processor.connection.foreignkey.ProvideForeignKeyNameProcessor;
import org.jiemamy.core.utils.processor.root.GetConnectionsProcessor;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,8 +1,8 @@
/**
* Jiemamyの「コネクション」関係のドメインモデルクラスを提供するパッケージ。
*
- * このパッケージは、ダイアグラムの要素である「コネクション」を表現するドメインモデルクラスを含む。
- * {@link org.jiemamy.core.model.node}パッケージと対になるパッケージである。
+ * <p>このパッケージは、ダイアグラムの要素である「コネクション」を表現するドメインモデルクラスを含む。
+ * {@link org.jiemamy.core.model.node}パッケージと対になるパッケージである。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,8 +1,8 @@
/**
* Jiemamyの「制約」のドメインモデルを提供するパッケージ。
*
- * このパッケージは、型定義に付与される各種制約のドメインモデルクラスを含む。
- * 例えば、NotNull制約, Check制約などが挙げられる。
+ * <p>このパッケージは、型定義に付与される各種制約のドメインモデルクラスを含む。
+ * 例えば、NotNull制約, Check制約などが挙げられる。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,8 +1,8 @@
/**
* Jiemamyの「INSERTデータ」のドメインモデルクラスを提供するパッケージ。
*
- * このパッケージは、テーブルにINSERTされる一組のデータである「データセット」を表現するドメインモデルクラスを含む。
- * JiemamyはINSERT文情報も管理するが、1つのスキーマに対して、INSERTしたいデータのセットは1種類であるとは限らない。
+ * <p>このパッケージは、テーブルにINSERTされる一組のデータである「データセット」を表現するドメインモデルクラスを含む。
+ * JiemamyはINSERT文情報も管理するが、1つのスキーマに対して、INSERTしたいデータのセットは1種類であるとは限らない。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,9 +1,9 @@
/**
* Jiemamyの「データ型」のドメインモデルを提供するパッケージ。
*
- * このパッケージは、データベースの持つデータ型のドメインモデルクラスを含む。
+ * <p>このパッケージは、データベースの持つデータ型のドメインモデルクラスを含む。
* 例えば、VARCHAR, INTEGER, 挙げられ、データベース毎にデータ型のセットを持つ。
- * 「型定義」と「データ型」は混同しないように注意すること。
+ * 「型定義」と「データ型」は混同しないように注意すること。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -25,7 +25,7 @@
import org.seasar.framework.container.annotation.tiger.Binding;
import org.jiemamy.core.accessor.node.TableModelAccessor;
-import org.jiemamy.core.model.JiemamyModelAppender;
+import org.jiemamy.core.appender.JiemamyModelAppender;
import org.jiemamy.core.utils.ValueCheckUtil;
import org.jiemamy.core.utils.processor.entity.table.GetColumnProcessor;
import org.jiemamy.core.utils.processor.entity.table.GetPrimaryKeyColumnsProcessor;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,8 +1,8 @@
/**
* Jiemamyの「ノード」関係のドメインモデルクラスを提供するパッケージ。
*
- * このパッケージは、ダイアグラムの要素である「ノード」を表現するドメインモデルクラスを含む。
- * {@link org.jiemamy.core.model.connection}パッケージと対になるパッケージである。
+ * <p>このパッケージは、ダイアグラムの要素である「ノード」を表現するドメインモデルクラスを含む。
+ * {@link org.jiemamy.core.model.connection}パッケージと対になるパッケージである。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,9 +1,6 @@
/**
- * Jiemamyのドメインモデル（アプリケーションモデル）関係クラスを提供するパッケージ。
+ * Jiemamyのモデル関係クラスを提供するパッケージ。
*
- * このパッケージは、アプリケーションが直接利用するドメインモデルクラスを含む。
- * Serializerコンポーネントのクラスとマッピングされる。
- *
* @author daisuke
*/
package org.jiemamy.core.model;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -42,6 +42,7 @@
/**
* JARファイルに含まれるDriverクラスのリストを取得する。
+ *
* @param paths JARファイルを示すURLの配列
* @return Driverクラスのリスト
* @throws IOException
@@ -65,6 +66,7 @@
/**
* JARファイルからドライバのインスタンスを取得する。
+ *
* @param paths JARファイルを示すURLの配列
* @param fqcn ドライバの完全修飾クラス名
* @return ドライバのインスタンス
@@ -101,9 +103,10 @@
/**
* コンストラクタ。
+ *
* @param driverList
* @param classLoader
- * @category instance creation
+ * @category instance creation
*/
private GetDriverClassesFromJarHandler(List<Class<? extends Driver>> driverList, URLClassLoader classLoader) {
this.driverList = driverList;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -41,7 +41,6 @@
/**
* 対象に依存するentityを結果に追加します。
- *
* @param entityModel 依存調査対象となるentity
*/
private static void addDependsdentsToResult(AbstractEntityModel entityModel) {
@@ -58,7 +57,6 @@
/**
* entityを結果に追加します。 但し、既に結果に含まれていた場合は何もしない。
- *
* @param entityModel 追加するentity
*/
private static void addToResult(AbstractEntityModel entityModel) {
@@ -68,7 +66,7 @@
}
/**
- * ユーティリティクラス
+ * ユーティリティクラス。
*/
private EntityDependencyCalculator() {
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -31,6 +31,7 @@
/**
* {@link Collection}を処理するビジターアクセプタメソッド。
+ *
* @param <T> Collectionが持つオブジェクトの型
* @param <R> 戻り値の型
* @param <E> visitメソッドが投げる可能性のある例外
@@ -51,6 +52,7 @@
/**
* {@link Map}を処理するビジターアクセプタメソッド。
+ *
* @param <K> Mapのキーの型
* @param <V> Mapの値の型
* @param <R> 戻り値の型
@@ -72,6 +74,7 @@
/**
* {@link ResultSet}を処理するビジターアクセプタメソッド。
+ *
* @param <R> 戻り値の型
* @param target 処理対象ResultSet
* @param visitor ビジター
@@ -96,10 +99,11 @@
/**
* {@link Collection}に対するビジター。
- * @author daisuke
+ *
* @param <T> {@link Collection}が保持する型
* @param <R> acceptが返すべき戻り値の型
* @param <E> visitメソッドが投げる可能性のある例外
+ * @author daisuke
*/
public interface CollectionVisitor<T, R, E extends Exception> {
@@ -111,6 +115,7 @@
/**
* 処理内容を記述するメソッド。
+ *
* @param element 処理対象要素
* @return 引き続きacceptを継続する場合null、ループを終了する場合acceptが返すべき戻り値を返す。
* @throws E
@@ -120,11 +125,12 @@
/**
* {@link Map}に対するビジター。
- * @author daisuke
+ *
* @param <K> 処理対象{@link Map}のキーの型
* @param <V> 処理対象{@link Map}の値の型
* @param <R> forEachが返すべき戻り値の型
* @param <E> visitメソッドが投げる可能性のある例外
+ * @author daisuke
*/
public interface MapVisitor<K, V, R, E extends Exception> {
@@ -136,6 +142,7 @@
/**
* 処理内容を記述するメソッド。
+ *
* @param key 処理対象のキー
* @param value 処理対象の値
* @return 引き続きacceptを継続する場合null、ループを終了する場合acceptが返すべき戻り値を返す。
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmIOUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmIOUtil.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmIOUtil.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -25,15 +25,24 @@
import java.sql.SQLException;
import java.sql.Statement;
+import org.apache.commons.io.IOUtils;
+
/**
- * 入出力ユーティリティクラス for Jiemamy。
+ * 入出力ユーティリティクラス。
+ *
+ * <p>{@link IOUtils}に対する追加分と考えるとよい。</p>
+ *
* @author daisuke
*/
public final class JmIOUtil {
/**
- * 閉じる。
- * @param closeable 閉じる対象
+ * 無条件にリソースを閉じる。
+ *
+ * <p>{@link Closeable#close()} と等価であるが、例外を無視する。
+ * 主に finally 句内で使われることを想定している。</p>
+ *
+ * @param closeable 閉じる対象。nullでも、既にclose済みであっても構わない。
*/
public static void closeQuietly(Closeable closeable) {
if (closeable != null) {
@@ -45,8 +54,12 @@
}
/**
- * 閉じる。
- * @param connection 閉じる対象
+ * 無条件にリソースを閉じる。
+ *
+ * <p>{@link Connection#close()} と等価であるが、例外を無視する。
+ * 主に finally 句内で使われることを想定している。</p>
+ *
+ * @param connection 閉じる対象。nullでも、既にclose済みであっても構わない。
*/
public static void closeQuietly(Connection connection) {
if (connection != null) {
@@ -58,8 +71,12 @@
}
/**
- * 閉じる。
- * @param resultSet 閉じる対象
+ * 無条件にリソースを閉じる。
+ *
+ * <p>{@link ResultSet#close()} と等価であるが、例外を無視する。
+ * 主に finally 句内で使われることを想定している。</p>
+ *
+ * @param resultSet 閉じる対象。nullでも、既にclose済みであっても構わない。
*/
public static void closeQuietly(ResultSet resultSet) {
if (resultSet != null) {
@@ -71,8 +88,12 @@
}
/**
- * 閉じる。
- * @param statement 閉じる対象
+ * 無条件にリソースを閉じる。
+ *
+ * <p>{@link Statement#close()} と等価であるが、例外を無視する。
+ * 主に finally 句内で使われることを想定している。</p>
+ *
+ * @param statement 閉じる対象。nullでも、既にclose済みであっても構わない。
*/
public static void closeQuietly(Statement statement) {
if (statement != null) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -24,6 +24,7 @@
/**
* Stringユーティリティ。
+ * @author daisuke
* @author wencheng
*/
public final class JmStringUtil {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ValueCheckUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ValueCheckUtil.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ValueCheckUtil.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -18,11 +18,17 @@
*/
package org.jiemamy.core.utils;
+import org.apache.commons.lang.Validate;
+
import org.jiemamy.spec.exception.NotInitializedException;
import org.jiemamy.spec.model.JiemamyModel;
/**
- * 引数の検査を行うクラス。
+ * 引数等の検査を行うクラス。
+ *
+ * <p>ここでは、Jiemamy特有の値チェックを行うメソッドを定義する。
+ * 汎用的なユーティリティは {@link Validate} クラスから探すと良い。</p>
+ *
* @author daisuke
*/
public final class ValueCheckUtil {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,7 +1,7 @@
/**
* Jiemamyのユーティリティクラスを提供するパッケージ。
*
- * このパッケージは、Jiemamy全体から使用するユーティリティクラスを含む。
+ * <p>このパッケージは、Jiemamy全体から使用するユーティリティクラスを含む。</p>
*
* @author daisuke
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -64,6 +64,7 @@
sb.append("fkey_").append(sourceTable.getName()).append("_").append(targetTable.getName()).append("_")
.append((new Date()).getTime());
foreignKeyModel.setName(sb.toString());
+ // FIXME 100回だめだったら失敗って、ないわーｗ
if (counter++ > 100) {
throw new JiemamyRuntimeException("validatorの実装が間違っている可能性があります。");
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -31,8 +31,8 @@
/**
* エンティティを取得する。
+ * @param <T> エンティティの種類を表すクラス
* @author daisuke
- * @param <T> エンティティの種類を表すクラス
*/
public class GetEntityProcessor<T extends AbstractEntityModel> implements
Processor<RootModel, AbstractEntityModel, TooManyElementsException> {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -51,7 +51,7 @@
for (AbstractNodeModel node : rootModel.getNodes()) {
Class<? extends AbstractNodeModel> nodeClass = node.getClass();
if (nodeClass.getName().contains("$$") && clazz.getSuperclass().isAssignableFrom(node.getClass())) {
- // s2containerから取得したComponentの場合は、superClassで評価する。
+ // s2containerから取得したComponentの場合は、AOPにより extends されている為、superClassで評価する。
nodes.add((T) node);
} else if (clazz.isAssignableFrom(node.getClass())) {
nodes.add((T) node);
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -72,6 +72,7 @@
throw new JiemamyRuntimeException("想定しないエンティティ型: " + entityModel.getClass().toString());
}
sb.append(counter + 1);
+ // FIXME 100回だめだったら失敗って、ないわーｗ
if (counter++ > 100) {
throw new JiemamyRuntimeException("validatorの実装が間違っている可能性があります。");
}
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -18,7 +18,7 @@
*/
package org.jiemamy.view;
-import org.jiemamy.core.model.JiemamyModelAppender;
+import org.jiemamy.core.appender.JiemamyModelAppender;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.view.model.DiagramPresentationModel;
import org.jiemamy.spec.view.model.DiagramPresentations;
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/package-info.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/package-info.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -1,2 +1,7 @@
+/**
+ * Jiemamyのビューモデル（ERダイアグラムの表示に関わる情報）関係クラスを提供するパッケージ。
+ *
+ * @author daisuke
+ */
package org.jiemamy.view;
Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/ResetBendpointProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/ResetBendpointProcessorTest.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/ResetBendpointProcessorTest.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -28,7 +28,7 @@
import org.junit.Ignore;
import org.junit.Test;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.core.S2FactoryStrategy;
import org.jiemamy.spec.JiemamyModelFactory;
import org.jiemamy.spec.model.RootModel;
@@ -96,12 +96,12 @@
@Ignore
public void test01_ベンドポイントをリセットすると_通常ベンドポイントは0になり_自己参照時には2になる() throws Exception {
List<JmPoint> bendpoints;
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).resetBendpoints(foreignKeyModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(foreignKeyModel);
bendpoints =
rootModel.getAdapter(DiagramPresentations.class).get(0).getConnectionLayouts().get(foreignKeyModel);
assertThat(bendpoints.size(), is(0));
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).resetBendpoints(selfRefFkModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(selfRefFkModel);
bendpoints = rootModel.getAdapter(DiagramPresentations.class).get(0).getConnectionLayouts().get(selfRefFkModel);
assertThat(bendpoints.size(), is(2));
}
Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetColorProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetColorProcessorTest.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetColorProcessorTest.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -26,7 +26,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.core.S2FactoryStrategy;
import org.jiemamy.spec.JiemamyModelFactory;
import org.jiemamy.spec.model.RootModel;
@@ -83,7 +83,7 @@
result = rootModel.getAdapter(DiagramPresentations.class).get(0).getNodeColors().get(tableModel);
assertThat(result, nullValue());
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).setColor(tableModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).setColor(tableModel,
new JmColor(10, 20, 30));
result = rootModel.getAdapter(DiagramPresentations.class).get(0).getNodeColors().get(tableModel);
Modified: artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetConstraintProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetConstraintProcessorTest.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ artemis/trunk/org.jiemamy.view/src/test/java/org/jiemamy/view/utils/processor/SetConstraintProcessorTest.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -26,7 +26,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.core.S2FactoryStrategy;
import org.jiemamy.spec.JiemamyModelFactory;
import org.jiemamy.spec.model.RootModel;
@@ -83,7 +83,7 @@
result = rootModel.getAdapter(DiagramPresentations.class).get(0).getNodeLayouts().get(tableModel);
assertThat(result, nullValue());
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).setConstraint(tableModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).setConstraint(tableModel,
new JmRectangle(100, 200));
result = rootModel.getAdapter(DiagramPresentations.class).get(0).getNodeLayouts().get(tableModel);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -35,7 +35,7 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CompoundCommand;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.editpart.diagram.AbstractNodeEditPart;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractConnectionModel;
@@ -187,9 +187,9 @@
this.x = x;
this.y = y;
oldX =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().get(target).x;
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().get(target).x;
oldY =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().get(target).y;
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().get(target).y;
}
/**
@@ -197,15 +197,15 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(target,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(target,
new JmRectangle(x, y, -1, -1));
oldBendpoints.clear();
for (AbstractConnectionModel conn : target.getSourceConnections()) {
List<JmPoint> points =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts()
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts()
.get(conn);
oldBendpoints.put(conn.getId(), points);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).resetBendpoints(conn);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(conn);
}
}
@@ -215,10 +215,10 @@
@Override
public void undo() {
for (AbstractConnectionModel conn : target.getSourceConnections()) {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().put(conn,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().put(conn,
oldBendpoints.get(conn.getId()));
}
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(target,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(target,
new JmRectangle(oldX, oldY, -1, -1));
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -22,7 +22,7 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CommandStack;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.command.ChangeNodeConstraintCommand;
import org.jiemamy.spec.model.JiemamyModel;
import org.jiemamy.spec.model.RootModel;
@@ -56,7 +56,7 @@
AbstractNodeModel nodeModel = (AbstractNodeModel) model;
CommandStack stack = getViewer().getEditDomain().getCommandStack();
JmRectangle constraint =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().get(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().get(
nodeModel);
JmRectangle newConstraint = new JmRectangle(constraint.x, constraint.y, -1, -1);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -20,7 +20,7 @@
import org.eclipse.gef.commands.Command;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
import org.jiemamy.spec.view.model.DiagramPresentations;
@@ -52,7 +52,7 @@
this.rootModel = rootModel;
this.nodeModel = nodeModel;
oldColor =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().get(nodeModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().get(nodeModel);
this.newColor = newColor;
}
@@ -61,7 +61,7 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().put(nodeModel, newColor);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().put(nodeModel, newColor);
}
/**
@@ -69,6 +69,6 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().put(nodeModel, oldColor);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().put(nodeModel, oldColor);
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -25,7 +25,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.core.model.AbstractModel;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.model.JiemamyModel;
@@ -76,7 +76,7 @@
this.rootModel = rootModel;
this.nodeModel = nodeModel;
oldConstraint =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().get(nodeModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().get(nodeModel);
constraint = rectangle;
this.viewer = viewer;
@@ -105,7 +105,7 @@
@Override
public void execute() {
// 本体の移動
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(nodeModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(nodeModel,
constraint);
// ベンドポイントの移動
@@ -120,7 +120,7 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(nodeModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(nodeModel,
constraint);
shiftBendpoints(true);
shiftPosition(true);
@@ -142,7 +142,7 @@
if (selectedModels.contains(connection.getSource()) && selectedModels.contains(connection.getTarget())) {
List<JmPoint> bendpoints =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts()
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts()
.get(connection);
for (JmPoint bendpoint : bendpoints) {
if (positive) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -20,7 +20,7 @@
import org.eclipse.draw2d.geometry.Point;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractRelationModel;
@@ -67,7 +67,7 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.add(index, ConvertUtil.convert(location));
shiftPosition(false);
}
@@ -77,7 +77,7 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.remove(index);
shiftPosition(true);
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -22,7 +22,7 @@
import org.eclipse.gef.commands.Command;
import org.seasar.eclipse.common.util.LogUtil;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.preference.JiemamyPreference;
import org.jiemamy.spec.model.RootModel;
@@ -103,7 +103,7 @@
}
rootModel.appendModel(connection);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).resetBendpoints(connection);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(connection);
}
/**
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,7 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
@@ -57,7 +57,7 @@
@Override
public void execute() {
rootModel.getNodes().add(nodeModel);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(nodeModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(nodeModel,
ConvertUtil.convert(rectangle));
}
@@ -67,7 +67,7 @@
@Override
public void redo() {
rootModel.getNodes().add(nodeModel);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(nodeModel,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(nodeModel,
ConvertUtil.convert(rectangle));
}
@@ -76,7 +76,7 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().remove(nodeModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().remove(nodeModel);
rootModel.getNodes().remove(nodeModel);
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -21,7 +21,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractRelationModel;
@@ -61,10 +61,10 @@
@Override
public void execute() {
JmPoint oldLocation =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
relation).get(index);
this.oldLocation = new Point(oldLocation.x, oldLocation.y);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.remove(index);
}
@@ -73,7 +73,7 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.add(index, ConvertUtil.convert(oldLocation));
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -20,7 +20,7 @@
import org.eclipse.draw2d.geometry.Point;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractRelationModel;
@@ -54,7 +54,7 @@
*/
public MoveBendpointCommand(RootModel rootModel, AbstractRelationModel relation, int index, Point newLocation) {
JmPoint oldLocation =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
relation).get(index);
this.rootModel = rootModel;
@@ -73,7 +73,7 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.set(index, ConvertUtil.convert(newLocation));
shiftPosition(false);
}
@@ -84,7 +84,7 @@
@Override
public void undo() {
shiftPosition(true);
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(relation)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(relation)
.set(index, ConvertUtil.convert(oldLocation));
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -23,7 +23,7 @@
import org.eclipse.gef.commands.Command;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.MultiDiagramEditor;
import org.jiemamy.eclipse.utils.EditorUtil;
import org.jiemamy.spec.model.RootModel;
@@ -74,7 +74,7 @@
// エンティティの移動
JmRectangle rect =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().get(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().get(
entity);
JmRectangle newRect;
if (negative) {
@@ -82,14 +82,14 @@
} else {
newRect = (new JmRectangle(rect.x + shift.x, rect.y + shift.y, rect.width, rect.height));
}
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts().put(entity,
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts().put(entity,
newRect);
// ベンドポイントの移動
for (AbstractConnectionModel connection : entity.getSourceConnections()) {
List<JmPoint> newBendpoints = new ArrayList<JmPoint>();
List<JmPoint> oldBendpoints =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO)
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX)
.getConnectionLayouts().get(connection);
for (JmPoint bendpoint : oldBendpoints) {
@@ -102,7 +102,7 @@
newBendpoints.add(newBendpoint);
}
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().put(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().put(
connection, newBendpoints);
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -76,7 +76,7 @@
rootModel.getAdapter(Observable.class).addModelChangeListener(this);
// DiagramPresentationが変わった時用
-// rootModel.getDiagramPresentations().get(MustBeMulti.ZERO).getNodeLayouts().addListener(this);
+// rootModel.getDiagramPresentations().get(Migration.DIAGRAM_INDEX).getNodeLayouts().addListener(this);
// 自モデルを監視開始
nodeModel.getAdapter(Observable.class).addModelChangeListener(this);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -27,7 +27,7 @@
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.editpolicy.JmBendpointEditPolicy;
import org.jiemamy.eclipse.editor.editpolicy.JmRelationEditPolicy;
import org.jiemamy.spec.event.ModelChangeEvent;
@@ -113,7 +113,7 @@
private void refreshBendpoints() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
List<JmPoint> bendpoints =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getConnectionLayouts().get(
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
getModel());
List<AbsoluteBendpoint> constraint = new ArrayList<AbsoluteBendpoint>(bendpoints.size());
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -28,7 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.figure.StickyFigure;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.event.ModelChangeEvent;
@@ -138,7 +138,7 @@
GraphicalEditPart editPart = (GraphicalEditPart) getParent();
JmRectangle constraint =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts()
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts()
.get(stickyModel);
editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(constraint));
@@ -156,7 +156,7 @@
StickyFigure stickyFigure = (StickyFigure) figure;
JmColor color =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().get(stickyModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().get(stickyModel);
stickyFigure.setContents(stickyModel.getContents());
stickyFigure.setBgColor(ConvertUtil.convert(color));
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -26,7 +26,7 @@
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.NodeEditPart;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.DisplayTarget;
import org.jiemamy.eclipse.editor.extraprocessor.IsDisplayedProcessor;
@@ -155,7 +155,7 @@
GraphicalEditPart editPart = (GraphicalEditPart) getParent();
JmRectangle constraint =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts()
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts()
.get(entityModel);
editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(constraint));
@@ -174,7 +174,7 @@
String labelString =
rootModel.process(new LabelStringProcessor(tableModel, DisplayTarget.NAME, DisplayPlace.FIGURE));
JmColor color =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().get(tableModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().get(tableModel);
tableFigure.setTableName(labelString);
tableFigure.setBgColor(ConvertUtil.convert(color));
@@ -193,7 +193,7 @@
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
boolean pkColumn = column.hasConstraint(PrimaryKeyConstraintModel.class);
- if (pkColumn && rootModel.process(new IsDisplayedProcessor(MustBeMulti.ZERO, DisplayItem.PRIMARY_KEY)) == false) {
+ if (pkColumn && rootModel.process(new IsDisplayedProcessor(Migration.DIAGRAM_INDEX, DisplayItem.PRIMARY_KEY)) == false) {
return new ColumnFigure[0];
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -26,7 +26,7 @@
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.NodeEditPart;
-import org.jiemamy.core.MustBeMulti;
+import org.jiemamy.core.Migration;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.DisplayTarget;
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
@@ -128,7 +128,7 @@
GraphicalEditPart editPart = (GraphicalEditPart) getParent();
JmRectangle constraint =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeLayouts()
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeLayouts()
.get(entityModel);
editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(constraint));
@@ -147,7 +147,7 @@
String labelString =
rootModel.process(new LabelStringProcessor(viewModel, DisplayTarget.NAME, DisplayPlace.FIGURE));
JmColor color =
- rootModel.getAdapter(DiagramPresentations.class).get(MustBeMulti.ZERO).getNodeColors().get(viewModel);
+ rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getNodeColors().get(viewModel);
viewFigure.setEntityName(labelString);
viewFigure.setBgColor(ConvertUtil.convert(color));
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java 2008-11-19 15:12:30 UTC (rev 2181)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/FactoryStrategy.java 2008-11-19 16:17:28 UTC (rev 2182)
@@ -18,8 +18,19 @@
*/
package org.jiemamy.spec;
+import java.lang.reflect.Constructor;
+
/**
* Jiemamy関連クラスのインスタンス生成戦略インターフェイス。
+ *
+ * <p>{@link JiemamyModelFactory}がインスタンスをどのようにして生成するかは、下記のように実装によって異なる。
+ * このストラテジは、ファクトリに対してインスタンスの生成方法を与えるためのインターフェイスである。</p>
+ *
+ * <ul>
+ * <li>普通に new （もしくは{@link Class#newInstance()}や {@link Constructor#newInstance(Object...)}</li>
+ * <li>DI Containerや、その他フレームワークがインスタンスを生成し、管理するケース等</li>
+ * </ul>
+ *
* @author daisuke
*/
public interface FactoryStrategy {