svnno****@sourc*****
svnno****@sourc*****
2009年 3月 10日 (火) 23:55:02 JST
Revision: 2868
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2868
Author: daisuke_m
Date: 2009-03-10 23:55:02 +0900 (Tue, 10 Mar 2009)
Log Message:
-----------
テストコケてた。ミス修正。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckConstraintImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckConstraintImpl.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java
Added Paths:
-----------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractCheckConstraint.java
-------------- next part --------------
Added: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractCheckConstraint.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractCheckConstraint.java (rev 0)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractCheckConstraint.java 2009-03-10 14:55:02 UTC (rev 2868)
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/03/10
+ *
+ * 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.attribute.constraint;
+
+import java.util.UUID;
+
+import org.jiemamy.Jiemamy;
+
+/**
+ * TODO for daisuke
+ *
+ * @since 0.2
+ * @author daisuke
+ */
+public abstract class AbstractCheckConstraint extends AbstractConstraintModel implements CheckConstraint {
+
+ /** CHEKC制約定義式 */
+ private String expression;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param jiemamy コンテキスト
+ * @param id モデルID
+ * @throws IllegalArgumentException 引数に{@code null}を与えた場合
+ */
+ public AbstractCheckConstraint(Jiemamy jiemamy, UUID id) {
+ super(jiemamy, id);
+ }
+
+ public String getExpression() {
+ return expression;
+ }
+
+ public void setExpression(String expression) {
+ this.expression = expression;
+ }
+
+ @Override
+ public String toString() {
+ return super.toString() + "[" + expression + "]";
+ }
+}
Property changes on: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractCheckConstraint.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckConstraintImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckConstraintImpl.java 2009-03-10 14:42:11 UTC (rev 2867)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckConstraintImpl.java 2009-03-10 14:55:02 UTC (rev 2868)
@@ -27,12 +27,8 @@
*
* @author daisuke
*/
-public class ColumnCheckConstraintImpl extends AbstractConstraintModel implements ColumnCheckConstraint {
+public class ColumnCheckConstraintImpl extends AbstractCheckConstraint implements ColumnCheckConstraint {
- /** CHEKC制約定義式 */
- private String expression;
-
-
/**
* インスタンスを生成する。
*
@@ -43,17 +39,4 @@
public ColumnCheckConstraintImpl(Jiemamy jiemamy, UUID id) {
super(jiemamy, id);
}
-
- public String getExpression() {
- return expression;
- }
-
- public void setExpression(String expression) {
- this.expression = expression;
- }
-
- @Override
- public String toString() {
- return super.toString() + "[" + expression + "]";
- }
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckConstraintImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckConstraintImpl.java 2009-03-10 14:42:11 UTC (rev 2867)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckConstraintImpl.java 2009-03-10 14:55:02 UTC (rev 2868)
@@ -27,7 +27,7 @@
*
* @author daisuke
*/
-public class TableCheckConstraintImpl extends AbstractConstraintModel implements TableCheckConstraint {
+public class TableCheckConstraintImpl extends AbstractCheckConstraint implements TableCheckConstraint {
/** CHEKC制約定義式 */
private String expression;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java 2009-03-10 14:42:11 UTC (rev 2867)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java 2009-03-10 14:55:02 UTC (rev 2868)
@@ -22,6 +22,7 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.AttributeModel;
import org.jiemamy.model.attribute.ColumnModel;
+import org.jiemamy.model.attribute.constraint.CheckConstraint;
import org.jiemamy.model.attribute.constraint.ColumnCheckConstraint;
import org.jiemamy.model.attribute.constraint.ConstraintModel;
import org.jiemamy.model.attribute.constraint.Deferrability;
@@ -78,17 +79,17 @@
description
}
-// /**
-// * {@link CheckConstraint}のプロパティを表す列挙型。
-// *
-// * @author daisuke
-// */
-// @TargetModel(CheckConstraint.class)
-// public enum CheckConstraint implements JiemamyProperty {
-//
-// /** {@link CheckConstraint#getExpression()}で取得できるプロパティ */
-// expression
-// }
+ /**
+ * {@link CheckConstraint}のプロパティを表す列挙型。
+ *
+ * @author daisuke
+ */
+ @TargetModel(CheckConstraint.class)
+ public enum CheckConstraintProperty implements JiemamyProperty<CheckConstraint> {
+
+ /** {@link CheckConstraint#getExpression()}で取得できるプロパティ */
+ expression
+ }
/**
* {@link ColumnCheckConstraint}のプロパティを表す列挙型。