svnno****@sourc*****
svnno****@sourc*****
2009年 3月 1日 (日) 17:59:31 JST
Revision: 2752
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2752
Author: daisuke_m
Date: 2009-03-01 17:59:31 +0900 (Sun, 01 Mar 2009)
Log Message:
-----------
J-viewの*ProfileImplを org.jiemamy.modelパケに移動。 /
JiemamyViewPropertyをちょいと修正。 /
J-eclipseの不要コード削除。 /
MySqlDialectのオプションUIでStorageEngineアダプタが登録されていないモデルを扱うとエラーを起こす件に対処。
Modified Paths:
--------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java
vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java
Added Paths:
-----------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java
Removed Paths:
-------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ConnectionProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java
-------------- next part --------------
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ConnectionProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ConnectionProfileImpl.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ConnectionProfileImpl.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -1,75 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/28
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy;
-
-import java.util.List;
-import java.util.UUID;
-
-import org.jiemamy.model.AbstractJiemamyElement;
-import org.jiemamy.model.ConnectionProfile;
-import org.jiemamy.model.geometory.JmColor;
-import org.jiemamy.model.geometory.JmPoint;
-import org.jiemamy.utils.ValidateUtil;
-
-/**
- * TODO for daisuke
- *
- * @author daisuke
- */
-public class ConnectionProfileImpl extends AbstractJiemamyElement implements ConnectionProfile {
-
- /** コネクションの色情報 */
- private JmColor color;
-
- /** コネクションのレイアウト情報 */
- private List<JmPoint> bendpoints;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param jiemamy
- * @param id
- */
- public ConnectionProfileImpl(Jiemamy jiemamy, UUID id) {
- super(jiemamy, id);
- }
-
- public List<JmPoint> getBendpoints() {
- return bendpoints;
- }
-
- public JmColor getColor() {
- return color;
- }
-
- /**
- * TODO for daisuke
- *
- * @param bendpoints
- */
- public void setBendpoints(List<JmPoint> bendpoints) {
- ValidateUtil.injectionSetter(this.bendpoints);
- this.bendpoints = bendpoints;
- }
-
- public void setColor(JmColor color) {
- this.color = color;
- }
-}
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -1,68 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/04
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy;
-
-import java.util.UUID;
-
-import org.jiemamy.model.AbstractJiemamyElement;
-import org.jiemamy.model.NodeProfile;
-import org.jiemamy.model.geometory.JmColor;
-import org.jiemamy.model.geometory.JmRectangle;
-
-/**
- * TODO for daisuke
- *
- * @author daisuke
- */
-public class NodeProfileImpl extends AbstractJiemamyElement implements NodeProfile {
-
- /** ノードの色情報 */
- private JmColor color;
-
- /** ノードのレイアウト情報 */
- private JmRectangle boundary;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param jiemamy
- * @param id
- */
- public NodeProfileImpl(Jiemamy jiemamy, UUID id) {
- super(jiemamy, id);
- }
-
- public JmRectangle getBoundary() {
- return boundary;
- }
-
- public JmColor getColor() {
- return color;
- }
-
- public void setBoundary(JmRectangle boundary) {
- this.boundary = boundary;
- }
-
- public void setColor(JmColor color) {
- this.color = color;
- }
-
-}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -21,10 +21,12 @@
import java.util.UUID;
import org.jiemamy.model.ConnectionProfile;
+import org.jiemamy.model.ConnectionProfileImpl;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentationModelImpl;
import org.jiemamy.model.DiagramPresentationsImpl;
import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.NodeProfileImpl;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.constraint.ForeignKeyModel;
import org.jiemamy.model.connection.ConnectionAdapter;
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java (from rev 2751, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ConnectionProfileImpl.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/28
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.jiemamy.Jiemamy;
+import org.jiemamy.model.AbstractJiemamyElement;
+import org.jiemamy.model.ConnectionProfile;
+import org.jiemamy.model.geometory.JmColor;
+import org.jiemamy.model.geometory.JmPoint;
+import org.jiemamy.utils.ValidateUtil;
+
+/**
+ * TODO for daisuke
+ *
+ * @author daisuke
+ */
+public class ConnectionProfileImpl extends AbstractJiemamyElement implements ConnectionProfile {
+
+ /** コネクションの色情報 */
+ private JmColor color;
+
+ /** コネクションのレイアウト情報 */
+ private List<JmPoint> bendpoints;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param jiemamy
+ * @param id
+ */
+ public ConnectionProfileImpl(Jiemamy jiemamy, UUID id) {
+ super(jiemamy, id);
+ }
+
+ public List<JmPoint> getBendpoints() {
+ return bendpoints;
+ }
+
+ public JmColor getColor() {
+ return color;
+ }
+
+ /**
+ * TODO for daisuke
+ *
+ * @param bendpoints
+ */
+ public void setBendpoints(List<JmPoint> bendpoints) {
+ ValidateUtil.injectionSetter(this.bendpoints);
+ this.bendpoints = bendpoints;
+ }
+
+ public void setColor(JmColor color) {
+ this.color = color;
+ }
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java (from rev 2751, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/04
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.model;
+
+import java.util.UUID;
+
+import org.jiemamy.Jiemamy;
+import org.jiemamy.model.AbstractJiemamyElement;
+import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.geometory.JmColor;
+import org.jiemamy.model.geometory.JmRectangle;
+
+/**
+ * TODO for daisuke
+ *
+ * @author daisuke
+ */
+public class NodeProfileImpl extends AbstractJiemamyElement implements NodeProfile {
+
+ /** ノードの色情報 */
+ private JmColor color;
+
+ /** ノードのレイアウト情報 */
+ private JmRectangle boundary;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param jiemamy
+ * @param id
+ */
+ public NodeProfileImpl(Jiemamy jiemamy, UUID id) {
+ super(jiemamy, id);
+ }
+
+ public JmRectangle getBoundary() {
+ return boundary;
+ }
+
+ public JmColor getColor() {
+ return color;
+ }
+
+ public void setBoundary(JmRectangle boundary) {
+ this.boundary = boundary;
+ }
+
+ public void setColor(JmColor color) {
+ this.color = color;
+ }
+
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -93,11 +93,6 @@
logger.debug("deactivate");
}
- public void doubleClicked() {
-// logger.info(LogMarker.LIFECYCLE, "doubleClicked");
-// openEditDialog();
- }
-
@Override
public NodeAdapter getModel() {
return (NodeAdapter) super.getModel();
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -28,6 +28,7 @@
import org.jiemamy.dialect.mysql.adapter.StandardEngine;
import org.jiemamy.dialect.mysql.adapter.StorageEngine;
+import org.jiemamy.dialect.mysql.adapter.StorageEngineImpl;
import org.jiemamy.dialect.mysql.adapter.StorageEngineType;
import org.jiemamy.eclipse.ui.tab.AbstractTab;
import org.jiemamy.model.entity.TableModel;
@@ -68,6 +69,10 @@
cmbEngine.add(type.toString());
}
+ if (tableModel.hasAdapter(StorageEngine.class) == false) {
+ tableModel.registerAdapter(new StorageEngineImpl());
+ }
+
StorageEngine storageEngine = tableModel.getAdapter(StorageEngine.class);
if (storageEngine != null && storageEngine.getType() != null) {
StorageEngineType type = storageEngine.getType();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java 2009-03-01 08:38:28 UTC (rev 2751)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java 2009-03-01 08:59:31 UTC (rev 2752)
@@ -20,14 +20,16 @@
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
+import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.NodeProfile;
/**
* j-view内の各モデルの「概念的な」（実装としては強要しない）プロパティを表す列挙型を集約したクラス。
*
+ * @param <T>
* @author shin1ogawa
*/
-public class JiemamyViewProperty {
+public interface JiemamyViewProperty<T extends JiemamyElement> extends JiemamyProperty<T> {
/**
* {@link ConnectionProfile}のプロパティを表す列挙型。
@@ -35,7 +37,7 @@
* @author shin1ogawa
*/
@TargetModel(ConnectionProfile.class)
- public enum ConnectionProfileProperty implements JiemamyProperty<ConnectionProfile> {
+ public enum ConnectionProfileProperty implements JiemamyViewProperty<ConnectionProfile> {
/** {@link ConnectionProfile#getBendpoints()}で取得できるプロパティ */
bendpoints,
@@ -49,7 +51,7 @@
* @author shin1ogawa
*/
@TargetModel(DiagramPresentationModel.class)
- public enum DiagramPresentationModelProperty implements JiemamyProperty<DiagramPresentationModel> {
+ public enum DiagramPresentationModelProperty implements JiemamyViewProperty<DiagramPresentationModel> {
/** {@link DiagramPresentationModel#getConnectionProfiles()}で取得できるプロパティ */
connectionProfiels,
@@ -72,7 +74,7 @@
* @author shin1ogawa
*/
@TargetModel(NodeProfile.class)
- public enum NodeProfileProperty implements JiemamyProperty<NodeProfile> {
+ public enum NodeProfileProperty implements JiemamyViewProperty<NodeProfile> {
/** {@link NodeProfile#getBoundary()}で取得できるプロパティ */
boundary,