svnno****@sourc*****
svnno****@sourc*****
2009年 3月 29日 (日) 13:43:49 JST
Revision: 3020
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3020
Author: shin1
Date: 2009-03-29 13:43:49 +0900 (Sun, 29 Mar 2009)
Log Message:
-----------
[ECL-32]無効チェックボックス、主キーチェックボックスの動作を整理した。
Modified Paths:
--------------
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
-------------- next part --------------
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-29 03:54:56 UTC (rev 3019)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-29 04:43:49 UTC (rev 3020)
@@ -887,8 +887,10 @@
} catch (ElementNotFoundException e) {
// ignore
}
- if (chkIsPK.getSelection() == false && primaryKey != null) {
- jiemamyFacade.removeKeyColumn(primaryKey, columnModel);
+ if (chkIsPK.getSelection() == false) {
+ if (primaryKey != null) {
+ jiemamyFacade.removeKeyColumn(primaryKey, columnModel);
+ }
} else {
if (primaryKey == null) {
primaryKey = factory.newModel(PrimaryKey.class);
@@ -913,8 +915,10 @@
jiemamyFacade.changeModelProperty(checkConstraint, CheckConstraintProperty.expression, expression);
}
- if (chkIsDisabled.getSelection() == false && columnModel.hasAdapter(Disablable.class)) {
- columnModel.unregisterAdapter(Disablable.class);
+ if (chkIsDisabled.getSelection() == false) {
+ if (columnModel.hasAdapter(Disablable.class)) {
+ columnModel.unregisterAdapter(Disablable.class);
+ }
} else {
if (columnModel.hasAdapter(Disablable.class) == false) {
columnModel.registerAdapter(factory.newAdapter(Disablable.class));