svnno****@sourc*****
svnno****@sourc*****
2009年 3月 19日 (木) 02:31:33 JST
Revision: 2913
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2913
Author: daisuke_m
Date: 2009-03-19 02:31:33 +0900 (Thu, 19 Mar 2009)
Log Message:
-----------
テーブル・カラムタブに合わせて、Root・ドメインタブを整備。
Modified Paths:
--------------
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
-------------- next part --------------
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-03-18 17:28:15 UTC (rev 2912)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-03-18 17:31:33 UTC (rev 2913)
@@ -516,8 +516,13 @@
txtDescription.setText(StringUtils.defaultIfEmpty(domainModel.getDescription(), "")); // TODO use care
chkIsNotNull.setSelection(domainModel.getNotNullConstraint() != null);
CheckConstraint checkConstraint = domainModel.getCheckConstraint();
- txtCheckName.setText(StringUtils.defaultIfEmpty(checkConstraint.getName(), ""));
- txtCheckExpression.setText(checkConstraint.getExpression());
+ if (checkConstraint == null) {
+ txtCheckName.setText(StringUtils.EMPTY);
+ txtCheckExpression.setText(StringUtils.EMPTY);
+ } else {
+ txtCheckName.setText(StringUtils.defaultIfEmpty(checkConstraint.getName(), ""));
+ txtCheckExpression.setText(checkConstraint.getExpression());
+ }
cmbDataType.setText(dataType.getTypeName());
if (dataType.hasAdapter(SizedDataTypeAdapter.class)) {
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-18 17:28:15 UTC (rev 2912)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-18 17:31:33 UTC (rev 2913)
@@ -638,7 +638,7 @@
chkIsPK.setEnabled(true);
chkIsNotNull.setEnabled(true);
// chkIsRepresentation.setEnabled(true);
-
+
DataType dataType = columnModel.getDataType();
if (dataType instanceof BuiltinDataType) {
List<Object> adapters = ((BuiltinDataType) dataType).getAdapters();
@@ -655,13 +655,13 @@
txtColumnName.setText(columnModel.getName());
txtColumnLogicalName.setText(StringUtils.defaultIfEmpty(columnModel.getLogicalName(), "")); // TODO use care
- ColumnCheckConstraint columnCheckModel = columnModel.getCheckConstraint();
- if (columnCheckModel == null) {
+ ColumnCheckConstraint columnCheckConstraint = columnModel.getCheckConstraint();
+ if (columnCheckConstraint == null) {
txtCheckName.setText(StringUtils.EMPTY);
txtCheckExpression.setText(StringUtils.EMPTY);
} else {
- txtCheckName.setText(StringUtils.defaultIfEmpty(columnCheckModel.getName(), ""));
- txtCheckExpression.setText(StringUtils.defaultIfEmpty(columnCheckModel.getExpression(), ""));
+ txtCheckName.setText(StringUtils.defaultIfEmpty(columnCheckConstraint.getName(), ""));
+ txtCheckExpression.setText(StringUtils.defaultIfEmpty(columnCheckConstraint.getExpression(), ""));
}
chkIsNotNull.setSelection(columnModel.getNotNullConstraint() != null);