svnno****@sourc*****
svnno****@sourc*****
2009年 2月 22日 (日) 22:26:25 JST
Revision: 2708
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2708
Author: daisuke_m
Date: 2009-02-22 22:26:25 +0900 (Sun, 22 Feb 2009)
Log Message:
-----------
長すぎるメソッドチェーンをリファクタリング。
Modified Paths:
--------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java
artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/processor/ResetBendpointProcessorTest.java
artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/model/DiagramPresentationModelImplTest.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/DiagramEditor.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/DeleteNodeCommand.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/StickyEditPart.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -242,13 +242,13 @@
int y = Integer.valueOf(XpathUtil.getAttr(nodeLayoutNode, "view:boundary/@y").getValue());
int width = Integer.valueOf(XpathUtil.getAttr(nodeLayoutNode, "view:boundary/@width").getValue());
int height = Integer.valueOf(XpathUtil.getAttr(nodeLayoutNode, "view:boundary/@height").getValue());
- JmRectangle rect = new JmRectangle(x, y, width, height);
+
Attr colorAttr = XpathUtil.getAttr(nodeLayoutNode, "view:boundary/@color");
JmColor color = colorAttr == null ? null : JmColor.parse(colorAttr.getValue());
NodeProfile nodeProfile =
factory.newModel(NodeProfile.class, DomUtil.getUUID(nodeLayoutNode, CoreQName.ID));
- nodeProfile.setLayout(rect);
+ nodeProfile.setLayout(new JmRectangle(x, y, width, height));
nodeProfile.setColor(color);
presentation.getFigureProfiles().put(nodeAdapter, nodeProfile);
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -22,6 +22,7 @@
import org.apache.commons.lang.Validate;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -55,7 +56,9 @@
*/
public List<JmPoint> process(RootModel rootModel) {
Validate.notNull(rootModel);
- return rootModel.getAdapter(DiagramPresentations.class).get(index).getConnectionLayouts().get(connection);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentationModel = diagramPresentations.get(index);
+ return presentationModel.getConnectionLayouts().get(connection);
}
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -22,6 +22,7 @@
import org.apache.commons.lang.Validate;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -60,7 +61,9 @@
*/
public Void process(RootModel rootModel) {
Validate.notNull(rootModel);
- rootModel.getAdapter(DiagramPresentations.class).get(index).getConnectionLayouts().put(connection, bendpoints);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentationModel = diagramPresentations.get(index);
+ presentationModel.getConnectionLayouts().put(connection, bendpoints);
return null;
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -145,6 +145,8 @@
private void createPresentations() {
if (factory.getSupportedSpecs().contains(OfficialSpecs.VIEW)) {
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+
// ダイアグラム表現の生成・追加(1)
DiagramPresentationModel presentation1 =
factory.newModel(DiagramPresentationModel.class, uuid.get("1deca0e8-6153-47ad-abe8-ac764f768d96"));
@@ -179,7 +181,7 @@
presentation1.getConnectionLayouts().put(fkEmpEmp.getAdapter(ConnectionAdapter.class), bendpoints);
presentation1.getConnectionLayouts().put(fkEmpDept.getAdapter(ConnectionAdapter.class),
new ArrayList<JmPoint>()); // bendpount無し
- rootModel.getAdapter(DiagramPresentations.class).add(presentation1);
+ diagramPresentations.add(presentation1);
// ダイアグラム表現の生成・追加(2)
DiagramPresentationModel presentation2 =
@@ -198,7 +200,7 @@
PresentationUtil.setLayout(presentation2, fkEmpDept.getAdapter(ConnectionAdapter.class),
new ArrayList<JmPoint>()); // bendpount無し
- rootModel.getAdapter(DiagramPresentations.class).add(presentation2);
+ diagramPresentations.add(presentation2);
}
}
}
Modified: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/processor/ResetBendpointProcessorTest.java
===================================================================
--- artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/processor/ResetBendpointProcessorTest.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/processor/ResetBendpointProcessorTest.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -32,6 +32,7 @@
import org.jiemamy.ArtemisView;
import org.jiemamy.Jiemamy;
import org.jiemamy.Migration;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.geometory.JmPoint;
@@ -74,15 +75,15 @@
@Ignore
public void test01_ベンドポイントをリセットすると_通常ベンドポイントは0になり_自己参照時には2になる() throws Exception {
List<JmPoint> bendpoints;
- DiagramPresentationUtil.resetBenpoinsts(mb.rootModel.getAdapter(DiagramPresentations.class).get(
- Migration.DIAGRAM_INDEX), mb.fkEmpDept.getAdapter(ConnectionAdapter.class));
- bendpoints =
- mb.rootModel.getAdapter(DiagramPresentations.class).get(0).getConnectionLayouts().get(mb.fkEmpDept);
+ DiagramPresentations diagramPresentations = mb.rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentationModel = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+
+ DiagramPresentationUtil.resetBenpoinsts(presentationModel, mb.fkEmpDept.getAdapter(ConnectionAdapter.class));
+ bendpoints = diagramPresentations.get(0).getConnectionLayouts().get(mb.fkEmpDept);
assertThat(bendpoints.size(), is(0));
- DiagramPresentationUtil.resetBenpoinsts(mb.rootModel.getAdapter(DiagramPresentations.class).get(
- Migration.DIAGRAM_INDEX), mb.fkEmpEmp.getAdapter(ConnectionAdapter.class));
- bendpoints = mb.rootModel.getAdapter(DiagramPresentations.class).get(0).getConnectionLayouts().get(mb.fkEmpEmp);
+ DiagramPresentationUtil.resetBenpoinsts(presentationModel, mb.fkEmpEmp.getAdapter(ConnectionAdapter.class));
+ bendpoints = diagramPresentations.get(0).getConnectionLayouts().get(mb.fkEmpEmp);
assertThat(bendpoints.size(), is(2));
}
}
Modified: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/model/DiagramPresentationModelImplTest.java
===================================================================
--- artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/model/DiagramPresentationModelImplTest.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/model/DiagramPresentationModelImplTest.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -55,7 +55,8 @@
rootModel = factory.getRootModel();
presentation = factory.newModel(DiagramPresentationModel.class);
presentation.setName("testPresentation");
- rootModel.getAdapter(DiagramPresentations.class).add(presentation);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ diagramPresentations.add(presentation);
}
/**
@@ -64,7 +65,8 @@
*/
@After
public void tearDown() throws Exception {
- rootModel.getAdapter(DiagramPresentations.class).remove(presentation);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ diagramPresentations.remove(presentation);
presentation = null;
rootModel = null;
factory = null;
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -39,6 +39,7 @@
import org.jiemamy.eclipse.editor.editpart.diagram.AbstractJmNodeEditPart;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
+import org.jiemamy.model.NodeProfile;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.geometory.JmPoint;
@@ -186,12 +187,12 @@
this.target = target;
this.x = x;
this.y = y;
- oldX =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles()
- .get(target).getLayout().x;
- oldY =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles()
- .get(target).getLayout().y;
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ NodeProfile nodeProfile = presentation.getFigureProfiles().get(target);
+ JmRectangle layout = nodeProfile.getLayout();
+ oldX = layout.x;
+ oldY = layout.y;
}
/**
@@ -199,17 +200,15 @@
*/
@Override
public void execute() {
- DiagramPresentationModel presentation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
PresentationUtil.setLayout(presentation, target, new JmRectangle(x, y, -1, -1));
// PresentationUtil.setColor(presentation, target, color);
oldBendpoints.clear();
for (ConnectionAdapter conn : target.getSourceConnections()) {
- List<JmPoint> points =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX)
- .getConnectionLayouts().get(conn);
+ List<JmPoint> points = presentation.getConnectionLayouts().get(conn);
oldBendpoints.put(conn, points);
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(conn);
+ presentation.resetBendpoints(conn);
}
}
@@ -218,12 +217,11 @@
*/
@Override
public void undo() {
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
for (ConnectionAdapter conn : target.getSourceConnections()) {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts()
- .put(conn, oldBendpoints.get(conn));
+ presentation.getConnectionLayouts().put(conn, oldBendpoints.get(conn));
}
- DiagramPresentationModel presentation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
PresentationUtil.setLayout(presentation, 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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -55,9 +55,8 @@
if (model instanceof NodeAdapter) {
NodeAdapter nodeAdapter = (NodeAdapter) model;
CommandStack stack = getViewer().getEditDomain().getCommandStack();
- DiagramPresentationModel presentation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
-
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
JmRectangle constraint = presentation.getFigureProfiles().get(nodeAdapter).getLayout();
JmRectangle newConstraint = new JmRectangle(constraint.x, constraint.y, -1, -1);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -509,11 +509,12 @@
if (rootModel == null) {
rootModel = jiemamy.getFactory().getRootModel();
}
- if (rootModel.getAdapter(DiagramPresentations.class).size() == 0) {
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ if (diagramPresentations.size() == 0) {
DiagramPresentationModel presentationModel =
rootModel.getJiemamy().getFactory().newModel(DiagramPresentationModel.class);
presentationModel.setName("default");
- rootModel.getAdapter(DiagramPresentations.class).add(presentationModel);
+ diagramPresentations.add(presentationModel);
}
}
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -21,6 +21,7 @@
import org.eclipse.gef.commands.Command;
import org.jiemamy.Migration;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.geometory.JmColor;
@@ -51,9 +52,9 @@
public ChangeNodeColorCommand(RootModel rootModel, NodeAdapter nodeAdapter, JmColor newColor) {
this.rootModel = rootModel;
this.nodeAdapter = nodeAdapter;
- oldColor =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles().get(
- nodeAdapter).getColor();
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ oldColor = presentation.getFigureProfiles().get(nodeAdapter).getColor();
this.newColor = newColor;
}
@@ -62,8 +63,9 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles().get(
- nodeAdapter).setColor(newColor);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.getFigureProfiles().get(nodeAdapter).setColor(newColor);
}
/**
@@ -71,7 +73,8 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles().get(
- nodeAdapter).setColor(oldColor);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.getFigureProfiles().get(nodeAdapter).setColor(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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -30,6 +30,7 @@
import org.jiemamy.JiemamyViewFacadeImpl;
import org.jiemamy.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -71,9 +72,9 @@
EditPartViewer viewer) {
this.rootModel = rootModel;
this.nodeAdapter = nodeAdapter;
- oldConstraint =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles().get(
- nodeAdapter).getLayout();
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentationModel = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ oldConstraint = presentationModel.getFigureProfiles().get(nodeAdapter).getLayout();
constraint = rectangle;
this.viewer = viewer;
@@ -103,22 +104,9 @@
@Override
public void execute() {
logger.debug("execute");
-// EventBroker eventBroker = rootModel.getJiemamy().getEventBroker();
-// CommandProcessor commandProcessor = new CommandProcessorImpl(eventBroker);
-// DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
-// DiagramPresentationModel diagramPresentationModel = diagramPresentations.get(Migration.DIAGRAM_INDEX);
-
// 本体の移動
jiemamyFacade.changeNodeConstraint(Migration.DIAGRAM_INDEX, nodeAdapter, constraint);
-// diagramPresentationModel.getFigureProfiles().get(nodeAdapter).setLayout(constraint);
-// NodeProfile nodeProfile = diagramPresentationModel.getFigureProfiles().get(nodeAdapter);
-// try {
-// new ModifyModelPropertyCommand(nodeProfile, "layout", constraint).execute(commandProcessor);
-// } catch (Exception e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
// ベンドポイントの移動
shiftBendpoints(false);
@@ -127,6 +115,16 @@
shiftPosition(false);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void undo() {
+ jiemamyFacade.undo();
+ shiftBendpoints(true);
+ shiftPosition(true);
+ }
+
private void shiftBendpoints(boolean positive) {
JmPoint delta = JmPointUtil.delta(oldConstraint, constraint);
@@ -140,10 +138,9 @@
// ベンドポイントも同時に移動させる（必要なもののみ）
for (ConnectionAdapter connection : nodeAdapter.getSourceConnections()) {
if (selectedModels.contains(connection.getSource()) && selectedModels.contains(connection.getTarget())) {
-
- List<JmPoint> bendpoints =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX)
- .getConnectionLayouts().get(connection);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentationModel = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ List<JmPoint> bendpoints = presentationModel.getConnectionLayouts().get(connection);
for (JmPoint bendpoint : bendpoints) {
if (positive) {
JmPointUtil.shiftPositive(bendpoint, delta);
@@ -154,16 +151,4 @@
}
}
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void undo() {
- jiemamyFacade.undo();
-// rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getFigureProfiles().get(
-// nodeAdapter).setLayout(oldConstraint);
- shiftBendpoints(true);
- shiftPosition(true);
- }
}
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -22,6 +22,7 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -67,8 +68,9 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).add(index, ConvertUtil.convert(location));
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.getConnectionLayouts().get(relation).add(index, ConvertUtil.convert(location));
shiftPosition(false);
}
@@ -77,8 +79,9 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).remove(index);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -114,7 +114,9 @@
((TableModel) source.unwrap()).getAttributes().add(fk);
}
-// rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).resetBendpoints(connection);
+// DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+// DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+// presentation.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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -67,21 +67,21 @@
*/
@Override
public void execute() {
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
NodeAdapter nodeAdapter;
- DiagramPresentationModel diagramPresentationModel =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
if (model instanceof NodeAdapter) {
nodeAdapter = (NodeAdapter) model;
} else {
nodeAdapter = model.getAdapter(NodeAdapter.class);
}
- Map<NodeAdapter, NodeProfile> figureProfiles = diagramPresentationModel.getFigureProfiles();
+ Map<NodeAdapter, NodeProfile> figureProfiles = presentation.getFigureProfiles();
if (figureProfiles.containsKey(nodeAdapter) == false) {
JiemamyFactory factory = model.getJiemamy().getFactory();
NodeProfile profile = factory.newModel(NodeProfile.class);
figureProfiles.put(nodeAdapter, profile);
}
- diagramPresentationModel.getFigureProfiles().get(nodeAdapter).setLayout(ConvertUtil.convert(rectangle));
+ presentation.getFigureProfiles().get(nodeAdapter).setLayout(ConvertUtil.convert(rectangle));
// Command経由でモデルを追加するサンプル。
if (model instanceof EntityModel) {
EntityModel entityModel = (EntityModel) model;
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -23,6 +23,7 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -60,12 +61,11 @@
*/
@Override
public void execute() {
- JmPoint oldLocation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts()
- .get(relation).get(index);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ JmPoint oldLocation = presentation.getConnectionLayouts().get(relation).get(index);
this.oldLocation = new Point(oldLocation.x, oldLocation.y);
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).remove(index);
+ presentation.getConnectionLayouts().get(relation).remove(index);
}
/**
@@ -73,7 +73,8 @@
*/
@Override
public void undo() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).add(index, ConvertUtil.convert(oldLocation));
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.getConnectionLayouts().get(relation).add(index, ConvertUtil.convert(oldLocation));
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -83,8 +83,8 @@
*/
@Override
public void undo() {
- DiagramPresentationModel diagramPresentationModel =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
if (targetNode.unwrap() != null) {
rootModel.getEntities().add(targetNode.unwrap());
}
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -22,6 +22,7 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
@@ -53,9 +54,9 @@
* @param index
*/
public MoveBendpointCommand(RootModel rootModel, ConnectionAdapter relation, int index, Point newLocation) {
- JmPoint oldLocation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts()
- .get(relation).get(index);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ JmPoint oldLocation = presentation.getConnectionLayouts().get(relation).get(index);
this.rootModel = rootModel;
this.relation = relation;
@@ -73,8 +74,9 @@
*/
@Override
public void execute() {
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).set(index, ConvertUtil.convert(newLocation));
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.getConnectionLayouts().get(relation).set(index, ConvertUtil.convert(newLocation));
shiftPosition(false);
}
@@ -84,7 +86,8 @@
@Override
public void undo() {
shiftPosition(true);
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX).getConnectionLayouts().get(
- relation).set(index, ConvertUtil.convert(oldLocation));
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ presentation.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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -67,24 +67,24 @@
JiemamyEditor editor = (JiemamyEditor) EditorUtil.getActiveEditor();
RootModel rootModel = editor.getRootModel();
- DiagramPresentationModel diagramPresentationModel =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
- for (NodeAdapter node : diagramPresentationModel.getFigureProfiles().keySet()) {
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ for (NodeAdapter node : presentation.getFigureProfiles().keySet()) {
// エンティティの移動
- JmRectangle rect = diagramPresentationModel.getFigureProfiles().get(node).getLayout();
+ JmRectangle rect = presentation.getFigureProfiles().get(node).getLayout();
JmRectangle newRect;
if (negative) {
newRect = new JmRectangle(rect.x - shift.x, rect.y - shift.y, rect.width, rect.height);
} else {
newRect = new JmRectangle(rect.x + shift.x, rect.y + shift.y, rect.width, rect.height);
}
- diagramPresentationModel.getFigureProfiles().get(node).setLayout(newRect);
+ presentation.getFigureProfiles().get(node).setLayout(newRect);
// ベンドポイントの移動
for (ConnectionAdapter connection : node.getSourceConnections()) {
List<JmPoint> newBendpoints = new ArrayList<JmPoint>();
- List<JmPoint> oldBendpoints = diagramPresentationModel.getConnectionLayouts().get(connection);
+ List<JmPoint> oldBendpoints = presentation.getConnectionLayouts().get(connection);
for (JmPoint bendpoint : oldBendpoints) {
JmPoint newBendpoint;
if (negative) {
@@ -95,7 +95,7 @@
newBendpoints.add(newBendpoint);
}
- diagramPresentationModel.getConnectionLayouts().put(connection, newBendpoints);
+ presentation.getConnectionLayouts().put(connection, newBendpoints);
}
// FIXME
}
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 2009-02-22 06:56:24 UTC (rev 2707)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-02-22 13:26:25 UTC (rev 2708)
@@ -160,8 +160,8 @@
StickyModel stickyModel = (StickyModel) getModel();
StickyFigure stickyFigure = (StickyFigure) figure;
- DiagramPresentationModel presentation =
- rootModel.getAdapter(DiagramPresentations.class).get(Migration.DIAGRAM_INDEX);
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
JmColor color = presentation.getFigureProfiles().get(stickyModel).getColor();
stickyFigure.setContents(stickyModel.getContents());
stickyFigure.setBgColor(ConvertUtil.convert(color));