svnno****@sourc*****
svnno****@sourc*****
2008年 12月 31日 (水) 17:44:45 JST
Revision: 2338
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2338
Author: daisuke_m
Date: 2008-12-31 17:44:44 +0900 (Wed, 31 Dec 2008)
Log Message:
-----------
javadoc追加。 / refactor
Modified Paths:
--------------
artemis/trunk/org.jiemamy.artemis.test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/ArtemisExtender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/JiemamyFactoryImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/command/AttributeIterator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AdapterManager.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/AppropriativeChildOf.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/RootModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/TableModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/BuiltinDataTypeBuilder.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java
artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/AdditionalSpec.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/JiemamyFactory.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/OfficialSpecs.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java
Added Paths:
-----------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediatorImpl.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediatorImpl.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.artemis.test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java
===================================================================
--- artemis/trunk/org.jiemamy.artemis.test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.artemis.test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -42,7 +42,7 @@
import org.jiemamy.utils.builder.ViewBuilder;
/**
- * TODO for daisuke
+ * モデル整合性のテスト。
* @author daisuke
*/
public class ModelConsistenceTest {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/ArtemisExtender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/ArtemisExtender.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/ArtemisExtender.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -35,8 +35,8 @@
void extendContainer(S2Container container);
/**
- * TODO for daisuke
- * @return
+ * この拡張が実装する「追加仕様」の{@link Set}を取得する。
+ * @return この拡張が実装する「追加仕様」の{@link Set}
*/
Set<? extends AdditionalSpec> getSpecs();
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/JiemamyFactoryImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/JiemamyFactoryImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/JiemamyFactoryImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -25,7 +25,7 @@
import org.jiemamy.utils.Identifiable;
/**
- * TODO for daisuke
+ * {@link JiemamyFactory}のArtemis実装。
* @author daisuke
*/
public class JiemamyFactoryImpl implements JiemamyFactory {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/command/AttributeIterator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/command/AttributeIterator.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/command/AttributeIterator.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -26,12 +26,12 @@
import javax.xml.stream.events.Attribute;
/**
- * TODO for daisuke
+ * XML属性のイテレータ実装。
* @author daisuke
*/
class AttributeIterator implements Iterator<Attribute> {
- /** TODO for daisuke */
+ /** XML属性の完全修飾名と値を保持する{@link Map.Entry}のイテレータ */
private Iterator<Entry<QName, String>> mapIter;
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediator.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediator.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/12/31
- *
- * 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.internal;
-
-import org.jiemamy.model.AppropriativeChildOf;
-
-/**
- * TODO for daisuke
- * @author daisuke
- */
-public interface AccessionMediator {
-
- /**
- * TODO for daisuke
- * @param <T>
- * @param child
- * @param parent
- */
- <T>void append(AppropriativeChildOf<T> child, T parent);
-
- /**
- * TODO for daisuke
- * @param <T>
- * @param child
- * @param parent
- */
- <T>void remove(AppropriativeChildOf<T> child, T parent);
-
-}
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediatorImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediatorImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediatorImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -1,49 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/12/31
- *
- * 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.internal;
-
-import org.jiemamy.exception.ModelConsistenceException;
-import org.jiemamy.model.AppropriativeChildOf;
-
-/**
- * TODO for daisuke
- * @author daisuke
- */
-public class AccessionMediatorImpl implements AccessionMediator {
-
- /**
- * {@inheritDoc}
- */
- public <T>void append(AppropriativeChildOf<T> child, T parent) {
- if (child.getParent() != null) {
- throw new ModelConsistenceException();
- }
- child.setParent(parent);
- }
-
- /**
- * {@inheritDoc}
- */
- public <T>void remove(AppropriativeChildOf<T> child, T parent) {
- if (child != null) {
- child.setParent(parent);
- }
- }
-
-}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AdapterManager.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AdapterManager.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AdapterManager.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -21,7 +21,7 @@
import java.util.List;
/**
- * TODO for daisuke
+ * アダプタを管理するインターフェイス。
* @author daisuke
*/
public interface AdapterManager {
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediator.java (from rev 2337, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediator.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediator.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediator.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/12/31
+ *
+ * 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.internal;
+
+import org.jiemamy.exception.ModelConsistenceException;
+import org.jiemamy.model.AppropriativeChildOf;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.attribute.ColumnModel;
+import org.jiemamy.model.connection.AbstractConnectionModel;
+import org.jiemamy.model.constraint.PrimaryKeyConstraintModel;
+import org.jiemamy.model.node.TableModel;
+
+/**
+ * モデル整合性を管理するメディエータ。
+ *
+ * <p>Jiemamyモデルは、例えば同じ{@link ColumnModel}のインスタンスが複数の{@link TableModel}に保持される事を許可しないなど、
+ * 下記のような制約を持つ。下記の制約に違反した場合、{@link ModelConsistenceException}がスローされる。このような、モデル整合性の
+ * 維持管理を担うインターフェイスである。</p>
+ *
+ * <ul>
+ * <li>子モデルは、複数の親モデルを持つことができない。既に親を持つモデルを別の親にappendしてはならない。</li>
+ * <li>{@link AbstractConnectionModel}のsourceとtargetは、コネクションがappendされる{@link RootModel}に
+ * appendされていなければならない。</li>
+ * <li>{@link PrimaryKeyConstraintModel}のcolumns要素は、主キー制約が設定される{@link TableModel}が保持するcolumnsの
+ * サブリストでなければならない。</li>
+ * <li>UNDONE 色々まだあると思う。</li>
+ * </ul>
+ *
+ * @author daisuke
+ */
+public interface ModelConsistenceMediator {
+
+ /**
+ * 子モデルを親モデルに所属させる。
+ * @param <T> 親モデルの型
+ * @param child 子モデル
+ * @param parent 親モデル
+ */
+ <T>void append(AppropriativeChildOf<T> child, T parent);
+
+ /**
+ * 子モデルを親モデルの配下から外す。
+ * @param <T> 親モデルの型
+ * @param child 子モデル
+ * @param parent 親モデル
+ */
+ <T>void remove(AppropriativeChildOf<T> child, T parent);
+
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediatorImpl.java (from rev 2337, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/AccessionMediatorImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediatorImpl.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediatorImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/12/31
+ *
+ * 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.internal;
+
+import org.jiemamy.exception.ModelConsistenceException;
+import org.jiemamy.model.AppropriativeChildOf;
+
+/**
+ * {@link ModelConsistenceMediator}の実装クラス。
+ * @author daisuke
+ */
+public class ModelConsistenceMediatorImpl implements ModelConsistenceMediator {
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T>void append(AppropriativeChildOf<T> child, T parent) {
+ if (child.getParent() != null) {
+ throw new ModelConsistenceException();
+ }
+ child.setParent(parent);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T>void remove(AppropriativeChildOf<T> child, T parent) {
+ if (child != null) {
+ child.setParent(parent);
+ }
+ }
+
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/ModelConsistenceMediatorImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/AppropriativeChildOf.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/AppropriativeChildOf.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/AppropriativeChildOf.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,13 +18,29 @@
*/
package org.jiemamy.model;
+import org.jiemamy.model.attribute.ColumnModel;
+import org.jiemamy.model.node.TableModel;
+
/**
- * TODO for daisuke
+ * Tで指定した親モデルに「専有される」事を表すインターフェイス。
+ *
+ * <p>「専有される」とは、同じインスタンスが、複数の親モデルを同時に持つことができないことを表す。例えば、同じインスタンスの
+ * {@link ColumnModel}は、複数の{@link TableModel}にappendできない。</p>
+ *
+ * @param <T> 親の型
* @author daisuke
*/
public interface AppropriativeChildOf<T> {
+ /**
+ * 親モデルを取得する。親モデルが設定されていない場合は{@code null}を返す。
+ * @return 親モデル
+ */
T getParent();
+ /**
+ * 親モデルを設定する。
+ * @param parent 親モデル
+ */
void setParent(T parent);
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/RootModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/RootModelImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/RootModelImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -35,7 +35,7 @@
import org.jiemamy.JiemamyFactoryImpl;
import org.jiemamy.exception.TooManyElementsException;
import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.internal.AccessionMediator;
+import org.jiemamy.internal.ModelConsistenceMediator;
import org.jiemamy.internal.AdapterManager;
import org.jiemamy.internal.processor.GetConnectionsProcessor;
import org.jiemamy.internal.processor.GetEntityProcessor;
@@ -99,7 +99,7 @@
private AdapterManager adapterManager;
@Binding
- private AccessionMediator mediator;
+ private ModelConsistenceMediator mediator;
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -24,7 +24,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
import org.seasar.framework.container.annotation.tiger.Binding;
-import org.jiemamy.internal.AccessionMediator;
+import org.jiemamy.internal.ModelConsistenceMediator;
import org.jiemamy.model.datatype.BuiltinDataTypeImpl;
import org.jiemamy.model.datatype.DataType;
import org.jiemamy.model.datatype.DomainModel;
@@ -70,7 +70,7 @@
private boolean representation;
@Binding
- private AccessionMediator mediator;
+ private ModelConsistenceMediator mediator;
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -26,8 +26,8 @@
import org.apache.commons.lang.builder.ToStringStyle;
import org.seasar.framework.container.annotation.tiger.Binding;
-import org.jiemamy.internal.AccessionMediator;
import org.jiemamy.internal.AdapterManager;
+import org.jiemamy.internal.ModelConsistenceMediator;
import org.jiemamy.model.AppropriativeChildOf;
import org.jiemamy.model.node.TableModel;
@@ -53,7 +53,7 @@
private AdapterManager adapterManager;
@Binding
- private AccessionMediator mediator;
+ private ModelConsistenceMediator mediator;
private TableModel parent;
@@ -81,8 +81,8 @@
}
/**
- * TODO for daisuke
- * @return
+ * インデックスカラムのリストを取得する。
+ * @return インデックスカラムのリスト
*/
public List<IndexColumnModel> getModifiableColumns() {
assert columns != null;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/TableModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/TableModelImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/TableModelImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -26,7 +26,7 @@
import org.seasar.framework.container.annotation.tiger.Binding;
import org.jiemamy.exception.TooManyElementsException;
-import org.jiemamy.internal.AccessionMediator;
+import org.jiemamy.internal.ModelConsistenceMediator;
import org.jiemamy.internal.processor.GetColumnProcessor;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.ColumnModelImpl;
@@ -68,7 +68,7 @@
private PrimaryKeyConstraintModel primaryKey;
@Binding
- private AccessionMediator mediator;
+ private ModelConsistenceMediator mediator;
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/BuiltinDataTypeBuilder.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/BuiltinDataTypeBuilder.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/BuiltinDataTypeBuilder.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.jiemamy.model.datatype.adapter.SizedDataTypeAdapter;
/**
- * TODO for daisuke
+ * {@link BuiltinDataType}を生成するビルダ。
* @author daisuke
*/
public class BuiltinDataTypeBuilder extends ModelBuilder<BuiltinDataType> {
@@ -47,8 +47,8 @@
}
/**
- * TODO for daisuke
- * @param precision
+ * 精度を設定する。
+ * @param precision 精度
* @return this
*/
public BuiltinDataTypeBuilder setPrecision(int precision) {
@@ -57,8 +57,8 @@
}
/**
- * TODO for daisuke
- * @param scale
+ * スケールを設定する。
+ * @param scale スケール
* @return this
*/
public BuiltinDataTypeBuilder setScale(int scale) {
@@ -67,8 +67,8 @@
}
/**
- * TODO for daisuke
- * @param serial
+ * 自動採番型かどうかを設定する。
+ * @param serial 自動採番であれば{@code true}
* @return this
*/
public BuiltinDataTypeBuilder setSerial(boolean serial) {
@@ -77,8 +77,8 @@
}
/**
- * TODO for daisuke
- * @param size
+ * サイズを設定する。
+ * @param size サイズ
* @return this
*/
public BuiltinDataTypeBuilder setSize(int size) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -21,6 +21,7 @@
import org.apache.commons.lang.Validate;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.exception.ElementNotFoundException;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.connection.ForeignKeyModel;
import org.jiemamy.model.node.TableModel;
@@ -48,10 +49,11 @@
}
/**
- * TODO for daisuke
- * @param referenceColumn
- * @param constraintColumn
+ * マッピングを設定する。
+ * @param referenceColumn 参照先テーブルの主キーカラムの一つ
+ * @param constraintColumn 参照元テーブルの「制約を受けるカラム」の一つ
* @return this
+ * @throws ElementNotFoundException referenceColumnが、所属テーブルにおいて主キー指定されていない場合
*/
public ForeignKeyBuilder mapping(ColumnModel referenceColumn, ColumnModel constraintColumn) {
model.getMapping(referenceColumn).setConstraintColumn(constraintColumn);
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -45,8 +45,8 @@
}
/**
- * TODO for daisuke
- * @param column
+ * カラムを追加する。
+ * @param column 追加するカラム
* @return this
*/
public TableBuilder column(ColumnModel column) {
@@ -55,14 +55,24 @@
}
/**
- * TODO for daisuke
+ * 主キーをカラムのインデックスで指定する。
* @param index
+ * @param otherIndexes
* @return this
+ * @throws IndexOutOfBoundsException 指定したインデックスのカラムが存在しない場合。
*/
- public TableBuilder primaryKey(int index) {
+ public TableBuilder primaryKey(int index, int... otherIndexes) {
+ PrimaryKeyConstraintModel pk = factory.newModel(PrimaryKeyConstraintModel.class);
ColumnModel pkColumn = model.getColumns().get(index);
- PrimaryKeyConstraintModel pk = factory.newModel(PrimaryKeyConstraintModel.class);
pk.getColumns().add(pkColumn);
+
+ for (int otherIndex : otherIndexes) {
+ pkColumn = model.getColumns().get(otherIndex);
+ if (pk.getColumns().contains(pkColumn) == false) {
+ pk.getColumns().add(pkColumn);
+ }
+ }
+
model.setPrimaryKey(pk);
return this;
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -44,8 +44,8 @@
}
/**
- * TODO for daisuke
- * @param definition
+ * VIEW定義SELECT文を設定する。
+ * @param definition VIEW定義SELECT文
* @return this
*/
public ViewBuilder definition(String definition) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getAttributes(String, String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class AttributesMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -28,6 +28,7 @@
/**
* 行を一意に識別するテーブルの最適な列セットに関する記述。
+ * {@link DatabaseMetaData#getBestRowIdentifier(String, String, String, int, boolean)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class BestRowIdentifierMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getCatalogs()}の結果の一つを表す値クラス。
* @author daisuke
*/
public class CatalogMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -28,7 +28,7 @@
/**
* DBから読み出したカラム情報の保持クラス。
- * @see DatabaseMetaData#getTables(String, String, String, String[])
+ * {@link DatabaseMetaData#getTables(String, String, String, String[])}の結果の一つを表す値クラス。
* @author daisuke
*/
public class ColumnMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getColumnPrivileges(String, String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class ColumnPrivilegeMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getIndexInfo(String, String, String, boolean, boolean)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class IndexInfoMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,8 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getExportedKeys(String, String, String)}, {@link DatabaseMetaData#getImportedKeys(String, String, String)}
+ * の結果の一つを表す値クラス。
* @author daisuke
*/
public class KeyMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getPrimaryKeys(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class PrimaryKeyMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getProcedureColumns(String, String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class ProcedureColumnsMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getProcedures(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class ProcedureMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getSchemas()}の結果の一つを表す値クラス。
* @author daisuke
*/
public class SchemaMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getSuperTables(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class SuperTableMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getSuperTypes(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class SuperTypeMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -28,7 +28,7 @@
/**
* DBから読み出したテーブル情報の保持クラス。
- * @see DatabaseMetaData#getTables(String, String, String, String[])
+ * {@link DatabaseMetaData#getTables(String, String, String, String[])}の結果の一つを表す値クラス。
* @author daisuke
*/
public class TableMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getTablePrivileges(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class TablePrivilegeMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getTableTypes()}の結果の一つを表す値クラス。
* @author daisuke
*/
public class TableTypeMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -28,7 +28,7 @@
/**
* DBから読み出したデータ型情報の保持クラス。
- * @see DatabaseMetaData#getTypeInfo()
+ * {@link DatabaseMetaData#getTypeInfo()}の結果の一つを表す値クラス。
* @author daisuke
*/
public class TypeInfoMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -381,7 +381,7 @@
/**
- * TODO for daisuke
+ * {@link ResultSet}の{@link Iterator}を取得できる{@link Iterable}の実装クラス。
* @author daisuke
* @param <T>
*/
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.utils.metadata;
+import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getUDTs(String, String, String, int[])}の結果の一つを表す値クラス。
* @author daisuke
*/
public class UDTMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -27,7 +27,7 @@
import org.apache.commons.lang.builder.ToStringStyle;
/**
- * TODO for daisuke
+ * {@link DatabaseMetaData#getVersionColumns(String, String, String)}の結果の一つを表す値クラス。
* @author daisuke
*/
public class VersionColumnMeta {
Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon 2008-12-31 08:44:44 UTC (rev 2338)
@@ -13,7 +13,7 @@
@java.util.UUID ＠ randomUUID()
</component>
- <component class="org.jiemamy.internal.AccessionMediatorImpl"/>
+ <component class="org.jiemamy.internal.ModelConsistenceMediatorImpl"/>
<component class="org.jiemamy.internal.AdapterManagerImpl"/>
<!-- Jiemamy Model -->
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -25,7 +25,7 @@
import org.apache.commons.lang.Validate;
import org.seasar.framework.container.annotation.tiger.Binding;
-import org.jiemamy.internal.AccessionMediator;
+import org.jiemamy.internal.ModelConsistenceMediator;
/**
* ダイアグラム表現の集合モデルクラス。
@@ -37,7 +37,7 @@
private List<DiagramPresentationModel> composite;
@Binding
- private AccessionMediator mediator;
+ private ModelConsistenceMediator mediator;
/**
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/AdditionalSpec.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/AdditionalSpec.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/AdditionalSpec.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -18,9 +18,8 @@
*/
package org.jiemamy;
-
/**
- * TODO for daisuke
+ * 追加仕様を表すインターフェイス。追加仕様とは、Jiemamy Core以外の仕様（例えばJiemamy Event等）のことである。
* @author daisuke
*/
public interface AdditionalSpec {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/JiemamyFactory.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/JiemamyFactory.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/JiemamyFactory.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -24,7 +24,7 @@
import org.jiemamy.utils.Identifiable;
/**
- * TODO for daisuke
+ * Jiemamy関連のインスタンスを生成するファクトリインターフェイス。
* @author daisuke
*/
public interface JiemamyFactory {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/OfficialSpecs.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/OfficialSpecs.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/OfficialSpecs.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -19,7 +19,7 @@
package org.jiemamy;
/**
- * TODO for daisuke
+ * Jiemamy公式追加仕様を表す列挙型。
* @author daisuke
*/
public enum OfficialSpecs implements AdditionalSpec {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModel.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModel.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -21,6 +21,7 @@
import java.util.List;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.exception.ElementNotFoundException;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.ColumnModel;
@@ -65,6 +66,7 @@
* 指定した主キーカラムに対するマッピング情報を取得する。
* @param referencePkColumn 主キーカラム
* @return マッピング情報
+ * @throws ElementNotFoundException referencePkColumnが、所属テーブルにおいて主キー指定されていない場合
*/
ForeignKeyMapping getMapping(ColumnModel referencePkColumn);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java 2008-12-31 07:49:59 UTC (rev 2337)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java 2008-12-31 08:44:44 UTC (rev 2338)
@@ -19,7 +19,7 @@
package org.jiemamy.model.datatype;
/**
- * TODO for daisuke
+ * DBに本来組み込まれているデータ型を表すインターフェイス。つまり、Domain型ではないプリミティブなデータ型。
* @author daisuke
*/
public interface BuiltinDataType extends DataType {