svnno****@sourc*****
svnno****@sourc*****
2009年 3月 17日 (火) 05:07:35 JST
Revision: 2893
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2893
Author: daisuke_m
Date: 2009-03-17 05:07:35 +0900 (Tue, 17 Mar 2009)
Log Message:
-----------
付箋の削除に対応。
Modified Paths:
--------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java 2009-03-16 19:52:22 UTC (rev 2892)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java 2009-03-16 20:07:35 UTC (rev 2893)
@@ -237,12 +237,9 @@
removeConnectionProfile(diagramIndex, connection);
}
+ removeNodeProfile(diagramIndex, nodeAdapter);
if (nodeAdapter.unwrap() != null) {
- removeNodeProfile(diagramIndex, nodeAdapter);
removeEntity(nodeAdapter.unwrap());
- } else {
- // TODO Stickyとか、色々なNodeへの対応が必要になるはず。
- logger.debug("EntityModel以外は未実装状態");
}
}
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java 2009-03-16 19:52:22 UTC (rev 2892)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java 2009-03-16 20:07:35 UTC (rev 2893)
@@ -118,8 +118,10 @@
Map<ConnectionAdapter, ConnectionProfile> connectionProfiles = diagramPresentationModel.getConnectionProfiles();
ConnectionAdapter connection = getModel();
- // FIXME nullの時がある？ do/undo/redoまわりで不整合？
ConnectionProfile connectionProfile = diagramPresentationModel.getConnectionProfiles().get(connection);
+ if(connectionProfile == null) {
+ return;
+ }
List<JmPoint> bendpoints = connectionProfile.getBendpoints();
if (connectionProfiles.containsKey(connection) == false) {
bendpoints.clear();
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-16 19:52:22 UTC (rev 2892)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-16 20:07:35 UTC (rev 2893)
@@ -160,6 +160,10 @@
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ NodeProfile nodeProfile = presentation.getNodeProfiles().get(stickyModel);
+ if (nodeProfile == null) {
+ return;
+ }
JmColor color = presentation.getNodeProfiles().get(stickyModel).getColor();
stickyFigure.setContents(stickyModel.getContents());
stickyFigure.setBgColor(ConvertUtil.convert(color));