svnno****@sourc*****
svnno****@sourc*****
2009年 3月 6日 (金) 18:19:27 JST
Revision: 2829
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2829
Author: shin1
Date: 2009-03-06 18:19:27 +0900 (Fri, 06 Mar 2009)
Log Message:
-----------
TableEditPartとViewEditPartのrefreshVisuals()をAbstractEntityNodeEditPartへpullupした。片方だけ違うロジックになっていて不具合を起こすなどしていたため。
Modified Paths:
--------------
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityNodeEditPart.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
-------------- next part --------------
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityNodeEditPart.java 2009-03-06 09:11:19 UTC (rev 2828)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityNodeEditPart.java 2009-03-06 09:19:27 UTC (rev 2829)
@@ -18,15 +18,26 @@
*/
package org.jiemamy.eclipse.editor.editpart.diagram;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.tools.CellEditorLocator;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.jface.viewers.TextCellEditor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.figure.EntityFigure;
import org.jiemamy.eclipse.editor.tools.NodeCellEditorLocator;
+import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.model.DiagramPresentationModel;
+import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.EntityModel;
+import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
+import org.jiemamy.utils.LogMarker;
/**
* {@link EntityModel}のNodeに対するDiagram用EditPart（コントローラ）の抽象クラス。
@@ -35,6 +46,9 @@
*/
public abstract class AbstractEntityNodeEditPart extends AbstractJmNodeEditPart {
+ private static Logger logger = LoggerFactory.getLogger(AbstractEntityNodeEditPart.class);
+
+
/**
* インスタンスを生成する。
*
@@ -56,4 +70,28 @@
CellEditorLocator locator = new NodeCellEditorLocator(figure.getEntityNameLabel());
return new EntityDirectEditManager(this, TextCellEditor.class, locator);
}
+
+ @Override
+ protected void refreshVisuals() {
+ logger.debug(LogMarker.LIFECYCLE, "refreshVisuals");
+ super.refreshVisuals();
+ GraphicalEditPart editPart = (GraphicalEditPart) getParent();
+ if (editPart == null) {
+ // モデルが削除された場合にeditPart=nullとなる。その時は描画処理は行わない。
+ return;
+ }
+
+ RootModel rootModel = (RootModel) getRoot().getContents().getModel();
+ DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
+ DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
+ NodeAdapter node = getModel();
+ NodeProfile nodeProfile = presentation.getFigureProfiles().get(node);
+ if (nodeProfile == null) {
+ // TODO 表示しない
+ } else {
+ JmRectangle boundary = nodeProfile.getBoundary();
+ editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(boundary));
+ }
+ updateFigure(getFigure());
+ }
}
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 2009-03-06 09:11:19 UTC (rev 2828)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-03-06 09:19:27 UTC (rev 2829)
@@ -24,7 +24,6 @@
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.Panel;
import org.eclipse.draw2d.StackLayout;
-import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.commands.Command;
import org.eclipse.jface.dialogs.Dialog;
@@ -50,7 +49,6 @@
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.geometory.JmColor;
-import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.ColumnUtil;
@@ -127,30 +125,6 @@
}
@Override
- protected void refreshVisuals() {
- logger.debug(LogMarker.LIFECYCLE, "refreshVisuals");
- super.refreshVisuals();
- GraphicalEditPart editPart = (GraphicalEditPart) getParent();
- if (editPart == null) {
- // モデルが削除された場合にeditPart=nullとなる。その時は描画処理は行わない。
- return;
- }
-
- RootModel rootModel = (RootModel) editPart.getModel();
- DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
- DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
- NodeAdapter node = getModel();
- NodeProfile nodeProfile = presentation.getFigureProfiles().get(node);
- if (nodeProfile == null) {
- // TODO 表示しない
- } else {
- JmRectangle boundary = nodeProfile.getBoundary();
- editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(boundary));
- }
- updateFigure(getFigure());
- }
-
- @Override
protected void updateFigure(IFigure figure) {
logger.debug(LogMarker.LIFECYCLE, "updateFigure");
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
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 2009-03-06 09:11:19 UTC (rev 2828)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-03-06 09:19:27 UTC (rev 2829)
@@ -24,7 +24,6 @@
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.Panel;
import org.eclipse.draw2d.StackLayout;
-import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.commands.Command;
import org.eclipse.jface.dialogs.Dialog;
@@ -47,7 +46,6 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.ViewModel;
import org.jiemamy.model.geometory.JmColor;
-import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.LogMarker;
@@ -117,31 +115,6 @@
}
@Override
- protected void refreshVisuals() {
- logger.debug(LogMarker.LIFECYCLE, "refreshVisuals");
- super.refreshVisuals();
- GraphicalEditPart editPart = (GraphicalEditPart) getParent();
- if (editPart == null) {
- // モデルが削除された場合にeditPart=nullとなる。その時は描画処理は行わない。
- return;
- }
-
- RootModel rootModel = (RootModel) getRoot().getContents().getModel();
- DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
- DiagramPresentationModel presentation = diagramPresentations.get(Migration.DIAGRAM_INDEX);
- NodeAdapter node = getModel();
- NodeProfile nodeProfile = presentation.getFigureProfiles().get(node);
- if (nodeProfile == null) {
- // TODO 表示しない
- } else {
- JmRectangle boundary = nodeProfile.getBoundary();
- editPart.setLayoutConstraint(this, getFigure(), ConvertUtil.convert(boundary));
- }
-
- updateFigure(getFigure());
- }
-
- @Override
protected void updateFigure(IFigure figure) {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
NodeAdapter node = getModel();