svnno****@sourc*****
svnno****@sourc*****
2008年 9月 25日 (木) 01:46:22 JST
Revision: 1961
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1961
Author: daisuke_m
Date: 2008-09-25 01:46:21 +0900 (Thu, 25 Sep 2008)
Log Message:
-----------
AbstractConnectionModel#isSelfConnection() を実装し、コンパイルエラーを一つ減らした。
禁断のエラーコミット中。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/AbstractConnectionModel.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java 2008-09-24 16:24:59 UTC (rev 1960)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java 2008-09-24 16:46:21 UTC (rev 1961)
@@ -19,6 +19,7 @@
package org.jiemamy.core.model.connection;
import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.core.utils.processor.connection.IsCyclicProcessor;
import org.jiemamy.spec.model.connection.AbstractConnectionModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
@@ -64,6 +65,13 @@
}
/**
+ * {@inheritDoc}
+ */
+ public boolean isSelfConnection() {
+ return process(IsCyclicProcessor.getInstance());
+ }
+
+ /**
* 接続元ノードを設定する。
* @param source 接続元ノード
*/
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java 2008-09-24 16:24:59 UTC (rev 1960)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java 2008-09-24 16:46:21 UTC (rev 1961)
@@ -63,7 +63,7 @@
throw new IllegalStateException("表示されていないレイアウトをリセットしようとしました。");
}
list.clear();
- if (connection.process(IsCyclicProcessor.getInstance())) {
+ if (connection.isSelfConnection()) {
// 自己コネクション時の、bendpoint自動作成
JmRectangle rect =
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/AbstractConnectionModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/AbstractConnectionModel.java 2008-09-24 16:24:59 UTC (rev 1960)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/AbstractConnectionModel.java 2008-09-24 16:46:21 UTC (rev 1961)
@@ -39,11 +39,11 @@
*/
AbstractNodeModel getTarget();
-// /**
-// * 自分同士を繋ぐコネクションであるかどうかを調べる。
-// * @return 自己コネクションである場合 <code>true</code>
-// */
-// boolean isSelfConnection();
+ /**
+ * 自分同士を繋ぐコネクションであるかどうかを調べる。
+ * @return 自己コネクションである場合 <code>true</code>
+ */
+ boolean isSelfConnection();
/**
* 接続元ノードを設定する。