svnno****@sourc*****
svnno****@sourc*****
2009年 4月 18日 (土) 23:58:19 JST
Revision: 3322
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3322
Author: daisuke_m
Date: 2009-04-18 23:58:19 +0900 (Sat, 18 Apr 2009)
Log Message:
-----------
[VIEW-1] 自己コネクション作成時の自動bendpoint生成をミスっていたので修正。
Modified Paths:
--------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java 2009-04-18 14:27:42 UTC (rev 3321)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java 2009-04-18 14:58:19 UTC (rev 3322)
@@ -20,6 +20,7 @@
import java.util.List;
+import org.apache.commons.collections15.list.UnmodifiableList;
import org.apache.commons.lang.Validate;
import org.jiemamy.EventBroker;
@@ -33,8 +34,6 @@
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.geometory.JmPoint;
import org.jiemamy.model.geometory.JmRectangle;
-import org.jiemamy.utils.CollectionsUtil;
-import org.jiemamy.utils.model.PresentationUtil;
/**
* コネクションのベンドポイントをリセットするEDITコマンド。
@@ -83,7 +82,7 @@
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
diagramPresentation = diagramPresentations.get(diagramIndex);
connectionProfile = diagramPresentation.getConnectionProfiles().get(connectionAdapter);
- bendpoints = CollectionsUtil.newArrayList(connectionProfile.getBendpoints());
+ bendpoints = UnmodifiableList.decorate(connectionProfile.getBendpoints());
}
public Command getNegateCommand() {
@@ -96,7 +95,8 @@
@Override
protected void execute0() {
- PresentationUtil.resetBenpoinsts(diagramPresentation, connectionAdapter);
+ List<JmPoint> bendpoints = connectionProfile.getBendpoints();
+ bendpoints.clear();
if (connectionAdapter.isSelfConnection()) {
// 自己コネクション時の、bendpoint自動作成