svnno****@sourc*****
svnno****@sourc*****
2009年 3月 17日 (火) 23:34:22 JST
Revision: 2897
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2897
Author: daisuke_m
Date: 2009-03-17 23:34:22 +0900 (Tue, 17 Mar 2009)
Log Message:
-----------
テストコケ対策、その他。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/dialect/DefaultSqlEmitterTest.java
artemis/trunk/jiemamy-dialect-mysql/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java
vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
vesta/trunk/org.jiemamy.eclipse.ui/src/main/resources/org/jiemamy/eclipse/action/messages_ja.properties
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/dialect/DefaultSqlEmitterTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/dialect/DefaultSqlEmitterTest.java 2009-03-17 12:36:50 UTC (rev 2896)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/dialect/DefaultSqlEmitterTest.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -79,9 +79,22 @@
*/
@Test
public void test01_正常にSQLが出力されること() throws Exception {
- List<SqlStatement> statements = sqlEmitter.emit(jiemamy.getFactory().getRootModel(), null);
+ List<SqlStatement> statements = sqlEmitter.emit(jiemamy.getFactory().getRootModel(), new MockEmitConfig());
for (SqlStatement sqlStatement : statements) {
logger.info(sqlStatement.toString());
}
}
+
+
+ private static class MockEmitConfig implements EmitConfig {
+
+ public boolean emitDropStatements() {
+ return false;
+ }
+
+ public int getDataSetIndex() {
+ return -1;
+ }
+
+ }
}
Modified: artemis/trunk/jiemamy-dialect-mysql/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java 2009-03-17 12:36:50 UTC (rev 2896)
+++ artemis/trunk/jiemamy-dialect-mysql/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -29,6 +29,7 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.dialect.DefaultDataTypeResolver;
import org.jiemamy.dialect.Dialect;
+import org.jiemamy.dialect.EmitConfig;
import org.jiemamy.dialect.SqlEmitter;
import org.jiemamy.dialect.mysql.adapter.StandardEngine;
import org.jiemamy.dialect.mysql.adapter.StorageEngine;
@@ -88,9 +89,23 @@
*/
@Test
public void test01_正常にSQLが出力されること() throws Exception {
- List<SqlStatement> statements = sqlEmitter.emit(jiemamy.getFactory().getRootModel(), null);
+ List<SqlStatement> statements = sqlEmitter.emit(jiemamy.getFactory().getRootModel(), new MockEmitConfig());
for (SqlStatement sqlStatement : statements) {
logger.info(sqlStatement.toString());
}
}
+
+
+ private static class MockEmitConfig implements EmitConfig {
+
+ public boolean emitDropStatements() {
+ return false;
+ }
+
+ public int getDataSetIndex() {
+ return -1;
+ }
+
+ }
+
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java 2009-03-17 12:36:50 UTC (rev 2896)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -26,6 +26,7 @@
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.ColumnRef;
import org.jiemamy.model.attribute.constraint.ForeignKey;
+import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.model.AttributeUtil;
@@ -57,7 +58,11 @@
}
ColumnRef columnRef = keyColumns.get(0);
ColumnModel columnModel = columnRef.getJiemamy().getReferenceResolver().resolve(columnRef);
- return AttributeUtil.getDefinedTable(columnModel).getAdapter(NodeAdapter.class);
+ TableModel definedTable = AttributeUtil.getDefinedTable(columnModel);
+ if (definedTable == null) {
+ return null;
+ }
+ return definedTable.getAdapter(NodeAdapter.class);
}
public NodeAdapter getTarget() {
@@ -67,7 +72,11 @@
}
ColumnRef columnRef = referenceColumns.get(0);
ColumnModel columnModel = columnRef.getJiemamy().getReferenceResolver().resolve(columnRef);
- return AttributeUtil.getDefinedTable(columnModel).getAdapter(NodeAdapter.class);
+ TableModel definedTable = AttributeUtil.getDefinedTable(columnModel);
+ if (definedTable == null) {
+ return null;
+ }
+ return definedTable.getAdapter(NodeAdapter.class);
}
public boolean isSelfConnection() {
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-03-17 12:36:50 UTC (rev 2896)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -167,7 +167,7 @@
stickyProfile.setColor(new JmColor(10, 11, 12));
ConnectionProfile connectionProfile1 =
- factory.newModel(ConnectionProfile.class, uuid.get("66b547f-a2a6-42b2-a3a4-38745436c425"));
+ factory.newModel(ConnectionProfile.class, uuid.get("366b547f-a2a6-42b2-a3a4-38745436c425"));
List<JmPoint> bendpoints = connectionProfile1.getBendpoints();
NodeProfile nodeProf = presentation1.getNodeProfiles().get(tableEmp.getAdapter(NodeAdapter.class));
JmRectangle boundary = nodeProf.getBoundary();
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-17 12:36:50 UTC (rev 2896)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.mysql/src/main/java/org/jiemamy/eclipse/dialect/mysql/TableEditDialogOptionTab.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.eclipse.dialect.mysql;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -91,8 +92,10 @@
public void okPressed() {
super.okPressed();
- StandardEngine type = StandardEngine.valueOf(cmbEngine.getText());
- tableModel.getAdapter(StorageEngine.class).setType(type);
+ if (StringUtils.isEmpty(cmbEngine.getText()) == false) {
+ StandardEngine type = StandardEngine.valueOf(cmbEngine.getText());
+ tableModel.getAdapter(StorageEngine.class).setType(type);
+ }
}
}
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-03-17 12:36:50 UTC (rev 2896)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-03-17 14:34:22 UTC (rev 2897)
@@ -177,7 +177,11 @@
}
KeyConstraint referenceKeyConstraint = ForeignKeyUtil.getReferenceKeyConstraint(foreignKey);
- cmbReferenceKey.setText(KeyConstraintUtil.toStringKeyColumns(referenceKeyConstraint));
+ if (referenceKeyConstraint == null) {
+ cmbReferenceKey.setText(cmbReferenceKey.getItem(0));
+ } else {
+ cmbReferenceKey.setText(KeyConstraintUtil.toStringKeyColumns(referenceKeyConstraint));
+ }
assert composite != null;
createMappingControls(composite);
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/resources/org/jiemamy/eclipse/action/messages_ja.properties
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/resources/org/jiemamy/eclipse/action/messages_ja.properties 2009-03-17 12:36:50 UTC (rev 2896)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/resources/org/jiemamy/eclipse/action/messages_ja.properties 2009-03-17 14:34:22 UTC (rev 2897)
@@ -15,7 +15,7 @@
###############################################################################
AutoLayoutAction_name = \u81ea\u52d5\u30ec\u30a4\u30a2\u30a6\u30c8(&L)
ChangeNodeBgcolorAction_name = \u8272\u306e\u5909\u66f4(&C)
-FitNodeConstraintAction_name = \u30b5\u30a4\u30ba\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u623b\u3059(&S)
+FitNodeConstraintAction_name = \u30b5\u30a4\u30ba\u3092\u81ea\u52d5\u8abf\u6574(&S)
PropertyAction_name = \u30d7\u30ed\u30d1\u30c6\u30a3(&P)
SaveDiagramImageAction_name = \u753b\u50cf\u3068\u3057\u3066\u4fdd\u5b58(&G)