svnno****@sourc*****
svnno****@sourc*****
2009年 2月 7日 (土) 23:18:16 JST
Revision: 2628
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2628
Author: daisuke_m
Date: 2009-02-07 23:18:16 +0900 (Sat, 07 Feb 2009)
Log Message:
-----------
J-event系がなくてもコンパイルできるよう修正。
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis/pom.xml
artemis/trunk/jiemamy-artemis-test/.project
artemis/trunk/jiemamy-artemis-test/pom.xml
vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
vesta/trunk/org.jiemamy.eclipse/build.properties
vesta/trunk/org.jiemamy.eclipse/plugin.xml
vesta/trunk/org.jiemamy.eclipse/pom.xml
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
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/TableEditPart.java
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/outlinetree/AbstractEntityTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
zeus/trunk/jiemamy-specs/pom.xml
-------------- next part --------------
Modified: artemis/trunk/jiemamy-artemis/pom.xml
===================================================================
--- artemis/trunk/jiemamy-artemis/pom.xml 2009-02-07 14:17:53 UTC (rev 2627)
+++ artemis/trunk/jiemamy-artemis/pom.xml 2009-02-07 14:18:16 UTC (rev 2628)
@@ -80,7 +80,6 @@
<module>../jiemamy-dialect-sql99</module>
<module>../jiemamy-dialect-postgresql</module>
<module>../jiemamy-dialect-mysql</module>
- <module>../jiemamy-event</module>
<module>../jiemamy-view</module>
<module>../jiemamy-artemis-test</module>
<!--
Modified: artemis/trunk/jiemamy-artemis-test/.project
===================================================================
--- artemis/trunk/jiemamy-artemis-test/.project 2009-02-07 14:17:53 UTC (rev 2627)
+++ artemis/trunk/jiemamy-artemis-test/.project 2009-02-07 14:18:16 UTC (rev 2628)
@@ -34,14 +34,14 @@
</natures>
<linkedResources>
<link>
- <name>findbugs.xml</name>
+ <name>.fbprefs</name>
<type>1</type>
- <locationURI>DOCUMENTS/jiemamy-artemis/findbugs.xml</locationURI>
+ <locationURI>DOCUMENTS/jiemamy-artemis/.fbprefs</locationURI>
</link>
<link>
- <name>.fbprefs</name>
+ <name>findbugs.xml</name>
<type>1</type>
- <locationURI>DOCUMENTS/jiemamy-artemis/.fbprefs</locationURI>
+ <locationURI>DOCUMENTS/jiemamy-artemis/findbugs.xml</locationURI>
</link>
<link>
<name>.checkstyle</name>
Modified: artemis/trunk/jiemamy-artemis-test/pom.xml
===================================================================
--- artemis/trunk/jiemamy-artemis-test/pom.xml 2009-02-07 14:17:53 UTC (rev 2627)
+++ artemis/trunk/jiemamy-artemis-test/pom.xml 2009-02-07 14:18:16 UTC (rev 2628)
@@ -62,11 +62,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jiemamy-event</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>jiemamy-view</artifactId>
<version>${project.version}</version>
</dependency>
Modified: vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-02-07 14:18:16 UTC (rev 2628)
@@ -14,7 +14,6 @@
lib/javassist-3.8.0.GA.jar,
lib/jcl-over-slf4j-1.5.5.jar,
lib/jiemamy-core-0.2.0-SNAPSHOT.jar,
- lib/jiemamy-dialect-mysql-0.2.0-SNAPSHOT.jar,
lib/jiemamy-dialect-postgresql-0.2.0-SNAPSHOT.jar,
lib/jiemamy-dialect-sql99-0.2.0-SNAPSHOT.jar,
lib/jiemamy-event-0.2.0-SNAPSHOT.jar,
Modified: vesta/trunk/org.jiemamy.eclipse/build.properties
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/build.properties 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/build.properties 2009-02-07 14:18:16 UTC (rev 2628)
@@ -17,7 +17,6 @@
lib/javassist-3.8.0.GA.jar,\
lib/jcl-over-slf4j-1.5.5.jar,\
lib/jiemamy-core-0.2.0-SNAPSHOT.jar,\
- lib/jiemamy-dialect-mysql-0.2.0-SNAPSHOT.jar,\
lib/jiemamy-dialect-postgresql-0.2.0-SNAPSHOT.jar,\
lib/jiemamy-dialect-sql99-0.2.0-SNAPSHOT.jar,\
lib/jiemamy-event-0.2.0-SNAPSHOT.jar,\
Modified: vesta/trunk/org.jiemamy.eclipse/plugin.xml
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/plugin.xml 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/plugin.xml 2009-02-07 14:18:16 UTC (rev 2628)
@@ -8,8 +8,6 @@
<extension
point="org.jiemamy.eclipse.dialects">
<dialect
- class="org.jiemamy.dialect.mysql.MySqlDialect"/>
- <dialect
class="org.jiemamy.dialect.postgresql.PostgresqlDialect"/>
<dialect
class="org.jiemamy.dialect.sql99.Sql99Dialect"/>
Modified: vesta/trunk/org.jiemamy.eclipse/pom.xml
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/pom.xml 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/pom.xml 2009-02-07 14:18:16 UTC (rev 2628)
@@ -132,22 +132,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>jiemamy-spec-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jiemamy-spec-event</artifactId>
- <version>${project.version}</version>
- <exclusions>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>jiemamy-spec-view</artifactId>
<version>${project.version}</version>
- <exclusions>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -156,21 +145,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jiemamy-event</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>jiemamy-dialect-sql99</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jiemamy-dialect-mysql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>jiemamy-dialect-postgresql</artifactId>
<version>${project.version}</version>
</dependency>
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -32,7 +32,6 @@
import org.seasar.eclipse.common.util.ImageManager;
import org.jiemamy.Artemis;
-import org.jiemamy.ArtemisEvent;
import org.jiemamy.ArtemisView;
import org.jiemamy.Jiemamy;
import org.jiemamy.composer.Exporter;
@@ -168,7 +167,7 @@
importerResolver = new ExtensionResolver<Importer>(PLUGIN_ID, "composers", "importer", "class");
exporterResolver = new ExtensionResolver<Exporter>(PLUGIN_ID, "composers", "exporter", "class");
validatorResolver = new ExtensionResolver<ModelValidator>(PLUGIN_ID, "validators", "dialect", "class");
- jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisEvent(), new ArtemisView()));
+ jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()));
}
/**
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -20,8 +20,6 @@
import java.util.List;
-import org.jiemamy.event.Observable;
-import org.jiemamy.event.ObservableImpl;
import org.jiemamy.utils.Adaptable;
import org.jiemamy.utils.CollectionsUtil;
@@ -39,8 +37,6 @@
/** コンテナが持つ子モデル */
private List<Object> children = CollectionsUtil.newArrayList();
- private Observable observable = new ObservableImpl();
-
/**
* インスタンスを生成する。
@@ -54,12 +50,12 @@
* {@inheritDoc}
*/
public <T>T getAdapter(Class<T> adapterClass) {
- if (adapterClass == Observable.class) {
- @SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
- T result = (T) observable;
- return result;
- }
+// if (adapterClass == Observable.class) {
+// @SuppressWarnings("unchecked")
+// // TODO キャスト安全性の根拠提示
+// T result = (T) observable;
+// return result;
+// }
return null;
}
@@ -90,9 +86,9 @@
* {@inheritDoc}
*/
public boolean hasAdapter(Class<?> adapterClass) {
- if (adapterClass == Observable.class) {
- return true;
- }
+// if (adapterClass == Observable.class) {
+// return true;
+// }
return false;
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -20,8 +20,6 @@
import org.eclipse.gef.tools.DirectEditManager;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.ModelChangeSupport;
import org.jiemamy.model.entity.EntityModel;
/**
@@ -37,7 +35,7 @@
public void activate() {
super.activate();
EntityModel entityModel = (EntityModel) getModel();
- entityModel.getAdapter(ModelChangeSupport.class).addModelChangeListener(this);
+// entityModel.getAdapter(ModelChangeSupport.class).addModelChangeListener(this);
}
/**
@@ -46,18 +44,18 @@
@Override
public void deactivate() {
EntityModel entityModel = (EntityModel) getModel();
- entityModel.getAdapter(ModelChangeSupport.class).removeModelChangeListener(this);
+// entityModel.getAdapter(ModelChangeSupport.class).removeModelChangeListener(this);
super.deactivate();
}
/**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
-
- if (evt.getSource().equals(getModel())) {
+ // * {@inheritDoc}
+ // */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+//
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(AbstractEntityModel.P_CREATE)) {
// JiemamyValidatorUtil.validate(getResource(), (RootModel) getParent().getModel());
// } else if (evt.getField().equals(AbstractEntityModel.P_DELETE)) {
@@ -67,13 +65,12 @@
// } else if (evt.getField().equals(AbstractEntityModel.P_NODE_ENTITY_NAME)) {
// JiemamyValidatorUtil.validate(getResource(), (RootModel) getParent().getModel());
// }
- } else {
+// } else {
// if (evt.getField().equals(DatabaseModel.P_DB_DISPLAY_MODE)) {
- refreshVisuals();
+// refreshVisuals();
// }
- }
- }
-
+// }
+// }
/**
* {@inheritDoc}
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -20,7 +20,6 @@
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import org.apache.commons.collections15.IteratorUtils;
import org.eclipse.core.resources.IResource;
@@ -43,24 +42,16 @@
import org.jiemamy.eclipse.editor.editpolicy.JmDirectEditPolicy;
import org.jiemamy.eclipse.editor.editpolicy.JmGraphicalNodeEditPolicy;
import org.jiemamy.eclipse.utils.EditorUtil;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.ModelChangeListener;
-import org.jiemamy.event.Observable;
-import org.jiemamy.event.ObservableCollectionChangeEvent;
-import org.jiemamy.event.ObservableCollectionChangeListener;
-import org.jiemamy.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
-import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
/**
* {@link NodeAdapter}に対するDiagram用EditPart（コントローラ）の抽象クラス。
* @author daisuke
*/
-public abstract class AbstractNodeEditPart extends AbstractGraphicalEditPart implements ModelChangeListener,
- EditDialogSupport, DoubleClickSupport, NodeEditPart,
- ObservableCollectionChangeListener<Map<NodeAdapter, JmRectangle>, JmRectangle> {
+public abstract class AbstractNodeEditPart extends AbstractGraphicalEditPart implements EditDialogSupport,
+ DoubleClickSupport, NodeEditPart /*, ModelChangeListener */{
private DirectEditManager directManager = null;
@@ -74,34 +65,34 @@
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
NodeAdapter nodeAdapter = (NodeAdapter) getModel();
- // ルートモデルを監視開始（DisplayModeが変わった時用）
- rootModel.getAdapter(Observable.class).addModelChangeListener(this);
-
- // DiagramPresentationが変わった時用
+// // ルートモデルを監視開始（DisplayModeが変わった時用）
+// rootModel.getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // DiagramPresentationが変わった時用
// rootModel.getDiagramPresentations().get(Migration.DIAGRAM_INDEX).getNodeLayouts().addListener(this);
-
- // 自モデルを監視開始
- nodeAdapter.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
-
- // 自モデルから出るコネクションを監視開始
- for (ConnectionAdapter connection : nodeAdapter.getSourceConnections()) {
- connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- }
-
- // 自モデルを指すコネクションを監視開始
- for (ConnectionAdapter connection : nodeAdapter.getTargetConnections()) {
- connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- }
+//
+// // 自モデルを監視開始
+// nodeAdapter.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // 自モデルから出るコネクションを監視開始
+// for (ConnectionAdapter connection : nodeAdapter.getSourceConnections()) {
+// connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// }
+//
+// // 自モデルを指すコネクションを監視開始
+// for (ConnectionAdapter connection : nodeAdapter.getTargetConnections()) {
+// connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// }
}
- /**
- * {@inheritDoc}
- */
- public void collectionChanged(ObservableCollectionChangeEvent<Map<NodeAdapter, JmRectangle>, JmRectangle> event) {
- if (event.getTiming() == Timing.AFTER_ADD) {
- refreshVisuals();
- }
- }
+// /**
+// * {@inheritDoc}
+// */
+// public void collectionChanged(ObservableCollectionChangeEvent<Map<NodeAdapter, JmRectangle>, JmRectangle> event) {
+// if (event.getTiming() == Timing.AFTER_ADD) {
+// refreshVisuals();
+// }
+// }
/**
* {@inheritDoc}
@@ -111,20 +102,20 @@
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
NodeAdapter entityModel = (NodeAdapter) getModel();
- // 自モデルを指すコネクションを監視終了
- for (ConnectionAdapter connection : entityModel.getTargetConnections()) {
- connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- }
- // 自モデルから出るコネクションを監視終了
- for (ConnectionAdapter connection : entityModel.getSourceConnections()) {
- connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- }
- // 自モデルを監視終了
- entityModel.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// // 自モデルを指すコネクションを監視終了
+// for (ConnectionAdapter connection : entityModel.getTargetConnections()) {
+// connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// }
+// // 自モデルから出るコネクションを監視終了
+// for (ConnectionAdapter connection : entityModel.getSourceConnections()) {
+// connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// }
+// // 自モデルを監視終了
+// entityModel.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+//
+// // ルートモデルを監視終了
+// rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
- // ルートモデルを監視終了
- rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
-
super.deactivate();
}
@@ -156,28 +147,28 @@
return new ChopboxAnchor(getFigure());
}
- /**
- * {@inheritDoc}
- */
- public void modelChanged(ModelChangeEvent evt) {
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// public void modelChanged(ModelChangeEvent evt) {
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(AbstractNodeModel.P_CREATE)) {
// openEditDialog();
// } else if (evt.getField().equals(StickyModel.P_NODE_BG_COLOR)) {
- updateFigure(getFigure());
+// updateFigure(getFigure());
// } else if (evt.getField().equals(AbstractNodeModel.P_NODE_CONSTRAINT)) {
- refreshVisuals();
+// refreshVisuals();
// } else if (evt.getField().equals(AbstractNodeModel.P_NODE_SOURCE_CONNECTION)) {
// // HACK リスナー更新、こんな方法でいいのか？
// deactivate();
// activate();
// }
- } else {
+// } else {
// if (evt.getField().equals(DatabaseModel.P_DB_DISPLAY_MODE)) {
- refreshVisuals();
+// refreshVisuals();
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -30,12 +30,8 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.editpolicy.JmBendpointEditPolicy;
import org.jiemamy.eclipse.editor.editpolicy.JmRelationEditPolicy;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.ModelChangeListener;
-import org.jiemamy.event.Observable;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
-import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.geometory.JmPoint;
/**
@@ -43,7 +39,7 @@
*
* @author daisuke
*/
-public abstract class AbstractRelationEditPart extends AbstractConnectionEditPart implements ModelChangeListener {
+public abstract class AbstractRelationEditPart extends AbstractConnectionEditPart /*implements ModelChangeListener*/{
/**
* {@inheritDoc}
@@ -52,15 +48,15 @@
public void activate() {
super.activate();
- // ルートモデルを監視開始
- RootModel rootModel = (RootModel) getRoot().getContents().getModel();
- rootModel.getAdapter(Observable.class).addModelChangeListener(this);
-
- // 自モデル・ソース・ターゲットを監視開始
- ConnectionAdapter model = (ConnectionAdapter) getModel();
- model.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- model.getSource().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- model.getTarget().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// // ルートモデルを監視開始
+// RootModel rootModel = (RootModel) getRoot().getContents().getModel();
+// rootModel.getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // 自モデル・ソース・ターゲットを監視開始
+// ConnectionAdapter model = (ConnectionAdapter) getModel();
+// model.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// model.getSource().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// model.getTarget().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
}
/**
@@ -68,29 +64,29 @@
*/
@Override
public void deactivate() {
- // 自モデル・ソース・ターゲットを監視終了
- ConnectionAdapter model = (ConnectionAdapter) getModel();
- model.getTarget().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- model.getSource().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- model.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// // 自モデル・ソース・ターゲットを監視終了
+// ConnectionAdapter model = (ConnectionAdapter) getModel();
+// model.getTarget().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// model.getSource().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// model.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+//
+// // ルートモデルを監視終了
+// RootModel rootModel = (RootModel) getRoot().getContents().getModel();
+// rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
- // ルートモデルを監視終了
- RootModel rootModel = (RootModel) getRoot().getContents().getModel();
- rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
-
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
- public void modelChanged(ModelChangeEvent evt) {
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// public void modelChanged(ModelChangeEvent evt) {
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(AbstractRelationModel.P_RELATION_BEND_POINT)) {
- refreshBendpoints();
+// refreshBendpoints();
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -18,27 +18,20 @@
*/
package org.jiemamy.eclipse.editor.editpart.diagram;
-import java.util.List;
-
import org.eclipse.core.resources.IResource;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
import org.jiemamy.eclipse.utils.EditorUtil;
-import org.jiemamy.event.ModelChangeListener;
-import org.jiemamy.event.Observable;
-import org.jiemamy.event.ObservableCollectionChangeListener;
import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.NodeAdapter;
/**
* {@link RootModel}に対するDiagram用EditPart（コントローラ）の抽象クラス。
*
* @author daisuke
*/
-public abstract class AbstractRootEditPart extends AbstractGraphicalEditPart implements ModelChangeListener,
- ObservableCollectionChangeListener<List<NodeAdapter>, NodeAdapter> {
+public abstract class AbstractRootEditPart extends AbstractGraphicalEditPart /*implements ModelChangeListener*/{
/**
* {@inheritDoc}
@@ -48,8 +41,8 @@
super.activate();
RootModel rootModel = (RootModel) getModel();
- // ルートモデルを監視開始
- rootModel.getAdapter(Observable.class).addModelChangeListener(this);
+// // ルートモデルを監視開始
+// rootModel.getAdapter(Observable.class).addModelChangeListener(this);
// rootModel.getNodes().getAdapter(Observable.class).addListener(this);
}
@@ -60,9 +53,9 @@
public void deactivate() {
RootModel rootModel = (RootModel) getModel();
- // ルートモデルを監視終了
+// // ルートモデルを監視終了
// rootModel.getNodes().getAdapter(Observable.class).removeListener(this);
- rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
+// rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
super.deactivate();
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -30,7 +30,6 @@
import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.constraint.ForeignKeyModel;
import org.jiemamy.utils.ProcessorUtil;
@@ -51,13 +50,13 @@
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
-
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+//
// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(ForeignKeyModel.P_CREATE)) {
// openEditDialog();
@@ -69,10 +68,10 @@
// if (evt.getField().equals(TableModel.P_ENTITY_TABLE_COLUMNS)) {
// updateLabel();
// } else if (evt.getField().equals(DatabaseModel.P_DB_DISPLAY_MODE)) {
- updateLabel();
+// updateLabel();
// }
// }
- }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -37,11 +37,6 @@
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.editpolicy.JmXYLayoutEditPolicy;
import org.jiemamy.eclipse.preference.JiemamyPreference;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.ModelChangeListener;
-import org.jiemamy.event.Observable;
-import org.jiemamy.event.ObservableCollectionChangeEvent;
-import org.jiemamy.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.node.NodeAdapter;
@@ -51,8 +46,7 @@
* {@link RootModel}に対するDiagram用EditPart。
* @author daisuke
*/
-public class RootEditPart extends AbstractRootEditPart implements ModelChangeListener, EditDialogSupport,
- IPropertyChangeListener {
+public class RootEditPart extends AbstractRootEditPart implements EditDialogSupport, IPropertyChangeListener /*, ModelChangeListener */{
private static Logger logger = LoggerFactory.getLogger(RootEditPart.class);
@@ -66,38 +60,38 @@
IPreferenceStore ps = JiemamyPlugin.getDefault().getPreferenceStore();
ps.addPropertyChangeListener(this);
- RootModel rootModel = (RootModel) getModel();
- rootModel.getAdapter(Observable.class).addModelChangeListener(this);
+// RootModel rootModel = (RootModel) getModel();
+// rootModel.getAdapter(Observable.class).addModelChangeListener(this);
}
- /**
- * {@inheritDoc}
- */
- public void collectionChanged(ObservableCollectionChangeEvent<List<NodeAdapter>, NodeAdapter> event) {
- if (event.getTiming() == Timing.AFTER_ADD) {
- refreshChildren();
- }
- }
+// /**
+// * {@inheritDoc}
+// */
+// public void collectionChanged(ObservableCollectionChangeEvent<List<NodeAdapter>, NodeAdapter> event) {
+// if (event.getTiming() == Timing.AFTER_ADD) {
+// refreshChildren();
+// }
+// }
/**
* {@inheritDoc}
*/
@Override
public void deactivate() {
- RootModel rootModel = (RootModel) getModel();
- rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
+// RootModel rootModel = (RootModel) getModel();
+// rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
IPreferenceStore ps = JiemamyPlugin.getDefault().getPreferenceStore();
ps.removePropertyChangeListener(this);
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
- public void modelChanged(ModelChangeEvent e) {
+// /**
+// * {@inheritDoc}
+// */
+// public void modelChanged(ModelChangeEvent e) {
// if (e.getField() == ReflectionUtil.getField(getModel().getClass(), "dialectClassName")) {
- refreshChildren();
+// refreshChildren();
// }
// if (e.getField() == RootModel.class.getField("nodes")) {
// refreshChildren();
@@ -106,7 +100,7 @@
// // 既存ドメインの型を新しいデータベースの型に変更する。
// refreshChildren();
// }
- }
+// }
/**
* {@inheritDoc}
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-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -31,7 +31,6 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.figure.StickyFigure;
import org.jiemamy.eclipse.utils.ConvertUtil;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
@@ -56,19 +55,19 @@
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
-
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+//
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(StickyModel.P_ENTITY_STICKY_CONTENTS)) {
- refreshVisuals();
+// refreshVisuals();
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
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-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -36,7 +36,6 @@
import org.jiemamy.eclipse.editor.figure.ColumnFigure;
import org.jiemamy.eclipse.editor.figure.TableFigure;
import org.jiemamy.eclipse.utils.ConvertUtil;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.exception.TooManyElementsException;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
@@ -63,45 +62,45 @@
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
-
- if (getModel().equals(evt.getSource())) { // 自分自身の発火
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+//
+// if (getModel().equals(evt.getSource())) { // 自分自身の発火
// if (evt.getField().equals(TableModel.P_NODE_ENTITY_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// } else if (evt.getField().equals(TableModel.P_NODE_ENTITY_LOGICAL_NAME)) {
// refreshVisuals();
// } else if (evt.getField().equals(TableModel.P_NODE_BG_COLOR)) {
// updateFigure(getFigure());
// } else if (evt.getField().equals(TableModel.P_ENTITY_TABLE_COLUMNS)) {
- updateFigure(getFigure());
+// updateFigure(getFigure());
// JiemamyValidatorUtil.validate(getResource(), (RootModel) getParent().getModel());
// } else if (evt.getField().equals(TableModel.P_NODE_SOURCE_CONNECTION)) {
- refreshSourceConnections();
+// refreshSourceConnections();
// updateFigure(getFigure());
// } else if (evt.getField().equals(TableModel.P_NODE_TARGET_CONNECTION)) {
- refreshTargetConnections();
- updateFigure(getFigure());
+// refreshTargetConnections();
+// updateFigure(getFigure());
// }
// } else if (((TableModel) getModel()).getSourceConnections().contains(evt.getSource())) { // source関連の発火
// if (evt.getField().equals(ForeignKeyModel.P_RELATION_FK_MAPPING)) { // マッピングが編集された時
// updateFigure(getFigure());
// }
- } else {
+// } else {
// if (evt.getField().equals(DatabaseModel.P_DB_DOMAINS)) {
- updateFigure(getFigure());
+// updateFigure(getFigure());
// } else if (evt.getField().equals(DatabaseModel.P_DB_DISPLAY_MODE)) {
// updateFigure(getFigure());
// } else if (evt.getField().equals(DatabaseModel.P_DB_RDBMS)) { // データベースが変更された時
// // 既存カラムの型を新しいデータベースの型に変更する。
// updateFigure(getFigure());
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
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-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -32,7 +32,6 @@
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
import org.jiemamy.eclipse.editor.figure.ViewFigure;
import org.jiemamy.eclipse.utils.ConvertUtil;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
@@ -56,23 +55,23 @@
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
-
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+//
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(ViewModel.P_NODE_ENTITY_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// } else if (evt.getField().equals(ViewModel.P_NODE_BG_COLOR)) {
- updateFigure(getFigure());
+// updateFigure(getFigure());
// } else if (evt.getField().equals(ViewModel.P_ENTITY_VIEW_DEFINITION)) {
// refreshVisuals();
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -18,11 +18,7 @@
*/
package org.jiemamy.eclipse.editor.editpart.outlinetree;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.Observable;
-import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.entity.EntityModel;
-import org.jiemamy.model.node.NodeAdapter;
/**
* {@link EntityModel}に対するTree用EditPart（コントローラ）の抽象クラス。
@@ -37,19 +33,19 @@
public void activate() {
super.activate();
- // 自モデルの監視
- EntityModel entity = (EntityModel) getModel();
- entity.getAdapter(Observable.class).addModelChangeListener(this);
-
- // 自モデル発の関連監視
- for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getSourceConnections()) {
- connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- }
-
- // 自モデル着の関連監視
- for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getTargetConnections()) {
- connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
- }
+// // 自モデルの監視
+// EntityModel entity = (EntityModel) getModel();
+// entity.getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // 自モデル発の関連監視
+// for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getSourceConnections()) {
+// connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// }
+//
+// // 自モデル着の関連監視
+// for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getTargetConnections()) {
+// connection.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// }
}
/**
@@ -57,30 +53,30 @@
*/
@Override
public void deactivate() {
- EntityModel entity = (EntityModel) getModel();
- for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getTargetConnections()) {
- connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- }
- for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getSourceConnections()) {
- connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- }
- entity.getAdapter(Observable.class).removeModelChangeListener(this);
+// EntityModel entity = (EntityModel) getModel();
+// for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getTargetConnections()) {
+// connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// }
+// for (ConnectionAdapter connection : entity.getAdapter(NodeAdapter.class).getSourceConnections()) {
+// connection.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// }
+// entity.getAdapter(Observable.class).removeModelChangeListener(this);
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(AbstractEntityModel.P_NODE_ENTITY_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// } else if (evt.getPropertyName().equals(AbstractEntityModel.P_NODE_ENTITY_LOGICAL_NAME)) {
// refreshVisuals();
// }
- }
- }
+// }
+// }
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -20,17 +20,11 @@
import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.jiemamy.event.ModelChangeEvent;
-import org.jiemamy.event.ModelChangeListener;
-import org.jiemamy.event.Observable;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.utils.Adaptable;
-
/**
* モデルに対するTree用EditPart（コントローラ）の抽象クラス。
* @author daisuke
*/
-public abstract class AbstractModelTreeEditPart extends AbstractTreeEditPart implements ModelChangeListener {
+public abstract class AbstractModelTreeEditPart extends AbstractTreeEditPart /*implements ModelChangeListener*/{
/**
* {@inheritDoc}
@@ -39,13 +33,13 @@
public void activate() {
super.activate();
- RootModel rootModel = (RootModel) getRoot().getContents().getModel();
- rootModel.getAdapter(Observable.class).addModelChangeListener(this);
-
- if (getModel() instanceof Adaptable) {
- Adaptable adaptable = (Adaptable) getModel();
- adaptable.getAdapter(Observable.class).addModelChangeListener(this);
- }
+// RootModel rootModel = (RootModel) getRoot().getContents().getModel();
+// rootModel.getAdapter(Observable.class).addModelChangeListener(this);
+//
+// if (getModel() instanceof Adaptable) {
+// Adaptable adaptable = (Adaptable) getModel();
+// adaptable.getAdapter(Observable.class).addModelChangeListener(this);
+// }
}
/**
@@ -53,21 +47,21 @@
*/
@Override
public void deactivate() {
- if (getModel() instanceof Adaptable) {
- Adaptable adaptable = (Adaptable) getModel();
- adaptable.getAdapter(Observable.class).removeModelChangeListener(this);
- }
+// if (getModel() instanceof Adaptable) {
+// Adaptable adaptable = (Adaptable) getModel();
+// adaptable.getAdapter(Observable.class).removeModelChangeListener(this);
+// }
+//
+// RootModel rootModel = (RootModel) getRoot().getContents().getModel();
+// rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
- RootModel rootModel = (RootModel) getRoot().getContents().getModel();
- rootModel.getAdapter(Observable.class).removeModelChangeListener(this);
-
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
- public void modelChanged(ModelChangeEvent evt) {
- // nothing to do
- }
+// /**
+// * {@inheritDoc}
+// */
+// public void modelChanged(ModelChangeEvent evt) {
+// // nothing to do
+// }
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -18,7 +18,6 @@
*/
package org.jiemamy.eclipse.editor.editpart.outlinetree;
-import org.jiemamy.event.Observable;
import org.jiemamy.model.connection.ConnectionAdapter;
/**
@@ -36,14 +35,14 @@
ConnectionAdapter model = (ConnectionAdapter) getModel();
- // 自モデルの監視
- model.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
-
- // ソースエンティティの監視
- model.getSource().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
-
- // ターゲットエンティティの監視
- model.getTarget().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+// // 自モデルの監視
+// model.unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // ソースエンティティの監視
+// model.getSource().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
+//
+// // ターゲットエンティティの監視
+// model.getTarget().unwrap().getAdapter(Observable.class).addModelChangeListener(this);
}
/**
@@ -51,10 +50,10 @@
*/
@Override
public void deactivate() {
- ConnectionAdapter model = (ConnectionAdapter) getModel();
- model.getTarget().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- model.getSource().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
- model.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// ConnectionAdapter model = (ConnectionAdapter) getModel();
+// model.getTarget().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// model.getSource().unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
+// model.unwrap().getAdapter(Observable.class).removeModelChangeListener(this);
super.deactivate();
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -23,7 +23,6 @@
import org.jiemamy.ReferenceResolver;
import org.jiemamy.eclipse.Images;
import org.jiemamy.eclipse.JiemamyPlugin;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.exception.TooManyElementsException;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.constraint.ForeignKeyModel;
@@ -39,20 +38,20 @@
*/
public class RelationTreeEditPart extends AbstractRelationTreeEditPart {
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(ForeignKeyModel.P_RELATION_FK_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// }
// } else if (evt.getField().equals(AbstractEntityModel.P_NODE_ENTITY_NAME)) {
// refreshVisuals();
// }
- }
+// }
/**
* {@inheritDoc}
@@ -76,8 +75,8 @@
sb.append(fkModel.getName()).append(" (").append(
((EntityModel) fkModel.getAdapter(ConnectionAdapter.class).getSource()).getName()).append(
" => ").append(
- ((EntityModel) fkModel.getAdapter(ConnectionAdapter.class).getTarget()).getName())
- .append(")");
+ ((EntityModel) fkModel.getAdapter(ConnectionAdapter.class).getTarget()).getName()).append(
+ ")");
} else if (fkModel.getAdapter(ConnectionAdapter.class).isSelfConnection()) {
ColumnModel fkColumn = resolver.resolve(fkModel.getKeyColumns().get(0));
ColumnModel keyColumn = resolver.resolve(fkModel.getReferenceColumns().get(0));
@@ -88,8 +87,8 @@
ColumnModel keyColumn = resolver.resolve(fkModel.getReferenceColumns().get(0));
sb.append(fkModel.getName()).append(" (").append(fkColumn.getName()).append(" => ").append(
keyColumn.getName()).append("@").append(
- ((EntityModel) fkModel.getAdapter(ConnectionAdapter.class).getTarget()).getName())
- .append(")");
+ ((EntityModel) fkModel.getAdapter(ConnectionAdapter.class).getTarget()).getName()).append(
+ ")");
}
} catch (TooManyElementsException e) {
sb.append("too many PKs");
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -23,7 +23,6 @@
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.ModelContainer;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
@@ -39,18 +38,18 @@
*/
public class RootTreeEditPart extends AbstractModelTreeEditPart {
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
// if (evt.getField().equals(DatabaseModel.P_DB_ENTITIES)) {
// refreshChildren();
// } else if (evt.getField().equals(DatabaseModel.P_DB_DOMAINS)) {
- refreshChildren();
+// refreshChildren();
// }
- }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -32,7 +32,6 @@
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.node.NodeAdapter;
@@ -51,22 +50,22 @@
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
- if (evt.getSource().equals(getModel())) {
+// /**
+// * {@inheritDoc}
+// */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(TableModel.P_NODE_ENTITY_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// } else if (evt.getField().equals(TableModel.P_NODE_ENTITY_LOGICAL_NAME)) {
// refreshVisuals();
// } else if (evt.getField().equals(TableModel.P_ENTITY_TABLE_COLUMNS)) {
- refreshChildren();
+// refreshChildren();
// }
- }
- }
+// }
+// }
/**
* {@inheritDoc}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -24,7 +24,6 @@
import org.jiemamy.eclipse.Images;
import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.RootModel;
/**
@@ -34,12 +33,12 @@
public class TypeDefTreeEditPart extends AbstractModelTreeEditPart {
/**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
- if (evt.getSource().equals(getModel())) {
+ // * {@inheritDoc}
+ // */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
+// if (evt.getSource().equals(getModel())) {
// if (evt.getField().equals(DefinitionModel.P_DEF_NAME)) {
// refreshVisuals();
// } else if (evt.getField().equals(DefinitionModel.P_DEF_LOGICAL_NAME)) {
@@ -47,11 +46,10 @@
// } else if (evt.getField().equals(DefinitionModel.P_DEF_TYPE)) {
// refreshVisuals();
// } else if (evt.getField().equals(DefinitionModel.P_DEF_SIZE)) {
- refreshVisuals();
+// refreshVisuals();
// }
- }
- }
-
+// }
+// }
/**
* {@inheritDoc}
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-02-07 14:17:53 UTC (rev 2627)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-02-07 14:18:16 UTC (rev 2628)
@@ -29,7 +29,6 @@
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
-import org.jiemamy.event.ModelChangeEvent;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.ViewModel;
import org.jiemamy.utils.ProcessorUtil;
@@ -49,18 +48,17 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public void modelChanged(ModelChangeEvent evt) {
- super.modelChanged(evt);
+ // * {@inheritDoc}
+ // */
+// @Override
+// public void modelChanged(ModelChangeEvent evt) {
+// super.modelChanged(evt);
// if (evt.getField().equals(ViewModel.P_NODE_ENTITY_NAME)) {
// refreshVisuals();
// } else if (evt.getField().equals(ViewModel.P_NODE_ENTITY_LOGICAL_NAME)) {
- refreshVisuals();
+// refreshVisuals();
// }
- }
-
+// }
/**
* {@inheritDoc}
*/
Modified: zeus/trunk/jiemamy-specs/pom.xml
===================================================================
--- zeus/trunk/jiemamy-specs/pom.xml 2009-02-07 14:17:53 UTC (rev 2627)
+++ zeus/trunk/jiemamy-specs/pom.xml 2009-02-07 14:18:16 UTC (rev 2628)
@@ -78,7 +78,6 @@
</scm>
<modules>
<module>../jiemamy-spec-core</module>
- <module>../jiemamy-spec-event</module>
<module>../jiemamy-spec-view</module>
<module>../jiemamy-spec-diff</module>
</modules>