svnno****@sourc*****
svnno****@sourc*****
2008年 10月 4日 (土) 23:29:23 JST
Revision: 1988
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1988
Author: daisuke_m
Date: 2008-10-04 23:29:23 +0900 (Sat, 04 Oct 2008)
Log Message:
-----------
javadoc整備。 /
不要リソースの削除など。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java
artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java
artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/GeneralDataTypeMapping.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/AbstractConstraintModel.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/CheckConstraintModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintSetModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexColumnModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/debug/S2ContainerUtil.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetConstrainEntitiesProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetReferenceEntitiesProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetConnectionsProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractCollectionVisitor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractMapVisitor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelTest.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/ObservableImpl.java
artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Adaptable.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Processor.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/exception/CannotAppendException.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/Context.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/ColumnModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/DomainModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/JiemamyModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/RootModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyMapping.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/CheckConstraintModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/NotNullConstraintModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/PrimaryKeyConstraintModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/InsertDataSetModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/RecordModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/datatype/DataType.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexColumnModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/StickyModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/TableModel.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/ViewModel.java
zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/model/dataset/InsertDataSetModelChangeListener.java
zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/view/model/DiagramPresentationModel.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/CreateNewColumnProcessor.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/extention/
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/dataset/
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -152,7 +152,7 @@
* コンストラクタ。
* @param connection DB接続
* @param rootModel 書き込み先モデル
- * @param ctx
+ * @param ctx インポートに関するコンテキスト情報
* @category instance creation
*/
public EntityImportVisitor(Connection connection, RootModel rootModel, ImportContext ctx) {
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -22,8 +22,7 @@
import org.jiemamy.spec.extension.composer.ExportContext;
/**
- * エクスポートを行う際のコンテキスト情報。
- *
+ * エクスポートに関するコンテキスト情報。
* @author daisuke
*/
public class ExportContextImpl extends AbstractContext implements ExportContext {
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -23,8 +23,7 @@
import org.jiemamy.spec.extension.composer.ImportContext;
/**
- * インポートを行う際のコンテキスト情報。
- *
+ * インポートに関するコンテキスト情報。
* @author daisuke
*/
public class ImportContextImpl extends AbstractContext implements ImportContext {
Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -18,12 +18,28 @@
*/
package org.jiemamy.composer.exporter;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.seasar.framework.container.S2Container;
import org.seasar.framework.unit.Seasar2;
+import org.jiemamy.core.S2FactoryStrategy;
+import org.jiemamy.core.extension.composer.ExportContextImpl;
+import org.jiemamy.creator.JiemamyModelFactory;
+import org.jiemamy.spec.extension.composer.ExportContext;
import org.jiemamy.spec.extension.composer.Exporter;
+import org.jiemamy.spec.extension.dialect.Dialect;
+import org.jiemamy.spec.model.RootModel;
/**
* {@link SqlExporter}のテストクラス。
@@ -32,9 +48,6 @@
@RunWith(Seasar2.class)
public class SqlExporterTest {
- /** DIコンテナ */
- public S2Container container;
-
/** テスト対象のエクスポータ */
public Exporter exporter;
@@ -45,50 +58,52 @@
*/
@Test
public void test01_モデルからSQLファイルがエクスポートできることを確認する() throws Exception {
- // FIXME
-// File outputFile = new File("sqlExporterTest1.sql"); // ${WORKSPACE}/org.jiemamy.composer/sqlExporterTest1.sql
-// assertThat(outputFile.exists(), is(false));
-// RootModel model = new ApplicationModelCreator().createModel();
-//
-// URLClassLoader classLoader = new URLClassLoader(new URL[] {
-// new File("../org.jiemamy.dialect/target/classes").toURL(),
-// new File("../org.jiemamy.dialect.mysql/target/classes").toURL()
-// });
-//
-// // FIXME 前者はComponentNotFoundRuntimeExceptionが飛ぶ。
-//// Dialect dialect = (Dialect) container.getComponent(Class.forName(model.getDialectClassName(), true, classLoader));
-// Dialect dialect = (Dialect) Class.forName(model.getDialectClassName(), true, classLoader).newInstance();
-//
-// BufferedReader reader = null;
-// try {
-// ExportContext ctx = new ExportContextImpl();
-// ctx.setValue(SqlExporter.OUTPUT_FILE, outputFile);
-// ctx.setValue(SqlExporter.OVERWRITE, true);
-// ctx.setValue(SqlExporter.DIALECT, dialect);
-// exporter.export(model, ctx);
-//
-// assertThat(outputFile.exists(), is(true));
-//
-// reader = new BufferedReader(new FileReader(outputFile));
-// String line;
-// while ((line = reader.readLine()) != null) {
-// System.out.println(line);
-// }
-//
-// // UNDONE sqlExporterTest1.sqlの内容確認
-//
-// } finally {
-// IOUtils.closeQuietly(reader);
-// deleteFile(outputFile);
-// }
-// }
-//
-// private void deleteFile(File outputFile) {
-// if (outputFile.exists() == false) {
-// return;
-// }
-// if (outputFile.delete() == false) {
-// fail("Cannot delete file: " + outputFile.getPath());
-// }
+ File outputFile = new File("sqlExporterTest1.sql"); // ${WORKSPACE}/org.jiemamy.composer/sqlExporterTest1.sql
+ assertThat(outputFile.exists(), is(false));
+
+ JiemamyModelFactory.init(new S2FactoryStrategy("jiemamy-composer.dicon"));
+
+ RootModel model = JiemamyModelFactory.createRoot().init();
+
+ model.setDialectClassName("org.jiemamy.dialect.mysql.MySqlDialect");
+
+ URLClassLoader classLoader = new URLClassLoader(new URL[] {
+ new File("../org.jiemamy.dialect/target/classes").toURL(),
+ new File("../org.jiemamy.dialect.mysql/target/classes").toURL()
+ });
+
+ Dialect dialect = (Dialect) Class.forName(model.getDialectClassName(), true, classLoader).newInstance();
+
+ BufferedReader reader = null;
+ try {
+ ExportContext ctx = new ExportContextImpl();
+ ctx.setValue(SqlExporter.OUTPUT_FILE, outputFile);
+ ctx.setValue(SqlExporter.OVERWRITE, true);
+ ctx.setValue(SqlExporter.DIALECT, dialect);
+ exporter.export(model, ctx);
+
+ assertThat(outputFile.exists(), is(true));
+
+ reader = new BufferedReader(new FileReader(outputFile));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+
+ // UNDONE sqlExporterTest1.sqlの内容確認
+
+ } finally {
+ IOUtils.closeQuietly(reader);
+ deleteFile(outputFile);
+ }
}
+
+ private void deleteFile(File outputFile) {
+ if (outputFile.exists() == false) {
+ return;
+ }
+ if (outputFile.delete() == false) {
+ fail("Cannot delete file: " + outputFile.getPath());
+ }
+ }
}
Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -60,8 +60,10 @@
/** {@link DatabaseImporter} */
public Importer importer;
+ /** SQL方言 */
private Dialect dialect;
+ /** SERLAL型のデータ型 */
private DataType serialTypeClass;
@@ -79,8 +81,6 @@
new File("../org.jiemamy.dialect.postgresql/target/classes").toURL()
});
- // FIXME 前者はComponentNotFoundRuntimeExceptionが飛ぶ。
-// Dialect dialect = (Dialect) container.getComponent(Class.forName(model.getDialectClassName(), true, classLoader));
dialect =
(Dialect) Class.forName("org.jiemamy.dialect.postgresql.PostgresqlDialect", true, classLoader)
.newInstance();
@@ -96,6 +96,7 @@
@After
public void tearDown() throws Exception {
dialect = null;
+ serialTypeClass = null;
}
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/S2FactoryStrategy.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -33,12 +33,13 @@
*/
public class S2FactoryStrategy implements FactoryStrategy {
+ /** DIコンテナ */
protected S2Container container;
/**
* コンストラクタ。
- * @param path
+ * @param path diconファイルのクラスパス内パス
* @category instance creation
*/
public S2FactoryStrategy(String path) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/ConnectionAppender.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -24,7 +24,7 @@
import org.jiemamy.spec.model.connection.AbstractConnectionModel;
/**
- * TODO for daisuke
+ * {@link RootModel} に対して {@link AbstractConnectionModel}を追加/削除するアペンダ。
* @author daisuke
*/
public class ConnectionAppender implements JiemamyModelAppender {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/appender/NodeAppender.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -24,7 +24,7 @@
import org.jiemamy.spec.model.node.AbstractNodeModel;
/**
- * TODO for daisuke
+ * {@link RootModel} に対して {@link AbstractNodeModel}を追加/削除するアペンダ。
* @author daisuke
*/
public class NodeAppender implements JiemamyModelAppender {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/GeneralDataTypeMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/GeneralDataTypeMapping.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/GeneralDataTypeMapping.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -76,6 +76,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unused")
public SpecialDataType resolveSpecialDataType(String typeName) throws DataTypeNotFoundException {
throw new UnsupportedOperationException();
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,6 +41,7 @@
*/
public class SpecialDataTypeMapping implements DataTypeMapping {
+ /** SQL方言 */
private Dialect dialect;
private List<Class<? extends DataType>> classes = CollectionsUtil.newArrayList();
@@ -48,7 +49,7 @@
/**
* コンストラクタ。
- * @param dialect
+ * @param dialect SQL方言
* @category instance creation
*/
public SpecialDataTypeMapping(Dialect dialect) {
@@ -144,7 +145,7 @@
}
/**
- * dialectを取得する。
+ * SQL方言を取得する。
* @return dialect
*/
protected Dialect getDialect() {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -29,15 +29,17 @@
*/
public abstract class AbstractIdentifierValidator implements IdentifierValidator {
+ /** 識別子としての妥当性を判断する正規表現パターン */
private Pattern identifierPattern;
+ /** 予約語プロバイダ */
private ReservedWordsProvider reservedWords;
/**
* コンストラクタ。
- * @param patternString
- * @param reservedWords
+ * @param patternString 識別子としての妥当性を判断する正規表現パターン文字列
+ * @param reservedWords 予約語プロバイダ
* @category instance creation
*/
public AbstractIdentifierValidator(String patternString, ReservedWordsProvider reservedWords) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -40,8 +40,7 @@
* {@inheritDoc}
*/
public List<Object> getAdapters() {
- // TODO Auto-generated method stub
- return null;
+ throw new UnsupportedOperationException();
}
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -55,8 +55,8 @@
/**
* コンストラクタ。
- * @param dialect
- * @param ctx
+ * @param dialect SQL方言
+ * @param ctx コンテキスト情報
* @category instance creation
*/
public DatabaseReader(Dialect dialect, DatabaseReadingContext ctx) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -43,9 +43,11 @@
// Dialectは必要な部分のみInterpreterから問い合わせられるだけの立場であり、
// 基本的にSQLを組み立てる責務はInterpreter側にあるものではないか？
- private final Dialect dialect;
+ /** SQL方言 */
+ private Dialect dialect;
- private final ExportContext ctx;
+ /** コンテキスト情報 */
+ private ExportContext ctx;
/**
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -39,6 +39,7 @@
*/
private UUID id;
+ /** 初期化済みフラグ */
private boolean initialized;
@@ -89,8 +90,7 @@
}
/**
- * 適用可能なアダプタのリストを取得する。
- * @return 適用可能なアダプタのリスト
+ * {@inheritDoc}
*/
public List<Object> getAdapters() {
return adapters;
@@ -142,8 +142,8 @@
}
/**
- * TODO for daisuke
- * @param adapter
+ * アダプタの新規登録を行う。
+ * @param adapter 登録するアダプタ
*/
public void registerAdapter(Object adapter) {
adapters.add(adapter);
@@ -163,17 +163,8 @@
}
/**
- * TODO for daisuke
- * @param adapter
+ * モデルマネージャにモデルの登録を行う。
*/
- protected void addAdapter(Object adapter) {
- adapters.add(adapter);
- }
-
- /**
- * コンストラクタ。
- * @category instance creation
- */
protected void initialize() {
if (isInitialized() == false) {
ModelIdManager modelManager = ModelIdManager.getInstance();
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -80,8 +80,8 @@
/**
* コンストラクタ。
- * @param name
- * @param dataType
+ * @param name カラム名
+ * @param dataType データ型
* @category instance creation
*/
public ColumnModelImpl(String name, DataType dataType) {
@@ -90,16 +90,14 @@
}
/**
- * 制約を追加する。
- * @param constraint 制約
+ * {@inheritDoc}
*/
public void addConstraint(Constraint constraint) {
constraints.add(constraint);
}
/**
- * 制約を取得する。
- * @return 制約
+ * {@inheritDoc}
*/
public ConstraintSetModel getConstraints() {
if (dataType instanceof DomainModel) {
@@ -110,16 +108,14 @@
}
/**
- * 型を取得する。
- * @return 型
+ * {@inheritDoc}
*/
public DataType getDataType() {
return dataType;
}
/**
- * デフォルト値を取得する。
- * @return デフォルト値
+ * {@inheritDoc}
*/
public String getDefaultValue() {
if (dataType instanceof DomainModel && defaultValue == null) {
@@ -130,16 +126,14 @@
}
/**
- * 説明文を取得する。
- * @return 説明文
+ * {@inheritDoc}
*/
public String getDescription() {
return description;
}
/**
- * 自由文字列を取得する。
- * @return 自由文字列
+ * {@inheritDoc}
*/
public String getFreeString() {
if (dataType instanceof DomainModel && freeString == null) {
@@ -150,25 +144,21 @@
}
/**
- * 論理名を取得する。
- * @return 論理名
+ * {@inheritDoc}
*/
public String getLogicalName() {
return logicalName;
}
/**
- * 物理名を取得する。
- * @return 物理名
+ * {@inheritDoc}
*/
public String getName() {
return name;
}
/**
- * 指定する制約を持つかどうか調べる。
- * @param clazz 制約クラス
- * @return 制約を持つ場合は<tt>true</tt>
+ * {@inheritDoc}
*/
public boolean hasConstraint(Class<? extends Constraint> clazz) {
if (dataType instanceof DomainModel) {
@@ -189,16 +179,14 @@
}
/**
- * 代表カラムかどうかを取得する。
- * @return 代表カラムかどうか
+ * {@inheritDoc}
*/
public boolean isRepresentation() {
return representation;
}
/**
- * 単純インデックスの有無を取得する。
- * @return 単純インデックスの有無
+ * {@inheritDoc}
*/
public boolean isSimpleIndex() {
if (dataType instanceof DomainModel && simpleIndex == false) {
@@ -209,64 +197,56 @@
}
/**
- * 制約を削除する。
- * @param constraintClass 制約クラス
+ * {@inheritDoc}
*/
public void removeConstraint(Class<? extends Constraint> constraintClass) {
constraints.remove(constraintClass);
}
/**
- * 型を設定する。
- * @param dataType 型
+ * {@inheritDoc}
*/
public void setDataType(DataType dataType) {
this.dataType = dataType;
}
/**
- * デフォルト値を設定する。
- * @param defaultValue デフォルト値
+ * {@inheritDoc}
*/
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
/**
- * 説明文を設定する。
- * @param description 説明文
+ * {@inheritDoc}
*/
public void setDescription(String description) {
this.description = description;
}
/**
- * 自由文字列を設定する。
- * @param freeString 自由文字列
+ * {@inheritDoc}
*/
public void setFreeString(String freeString) {
this.freeString = freeString;
}
/**
- * 論理名を設定する。
- * @param logicalName 論理名
+ * {@inheritDoc}
*/
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
/**
- * 物理名を設定する。
- * @param name 物理名
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
}
/**
- * 代表カラムかどうかを設定する。
- * @param representation 代表カラムかどうか
+ * {@inheritDoc}
*/
public void setRepresentation(boolean representation) {
this.representation = representation;
@@ -281,8 +261,7 @@
// }
/**
- * 単純インデックスの有無を設定する。
- * @param simpleIndex 単純インデックスの有無
+ * {@inheritDoc}
*/
public void setSimpleIndex(boolean simpleIndex) {
this.simpleIndex = simpleIndex;
@@ -290,7 +269,7 @@
/**
* 制約を設定する。
- * @param constraints 制約
+ * @param constraints 制約
*/
void setConstraints(ConstraintSetModel constraints) {
this.constraints = constraints;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -68,8 +68,8 @@
/**
* コンストラクタ。
- * @param name
- * @param dataType
+ * @param name ドメイン名
+ * @param dataType データ型
* @category instance creation
*/
public DomainModelImpl(String name, DataType dataType) {
@@ -78,8 +78,7 @@
}
/**
- * 制約を追加する。
- * @param constraint 制約
+ * {@inheritDoc}
*/
public void addConstraint(Constraint constraint) {
constraints.add(constraint);
@@ -94,56 +93,49 @@
}
/**
- * 制約を取得する。
- * @return 制約のSet
+ * {@inheritDoc}
*/
public ConstraintSetModel getConstraint() {
return constraints;
}
/**
- * ドメインとして定義された型を取得する。
- * @return ドメインとして定義された型
+ * {@inheritDoc}
*/
public DataType getDataType() {
return dataType;
}
/**
- * デフォルト値を取得する。
- * @return デフォルト値
+ * {@inheritDoc}
*/
public String getDefaultValue() {
return defaultValue;
}
/**
- * 説明文を取得する。
- * @return 説明文
+ * {@inheritDoc}
*/
public String getDescription() {
return description;
}
/**
- * 自由文字列を取得する。
- * @return 自由文字列
+ * {@inheritDoc}
*/
public String getFreeString() {
return freeString;
}
/**
- * 論理名を取得する。
- * @return 論理名
+ * {@inheritDoc}
*/
public String getLogicalName() {
return logicalName;
}
/**
- * ドメイン名を取得する。
- * @return ドメイン名
+ * {@inheritDoc}
*/
public String getName() {
return name;
@@ -158,9 +150,7 @@
}
/**
- * 指定する制約を持つかどうか調べる。
- * @param clazz 制約クラス
- * @return 制約を持つ場合は<tt>true</tt>
+ * {@inheritDoc}
*/
public boolean hasConstraint(Class<? extends Constraint> clazz) {
return constraints.has(clazz);
@@ -169,21 +159,13 @@
/**
* {@inheritDoc}
*/
- public DataType init() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * {@inheritDoc}
- */
public DomainModel init(String name, DataType dataType) {
initialize();
return this;
}
/**
- * 単純インデックスの有無を取得する。
- * @return 単純インデックスの有無
+ * {@inheritDoc}
*/
public boolean isSimpleIndex() {
return simpleIndex;
@@ -197,56 +179,49 @@
}
/**
- * 制約を削除する。
- * @param constraintClass 制約クラス
+ * {@inheritDoc}
*/
public void removeConstraint(Class<? extends Constraint> constraintClass) {
constraints.remove(constraintClass);
}
/**
- * ドメインとして定義された型を設定する。
- * @param dataType ドメインとして定義された型
+ * {@inheritDoc}
*/
public void setDataType(DataType dataType) {
this.dataType = dataType;
}
/**
- * デフォルト値を設定する。
- * @param defaultValue デフォルト値
+ * {@inheritDoc}
*/
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
/**
- * 説明文を設定する。
- * @param description 説明文
+ * {@inheritDoc}
*/
public void setDescription(String description) {
this.description = description;
}
/**
- * 自由文字列を設定する。
- * @param freeString 自由文字列
+ * {@inheritDoc}
*/
public void setFreeString(String freeString) {
this.freeString = freeString;
}
/**
- * ドメイン名を設定する。
- * @param name ドメイン名
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
}
/**
- * 単純インデックスの有無を設定する。
- * @param simpleIndex 単純インデックスの有無
+ * {@inheritDoc}
*/
public void setSimpleIndex(boolean simpleIndex) {
this.simpleIndex = simpleIndex;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModelAppender.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -21,24 +21,24 @@
import org.jiemamy.spec.model.JiemamyModel;
/**
- * TODO for daisuke
+ * {@link JiemamyModel}に対して、子にあたる {@link JiemamyModel}を追加/削除する責務を持つクラス。
* @author daisuke
*/
public interface JiemamyModelAppender {
/**
- * TODO for daisuke
- * @param parent
- * @param child
- * @return
+ * 親モデルに対して、子モデルを追加する。
+ * @param parent 親モデル
+ * @param child 子モデル
+ * @return 追加に成功した場合 <code>true</code>、失敗した場合 <code>false</code>を返す。
*/
public boolean append(JiemamyModel parent, JiemamyModel child);
/**
- * TODO for daisuke
- * @param parent
- * @param child
- * @return
+ * 親モデルから、子モデルを削除する。
+ * @param parent 親モデル
+ * @param child 子モデル。
+ * @return 削除に成功した場合 <code>true</code>、失敗した場合 <code>false</code>を返す。
*/
public boolean remove(JiemamyModel parent, JiemamyModel child);
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -80,7 +80,7 @@
@Binding("list")
private List<InsertDataSetModel> insertDataSets;
- /** TODO for daisuke */
+ /** 当モデルに対して、子モデルを追加するアペンダのリスト */
@Binding("list")
private List<JiemamyModelAppender> appenders;
@@ -94,7 +94,7 @@
return;
}
}
- throw new CannotAppendException();
+ throw new CannotAppendException(this, jiemamyModel);
}
/**
@@ -123,48 +123,42 @@
}
/**
- * 開始スクリプトを取得する。
- * @return 開始スクリプト
+ * {@inheritDoc}
*/
public String getBeginScript() {
return beginScript;
}
/**
- * コネクションのリストを取得する。
- * @return コネクションのリスト
+ * {@inheritDoc}
*/
public List<AbstractConnectionModel> getConnections() {
return process(new GetConnectionsProcessor<AbstractConnectionModel>());
}
/**
- * 説明文を取得する。
- * @return 説明文
+ * {@inheritDoc}
*/
public String getDescription() {
return description;
}
/**
- * SQL方言クラス名を取得する。
- * @return RDBMS名
+ * {@inheritDoc}
*/
public String getDialectClassName() {
return dialectClassName;
}
/**
- * ドメインのリストを取得する。
- * @return ドメインのリスト
+ * {@inheritDoc}
*/
public List<DomainModel> getDomains() {
return domains;
}
/**
- * 終了スクリプトを取得する。
- * @return 終了スクリプト
+ * {@inheritDoc}
*/
public String getEndScript() {
return endScript;
@@ -180,16 +174,14 @@
}
/**
- * INSERTデータセットを取得する。
- * @return INSERTデータセット
+ * {@inheritDoc}
*/
public List<InsertDataSetModel> getInsertDataSets() {
return insertDataSets;
}
/**
- * ノードのリストを取得する。
- * @return ノードのリスト
+ * {@inheritDoc}
*/
public List<AbstractNodeModel> getNodes() {
return nodes;
@@ -203,16 +195,14 @@
}
/**
- * スキーマ名を取得する。
- * @return スキーマ名
+ * {@inheritDoc}
*/
public String getSchemaName() {
return schemaName;
}
/**
- * モデルの初期化を行う。
- * @return
+ * {@inheritDoc}
*/
public RootModel init() {
initialize();
@@ -242,8 +232,8 @@
// }
/**
- * TODO for daisuke
- * @param appender
+ * {@link JiemamyModelAppender}を登録する。
+ * @param appender このモデルに対するアペンダ
*/
public void registerAppender(JiemamyModelAppender appender) {
appenders.add(appender);
@@ -258,44 +248,39 @@
return;
}
}
- throw new CannotAppendException();
+ throw new CannotAppendException(this, jiemamyModel);
}
/**
- * 開始スクリプトを設定する。
- * @param beginScript 開始スクリプト
+ * {@inheritDoc}
*/
public void setBeginScript(String beginScript) {
this.beginScript = beginScript;
}
/**
- * 説明文を設定する。
- * @param description 説明文
+ * {@inheritDoc}
*/
public void setDescription(String description) {
this.description = description;
}
/**
- * SQL方言クラス名を設定する。
- * @param dialectClassName RDBMS名
+ * {@inheritDoc}
*/
public void setDialectClassName(String dialectClassName) {
this.dialectClassName = dialectClassName;
}
/**
- * 終了スクリプトを設定する。
- * @param endScript 終了スクリプト
+ * {@inheritDoc}
*/
public void setEndScript(String endScript) {
this.endScript = endScript;
}
/**
- * スキーマ名を設定する。
- * @param schemaName スキーマ名
+ * {@inheritDoc}
*/
public void setSchemaName(String schemaName) {
this.schemaName = schemaName;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -49,16 +49,14 @@
}
/**
- * 接続元ノードを取得する。
- * @return 接続元ノード
+ * {@inheritDoc}
*/
public AbstractNodeModel getSource() {
return source;
}
/**
- * 接続先ノードを取得する。
- * @return 接続先ノード
+ * {@inheritDoc}
*/
public AbstractNodeModel getTarget() {
return target;
@@ -72,16 +70,14 @@
}
/**
- * 接続元ノードを設定する。
- * @param source 接続元ノード
+ * {@inheritDoc}
*/
public void setSource(AbstractNodeModel source) {
this.source = source;
}
/**
- * 接続先ノードを設定する。
- * @param target 接続先ノード
+ * {@inheritDoc}
*/
public void setTarget(AbstractNodeModel target) {
this.target = target;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -46,16 +46,14 @@
/**
- * 制約を受けるカラムを取得する。
- * @return 制約を受けるカラム
+ * {@inheritDoc}
*/
public ColumnModel getConstraintColumn() {
return constraintColumn;
}
/**
- * 参照先カラムを取得する。
- * @return 参照先カラム
+ * {@inheritDoc}
*/
public ColumnModel getReferenceColumn() {
return referenceColumn;
@@ -70,8 +68,7 @@
}
/**
- * 制約を受けるカラムを設定する。
- * @param constraintColumn 制約を受けるカラム
+ * {@inheritDoc}
*/
public void setConstraintColumn(ColumnModel constraintColumn) {
this.constraintColumn = constraintColumn;
@@ -86,8 +83,7 @@
}
/**
- * 参照先カラムを設定する。
- * @param referenceColumn 参照先カラム
+ * {@inheritDoc}
*/
public void setReferenceColumn(ColumnModel referenceColumn) {
this.referenceColumn = referenceColumn;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,8 +41,8 @@
* @author daisuke
*/
@SuppressWarnings("serial")
-public class ForeignKeyModelImpl extends AbstractRelationModelImpl implements ForeignKeyModel { // implements IPropertySource
-
+public class ForeignKeyModelImpl extends AbstractRelationModelImpl implements ForeignKeyModel {
+
/** 名前 */
private String name;
@@ -91,7 +91,7 @@
/**
* コンストラクタ。
- * @param rootModel
+ * @param rootModel {@link RootModel}
* @param source 接続元（被制約）テーブル
* @param target 接続先（参照）テーブル
* @param createColumn 参照先カラムと同名のカラムを生成して、そのカラムにマッピングする場合は<tt>true</tt>
@@ -132,24 +132,21 @@
}
/**
- * 説明文を取得する。
- * @return 説明文
+ * {@inheritDoc}
*/
public String getDescription() {
return description;
}
/**
- * 遅延評価の初期状態。を取得する。
- * @return 遅延評価の初期状態。
+ * {@inheritDoc}
*/
public InitiallyCheckTime getInitiallyCheckTime() {
return initiallyCheckTime;
}
/**
- * 論理名を取得する。
- * @return 論理名
+ * {@inheritDoc}
*/
public String getLogicalName() {
return logicalName;
@@ -163,40 +160,35 @@
}
/**
- * マッピングのリストを取得する。
- * @return マッピングのリスト
+ * {@inheritDoc}
*/
public List<ForeignKeyMapping> getMappings() {
return mappings;
}
/**
- * マッチ型を取得する。
- * @return マッチ型
+ * {@inheritDoc}
*/
public MatchType getMatchType() {
return matchType;
}
/**
- * 名前を取得する。
- * @return 名前
+ * {@inheritDoc}
*/
public String getName() {
return name;
}
/**
- * 削除時アクションを取得する。
- * @return 削除時アクション
+ * {@inheritDoc}
*/
public ReferentialAction getOnDelete() {
return onDelete;
}
/**
- * 更新時アクションを取得する。
- * @return 更新時アクション
+ * {@inheritDoc}
*/
public ReferentialAction getOnUpdate() {
return onUpdate;
@@ -223,72 +215,63 @@
}
/**
- * 遅延評価可能性。を取得する。
- * @return 遅延評価可能性。
+ * {@inheritDoc}
*/
public boolean isDeferrable() {
return deferrable;
}
/**
- * 遅延評価可能性。を設定する。
- * @param deferrable 遅延評価可能性。
+ * {@inheritDoc}
*/
public void setDeferrable(boolean deferrable) {
this.deferrable = deferrable;
}
/**
- * 説明文を設定する。
- * @param description 説明文
+ * {@inheritDoc}
*/
public void setDescription(String description) {
this.description = description;
}
/**
- * 遅延評価の初期状態。を設定する。
- * @param initiallyCheckTime 遅延評価の初期状態。
+ * {@inheritDoc}
*/
public void setInitiallyCheckTime(InitiallyCheckTime initiallyCheckTime) {
this.initiallyCheckTime = initiallyCheckTime;
}
/**
- * 論理名を設定する。
- * @param logicalName 論理名
+ * {@inheritDoc}
*/
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
/**
- * マッチ型を設定する。
- * @param matchType マッチ型
+ * {@inheritDoc}
*/
public void setMatchType(MatchType matchType) {
this.matchType = matchType;
}
/**
- * 名前を設定する。
- * @param name 名前
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
}
/**
- * 削除時アクションを設定する。
- * @param onDelete 削除時アクション
+ * {@inheritDoc}
*/
public void setOnDelete(ReferentialAction onDelete) {
this.onDelete = onDelete;
}
/**
- * 更新時アクションを設定する。
- * @param onUpdate 更新時アクション
+ * {@inheritDoc}
*/
public void setOnUpdate(ReferentialAction onUpdate) {
this.onUpdate = onUpdate;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/AbstractConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/AbstractConstraintModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/AbstractConstraintModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -60,8 +60,7 @@
}
/**
- * 制約名を取得する。
- * @return 制約名
+ * {@inheritDoc}
*/
public String getName() {
return name;
@@ -79,8 +78,7 @@
}
/**
- * 制約名を設定する。
- * @param name 制約名
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/CheckConstraintModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/CheckConstraintModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/CheckConstraintModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -49,8 +49,7 @@
}
/**
- * CHEKC制約定義式を取得する。
- * @return CHEKC制約定義式
+ * {@inheritDoc}
*/
public String getExpression() {
return expression;
@@ -59,14 +58,14 @@
/**
* {@inheritDoc}
*/
- public CheckConstraintModel init() {
+ public CheckConstraintModel init(String expression) {
initialize();
+ setExpression(expression);
return this;
}
/**
- * CHEKC制約定義式を設定する。
- * @param expression CHEKC制約定義式
+ * {@inheritDoc}
*/
public void setExpression(String expression) {
this.expression = expression;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintSetModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintSetModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintSetModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -60,51 +60,35 @@
}
/**
- * 制約を追加する。
- * @param constraint 追加する制約
+ * {@inheritDoc}
*/
public void add(Constraint constraint) {
constraintMap.put(constraint.getClass(), constraint);
}
/**
- * 制約のセットを取得する。
- * @return 制約のセット
+ * {@inheritDoc}
*/
public Collection<Constraint> getConstraintMap() {
return constraintMap.values();
}
/**
- * 制約のセットを取得する。
- * @return 制約のセット
- * @see #getConstraintMap()
+ * {@inheritDoc}
*/
- @Deprecated
- public Collection<Constraint> getConstraints() {
- return constraintMap.values();
- }
-
- /**
- * 指定した制約があるかどうか調べる。
- * @param constraintClass 制約クラス
- * @return 制約があれば<tt>true</tt>
- */
public boolean has(Class<? extends Constraint> constraintClass) {
return constraintMap.containsKey(constraintClass);
}
/**
- * 制約を取り除く。
- * @param constraintClass 取り除く制約クラス
+ * {@inheritDoc}
*/
public void remove(Class<? extends Constraint> constraintClass) {
constraintMap.remove(constraintClass);
}
/**
- * 制約を設定する。
- * @param constraintMap 制約のMap
+ * {@inheritDoc}
*/
public void setConstraintMap(Map<Class<? extends Constraint>, Constraint> constraintMap) {
this.constraintMap = constraintMap;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,16 +41,14 @@
/**
- * データセット名を取得する。
- * @return データセット名
+ * {@inheritDoc}
*/
public String getName() {
return name;
}
/**
- * レコード情報を取得する。
- * @return レコード情報
+ * {@inheritDoc}
*/
public Map<AbstractEntityModel, List<RecordModel>> getRecords() {
return records;
@@ -66,8 +64,7 @@
}
/**
- * データセット名を設定する。
- * @param name データセット名
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -47,8 +47,7 @@
/**
- * カラムに対応するデータを取得する。
- * @return カラムに対応するデータ
+ * {@inheritDoc}
*/
public Map<ColumnModel, String> getValues() {
return values;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,14 +41,6 @@
/**
* {@inheritDoc}
*/
- public AbstractDataType init() {
- initialize();
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
public AbstractDataType removeAdapter() {
return this;
}
@@ -66,6 +58,6 @@
* @param adapter アダプタのインスタンス
*/
protected void register(DataTypeAdapter adapter) {
- addAdapter(adapter);
+ registerAdapter(adapter);
}
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexColumnModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexColumnModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexColumnModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -37,16 +37,14 @@
/**
- * インデックス対象カラムを取得する。
- * @return インデックス対象カラム
+ * {@inheritDoc}
*/
public ColumnModel getColumn() {
return column;
}
/**
- * カラムソート方式を取得する。
- * @return カラムソート方式
+ * {@inheritDoc}
*/
public SortType getSortType() {
return sortType;
@@ -62,16 +60,14 @@
}
/**
- * インデックス対象カラムを設定する。
- * @param column インデックス対象カラム
+ * {@inheritDoc}
*/
public void setColumn(ColumnModel column) {
this.column = column;
}
/**
- * カラムソート方式を設定する。
- * @param sortType カラムソート方式
+ * {@inheritDoc}
*/
public void setSortType(SortType sortType) {
this.sortType = sortType;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -51,8 +51,7 @@
}
/**
- * インデックス名を取得する。
- * @return インデックス名
+ * {@inheritDoc}
*/
public String getName() {
return name;
@@ -67,24 +66,21 @@
}
/**
- * ユニークインデックスか否かを取得する。
- * @return ユニークインデックスか否か
+ * {@inheritDoc}
*/
public boolean isUnique() {
return unique;
}
/**
- * インデックス名を設定する。
- * @param name インデックス名
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
}
/**
- * ユニークインデックスか否かを設定する。
- * @param unique ユニークインデックスか否か
+ * {@inheritDoc}
*/
public void setUnique(boolean unique) {
this.unique = unique;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -64,44 +64,42 @@
}
/**
- * 開始スクリプトを取得する。
- * @return 開始スクリプト
+ * {@inheritDoc}
*/
public String getBeginScript() {
return beginScript;
}
+ /**
+ * {@inheritDoc}
+ */
public List<AbstractEntityModel> getConstrainEntities(boolean recursive) {
return process(new GetConstrainEntitiesProcessor(recursive));
}
/**
- * 説明文を取得する。
- * @return 説明文
+ * {@inheritDoc}
*/
public String getDescription() {
return description;
}
/**
- * 終了スクリプトを取得する。
- * @return 終了スクリプト
+ * {@inheritDoc}
*/
public String getEndScript() {
return endScript;
}
/**
- * 論理名を取得する。
- * @return 論理名
+ * {@inheritDoc}
*/
public String getLogicalName() {
return logicalName;
}
/**
- * 名前を取得する。
- * @return 名前
+ * {@inheritDoc}
*/
public String getName() {
return name;
@@ -115,40 +113,35 @@
}
/**
- * 開始スクリプトを設定する。
- * @param beginScript 開始スクリプト
+ * {@inheritDoc}
*/
public void setBeginScript(String beginScript) {
this.beginScript = beginScript;
}
/**
- * 説明文を設定する。
- * @param description 説明文
+ * {@inheritDoc}
*/
public void setDescription(String description) {
this.description = description;
}
/**
- * 終了スクリプトを設定する。
- * @param endScript 終了スクリプト
+ * {@inheritDoc}
*/
public void setEndScript(String endScript) {
this.endScript = endScript;
}
/**
- * 論理名を設定する。
- * @param logicalName 論理名
+ * {@inheritDoc}
*/
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
/**
- * 名前を設定する。
- * @param name 名前
+ * {@inheritDoc}
*/
public void setName(String name) {
this.name = name;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -58,16 +58,14 @@
}
/**
- * このモデルを接続元とするコネクションのリストを取得する。
- * @return このモデルを接続元とするコネクションのリスト
+ * {@inheritDoc}
*/
public List<AbstractConnectionModel> getSourceConnections() {
return sourceConnections;
}
/**
- * このモデルを接続先とするコネクションのリストを取得する。
- * @return このモデルを接続先とするコネクションのリスト
+ * {@inheritDoc}
*/
public List<AbstractConnectionModel> getTargetConnections() {
return targetConnections;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -33,8 +33,7 @@
/**
- * 内容文を取得する。
- * @return 内容文
+ * {@inheritDoc}
*/
public String getContents() {
return contents;
@@ -49,9 +48,8 @@
}
/**
- * 内容文を設定する。
- * @param contents 内容文
- */
+ * {@inheritDoc}
+ */
public void setContents(String contents) {
this.contents = contents;
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -70,8 +70,7 @@
}
/**
- * テーブルCHECK制約のリストを取得する。
- * @return テーブルCHECK制約のリスト
+ * {@inheritDoc}
*/
public List<CheckConstraintModel> getChecks() {
return checks;
@@ -85,8 +84,7 @@
}
/**
- * カラムのリストを取得する。
- * @return カラムのリスト
+ * {@inheritDoc}
*/
public List<ColumnModel> getColumns() {
return columns;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -54,8 +54,7 @@
}
/**
- * VIEW定義SELECT文を取得する。
- * @return VIEW定義SELECT文
+ * {@inheritDoc}
*/
public String getDefinition() {
return definition;
@@ -80,8 +79,7 @@
}
/**
- * VIEW定義SELECT文を設定する。
- * @param definition VIEW定義SELECT文
+ * {@inheritDoc}
*/
public void setDefinition(String definition) {
this.definition = definition;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/ForEachUtil.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -139,6 +139,7 @@
* @param key 処理対象のキー
* @param value 処理対象の値
* @return 引き続きacceptを継続する場合null、ループを終了する場合acceptが返すべき戻り値を返す。
+ * @throws E
*/
R visit(K key, V value) throws E;
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmStringUtil.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -28,14 +28,33 @@
*/
public final class JmStringUtil {
+ /**
+ * 大文字小文字を無視した条件下で、配列中に指定した文字列を含むかどうかを調べる。
+ * @param array 調査対象配列
+ * @param stringToFind 探す文字列
+ * @return 含む場合 <code>true</code>
+ */
public static boolean containsIgnoreCase(String[] array, String stringToFind) {
return indexOfIgnoreCase(array, stringToFind) != ArrayUtils.INDEX_NOT_FOUND;
}
+ /**
+ * 大文字小文字を無視した条件下で、配列中に指定した文字列のインデックスを調べる。
+ * @param array 調査対象配列
+ * @param stringToFind 探す文字列
+ * @return インデックス番号
+ */
public static int indexOfIgnoreCase(String[] array, String stringToFind) {
return indexOfIgnoreCase(array, stringToFind, 0);
}
+ /**
+ * 大文字小文字を無視した条件下で、配列中に指定した文字列のインデックスを調べる。
+ * @param array 調査対象配列
+ * @param stringToFind 探す文字列
+ * @param startIndex 調査開始インデックス
+ * @return インデックス番号
+ */
public static int indexOfIgnoreCase(String[] array, String stringToFind, int startIndex) {
if (array == null) {
return ArrayUtils.INDEX_NOT_FOUND;
@@ -61,9 +80,8 @@
/**
* 文字列の1文字目を大文字にする。
- *
- * @param str 入力文字列
- * @return 出力文字列
+ * @param str 入力文字列
+ * @return 出力文字列
*/
public static String toCapital(final String str) {
final char[] ch = str.toCharArray();
@@ -73,9 +91,8 @@
/**
* SQL名（ex. AGILE_DATABASE）からJavaクラス名（ex. AgileDatabase）を生成する。
- *
- * @param str SQL名
- * @return Javaクラス名
+ * @param str SQL名
+ * @return Javaクラス名
*/
public static String toJavaClassName(final String str) {
return toCapital(toJavaName(str));
@@ -83,10 +100,9 @@
/**
* SQL名（ex. AGILE_DATABASE）からJavaクラス名（ex. AgileDatabase）を生成する。 prifixが存在した場合、取り除く。
- *
- * @param str SQL名
- * @param prefix 接頭辞
- * @return Javaクラス名
+ * @param str SQL名
+ * @param prefix 接頭辞
+ * @return Javaクラス名
*/
public static String toJavaClassName(final String str, final String prefix) {
return toCapital(toJavaName(str, prefix));
@@ -94,9 +110,8 @@
/**
* SQL名（ex. AGILE_DATABASE）からJava名（ex. agileDatabase）を生成する。
- *
- * @param str SQL名
- * @return Java名
+ * @param str SQL名
+ * @return Java名
*/
public static String toJavaName(final String str) {
return toJavaName(str, null);
@@ -104,16 +119,14 @@
/**
* SQL名（ex. AGILE_DATABASE）からJava名（ex. agileDatabase）を生成する。 prifixが存在した場合、取り除く。
- *
- * @param str SQL名
- * @param prefix 接頭辞
- * @return Java名
+ * @param str SQL名
+ * @param prefix 接頭辞
+ * @return Java名
*/
public static String toJavaName(final String str, final String prefix) {
if (str == null) {
return str;
}
-
String low;
if (prefix != null && str.startsWith(prefix)) {
low = str.replaceFirst(prefix, "").toLowerCase(Locale.getDefault());
@@ -132,12 +145,10 @@
}
/**
- * Java名（ex. AgileDatabase, agileDatabase）からSQL名（ex. AGILE_DATABASE）を生成する。
- * prifixを付加する。
- *
- * @param str Java名
- * @param prefix 接頭辞
- * @return SQL名
+ * Java名（ex. AgileDatabase, agileDatabase）からSQL名（ex. AGILE_DATABASE）を生成する。 prifixを付加する。
+ * @param str Java名
+ * @param prefix 接頭辞
+ * @return SQL名
*/
public static String toSQLName(final String str, final String prefix) {
if (str == null || str.length() == 0) {
@@ -152,7 +163,6 @@
sb.setCharAt(i, Character.toUpperCase(c));
}
}
-
if (prefix != null && prefix.length() > 0) {
sb.insert(0, prefix.toUpperCase(Locale.getDefault()));
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/debug/S2ContainerUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/debug/S2ContainerUtil.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/debug/S2ContainerUtil.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -54,6 +54,10 @@
return sb.toString();
}
+ /**
+ * ユーティリティクラス。
+ * @category instance creation
+ */
private S2ContainerUtil() {
}
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -34,10 +34,13 @@
private RootModel rootModel;
+ /** 参照元テーブル */
private TableModel sourceTable;
+ /** 参照先（targetのPKカラム） */
private ColumnModel referencePkColumn;
+ /** 同名カラムが存在しなかった場合、新規作成するかどうか */
private boolean createColumn;
@@ -46,7 +49,7 @@
* @param rootModel
* @param sourceTable 参照元テーブル
* @param referencePkColumn 参照先（targetのPKカラム）
- * @param createColumn 同名かラムが存在しなかった場合、新規作成するかどうか。
+ * @param createColumn 同名カラムが存在しなかった場合、新規作成するかどうか
* @category instance creation
*/
public SetDefaultColumnsProcessor(RootModel rootModel, TableModel sourceTable, ColumnModel referencePkColumn,
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -25,7 +25,7 @@
import org.jiemamy.spec.model.connection.ForeignKeyModel;
/**
- * TODO for daisuke
+ * 指定した主キーに対するマッピング情報を取得するプロセッサ。
* @author daisuke
*/
public class GetMappingProcessor implements Processor<ForeignKeyModel, ForeignKeyMapping, ElementNotFoundException> {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/ProvideForeignKeyNameProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -27,13 +27,15 @@
import org.jiemamy.spec.model.node.TableModel;
/**
- * 適切な初期エンティティ名称を生成する。
+ * 適切な初期外部キー名称を生成する。
* @author daisuke
*/
public class ProvideForeignKeyNameProcessor implements Processor<RootModel, String, RuntimeException> {
+ /** 生成対象の外部キーモデル */
private ForeignKeyModel foreignKeyModel;
+ /** バリデータ */
private IdentifierValidator validator;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -39,13 +39,14 @@
private RootModel rootModel;
+ /** カラムを自動で新規に追加することを許すかどうか */
private boolean createColumnWithFk;
/**
* コンストラクタ。
* @param rootModel
- * @param createColumnWithFk
+ * @param createColumnWithFk
* @category instance creation
*/
public UpdateMappingsProcessor(RootModel rootModel, boolean createColumnWithFk) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetConstrainEntitiesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetConstrainEntitiesProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetConstrainEntitiesProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -34,12 +34,13 @@
public class GetConstrainEntitiesProcessor implements
Processor<AbstractEntityModel, List<AbstractEntityModel>, RuntimeException> {
+ /** 子を再帰的に辿るかどうか */
private boolean recursive;
/**
* コンストラクタ。
- * @param recursive 再帰的に辿るかどうか
+ * @param recursive 子を再帰的に辿るかどうか
* @category instance creation
*/
public GetConstrainEntitiesProcessor(boolean recursive) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetReferenceEntitiesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetReferenceEntitiesProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetReferenceEntitiesProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -34,12 +34,13 @@
public class GetReferenceEntitiesProcessor implements
Processor<AbstractEntityModel, List<AbstractEntityModel>, RuntimeException> {
+ /** 親を再帰的に辿るかどうか */
private boolean recursive;
/**
* コンストラクタ。
- * @param recursive 再帰的に辿るかどうか
+ * @param recursive 親を再帰的に辿るかどうか
* @category instance creation
*/
public GetReferenceEntitiesProcessor(boolean recursive) {
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/CreateNewColumnProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/CreateNewColumnProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/CreateNewColumnProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/01
- *
- * 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.core.utils.processor.entity.table;
-
-import org.jiemamy.core.model.ColumnModelImpl;
-import org.jiemamy.spec.Processor;
-import org.jiemamy.spec.model.ColumnModel;
-import org.jiemamy.spec.model.datatype.DataType;
-import org.jiemamy.spec.model.node.TableModel;
-
-/**
- * 新しい{@link ColumnModel}を作成する。
- * @author daisuke
- */
-public class CreateNewColumnProcessor implements Processor<TableModel, ColumnModel, RuntimeException> {
-
- private ColumnModel columnModel;
-
-
- /**
- * コンストラクタ。
- * @param columnName カラム名
- * @param dataType
- * @category instance creation
- */
- public CreateNewColumnProcessor(String columnName, DataType dataType) {
- columnModel = (new ColumnModelImpl(columnName, dataType));
- }
-
- /**
- * {@inheritDoc}
- */
- public ColumnModel process(TableModel tableModel) {
- tableModel.getColumns().add(columnModel);
- return columnModel;
- }
-
-}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -29,7 +29,7 @@
import org.jiemamy.spec.model.node.TableModel;
/**
- * カラムを取得する。
+ * 指定した名称を持つカラムを取得するプロセッサ。
* @author daisuke
*/
public class GetColumnProcessor implements Processor<TableModel, ColumnModel, TooManyElementsException> {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetConnectionsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetConnectionsProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetConnectionsProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -24,13 +24,14 @@
import org.jiemamy.spec.model.node.AbstractNodeModel;
/**
- * 特定の種類のノードを取得する。
- * @param <T> ノードの種類を表すクラス
+ * 特定の種類のコネクションを取得する。
+ * @param <T> コネクションの種類を表すクラス
* @author daisuke
*/
public class GetConnectionsProcessor<T extends AbstractConnectionModel> implements
Processor<RootModel, List<T>, RuntimeException> {
+ /** コネクションの種類を表すクラス */
private Class<T> clazz;
@@ -44,7 +45,7 @@
/**
* コンストラクタ。
- * @param clazz
+ * @param clazz コネクションの種類を表すクラス
* @category instance creation
*/
public GetConnectionsProcessor(Class<T> clazz) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -32,22 +32,26 @@
/**
* エンティティを取得する。
* @author daisuke
+ * @param <T> エンティティの種類を表すクラス
*/
public class GetEntityProcessor<T extends AbstractEntityModel> implements
Processor<RootModel, AbstractEntityModel, TooManyElementsException> {
+ /** エンティティの種類を表すクラス */
private Class<?> clazz;
+ /** エンティティ名 */
private String entityName;
/**
* コンストラクタ。
* @param <T>
- * @param clazz
- * @param entityName
+ * @param clazz エンティティの種類を表すクラス
+ * @param entityName エンティティ名
* @category instance creation
*/
+ @SuppressWarnings("hiding")
public <T> GetEntityProcessor(Class<T> clazz, String entityName) {
this.clazz = clazz;
this.entityName = entityName;
@@ -55,7 +59,7 @@
/**
* コンストラクタ。
- * @param entityName
+ * @param entityName エンティティ名
* @category instance creation
*/
public GetEntityProcessor(String entityName) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -29,12 +29,13 @@
*/
public class GetNodesProcessor<T extends AbstractNodeModel> implements Processor<RootModel, List<T>, RuntimeException> {
+ /** ノードの種類を表すクラス */
private Class<T> clazz;
/**
* コンストラクタ。
- * @param clazz
+ * @param clazz ノードの種類を表すクラス
* @category instance creation
*/
public GetNodesProcessor(Class<T> clazz) {
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -1,72 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/01
- *
- * 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.core.utils.processor.root;
-
-import java.util.List;
-
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.spec.Processor;
-import org.jiemamy.spec.exception.ElementNotFoundException;
-import org.jiemamy.spec.exception.TooManyElementsException;
-import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.model.node.AbstractNodeModel;
-import org.jiemamy.spec.model.node.TableModel;
-
-/**
- * テーブルを取得する。
- * @author daisuke
- */
-public class GetTableProcessor implements Processor<RootModel, TableModel, TooManyElementsException> {
-
- private String tableName;
-
-
- /**
- * コンストラクタ。
- * @param tableName
- * @category instance creation
- */
- public GetTableProcessor(String tableName) {
- this.tableName = tableName;
- }
-
- /**
- * {@inheritDoc}
- * @throws TooManyElementsException
- */
- public TableModel process(RootModel rootModel) throws TooManyElementsException {
- List<TableModel> tables = CollectionsUtil.newArrayList();
- for (AbstractNodeModel node : rootModel.getNodes()) {
- if (node instanceof TableModel) {
- TableModel table = (TableModel) node;
- if (tableName.equals(table.getName())) {
- tables.add(table);
- }
- }
- }
- if (tables.size() == 0) {
- throw new ElementNotFoundException(rootModel, tableName);
- } else if (tables.size() > 1) {
- throw new TooManyElementsException(rootModel, tableName, tables);
- }
- return tables.get(0);
- }
-
-}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/ProvideEntityNameProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -31,8 +31,10 @@
*/
public class ProvideEntityNameProcessor implements Processor<RootModel, String, RuntimeException> {
+ /** 生成対象のエンティティモデル */
private AbstractEntityModel entityModel;
+ /** バリデータ */
private IdentifierValidator validator;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -28,8 +28,10 @@
*/
public class SetRecordProcessor implements Processor<RecordModel, Void, RuntimeException> {
+ /** カラム */
private ColumnModel column;
+ /** 値 */
private String value;
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -31,15 +31,17 @@
*/
public class GetDataSetProcessor implements Processor<RootModel, List<RecordModel>, RuntimeException> {
+ /** データセットのインデックス番号 */
private int index;
+ /** 対象エンティティ */
private AbstractEntityModel entity;
/**
* コンストラクタ。
- * @param index
- * @param entity
+ * @param index データセットのインデックス番号
+ * @param entity 対象エンティティ
* @category instance creation
*/
public GetDataSetProcessor(int index, AbstractEntityModel entity) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -31,18 +31,21 @@
*/
public class SetDataSetProcessor implements Processor<RootModel, Void, RuntimeException> {
+ /** データセットのインデックス番号 */
private int index;
+ /** 対象エンティティ */
private AbstractEntityModel entity;
+ /** レコードのリスト */
private List<RecordModel> records;
/**
* コンストラクタ。
- * @param index
- * @param entity
- * @param records
+ * @param index データセットのインデックス番号
+ * @param entity 対象エンティティ
+ * @param records レコードのリスト
* @category instance creation
*/
public SetDataSetProcessor(int index, AbstractEntityModel entity, List<RecordModel> records) {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractCollectionVisitor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractCollectionVisitor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractCollectionVisitor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -27,6 +27,7 @@
* @author daisuke
* @param <T> Collectionが保持する型
* @param <R> forEachが返すべき戻り値の型
+ * @param <E> スローする可能性のある例外
*/
public abstract class AbstractCollectionVisitor<T, R, E extends Exception> implements
ForEachUtil.CollectionVisitor<T, R, E> {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractMapVisitor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractMapVisitor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/AbstractMapVisitor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -28,6 +28,7 @@
* @param <K> MapのKeyの型
* @param <V> MapのValueの型
* @param <R> forEachが返すべき戻り値の型
+ * @param <E> スローする可能性のある例外
*/
public abstract class AbstractMapVisitor<K, V, R, E extends Exception> implements ForEachUtil.MapVisitor<K, V, R, E> {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/creator/CreateNewModelProcessor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -18,26 +18,26 @@
*/
package org.jiemamy.creator;
-import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.spec.Processor;
import org.jiemamy.spec.exception.JiemamyRuntimeException;
import org.jiemamy.spec.model.JiemamyModel;
import org.jiemamy.spec.model.RootModel;
/**
- * TODO for daisuke
- * @param <T>
+ * 新しいモデルを生成するプロセッサ。
+ * @param <T> 生成するモデルを表すクラス
* @author daisuke
*/
public class CreateNewModelProcessor<T extends JiemamyModel> implements Processor<RootModel, T, RuntimeException> {
+ /** 生成するモデルを表すクラス */
private Class<?> clazz;
/**
* コンストラクタ。
* @param rootModel
- * @param clazz
+ * @param clazz 生成するモデルを表すクラス
* @category instance creation
*/
public CreateNewModelProcessor(RootModel rootModel, Class<T> clazz) {
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/RootModelImplTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -32,7 +32,7 @@
import org.jiemamy.spec.model.RootModel;
/**
- * TODO for daisuke
+ * {@link RootModelImpl}のテストクラス。
* @author daisuke
*/
public class RootModelImplTest {
@@ -41,7 +41,7 @@
/**
- * TODO for daisuke
+ * setup
* @throws java.lang.Exception
*/
@Before
@@ -51,7 +51,7 @@
}
/**
- * TODO for daisuke
+ * teardown
* @throws java.lang.Exception
*/
@After
@@ -59,8 +59,12 @@
rootModel = null;
}
+ /**
+ * TODO for daisuke
+ * @throws Exception
+ */
@Test
- public void testname() throws Exception {
+ public void test() throws Exception {
assertThat(rootModel.getAdapters(), not(nullValue()));
assertThat(rootModel.getNodes(), not(nullValue()));
assertThat(rootModel.getNodes().size(), is(0));
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -157,14 +157,6 @@
/**
* {@inheritDoc}
*/
- public Constraint init() {
- initialize();
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
public void setName(String name) {
}
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -28,7 +28,7 @@
import org.jiemamy.spec.model.node.TableModel;
/**
- * 外部キー関係のデスと基底クラス。
+ * 外部キー関係のテスト基底クラス。
* @author daisuke
*/
public class ForeignKeyTestBase {
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -74,7 +74,6 @@
rootModel.getNodes().add(rootModel.createJiemamyModel(ViewModel.class).init("view1", "select * from table1"));
rootModel.getNodes().add(rootModel.createJiemamyModel(ViewModel.class).init("view2", "select * from table2"));
- // FIXME ↓ GetNodesProcessorのgenericsと引数が冗長。
assertThat(rootModel.getNodes(TableModel.class).size(), is(3));
assertThat(rootModel.getNodes(ViewModel.class).size(), is(2));
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -45,7 +45,6 @@
*/
public class PostgresqlDialect extends AbstractDialect {
- // FIXME DIしたい。
/** モデルパーサ */
public ModelParser parser = null;
Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -29,7 +29,6 @@
*/
public class Sql99Dialect extends AbstractDialect {
- // FIXME DIしたい。
/** モデルパーサ */
public ModelParser parser = new Sql99ModelParser();
Modified: artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/ObservableImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/ObservableImpl.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.event/src/main/java/org/jiemamy/event/ObservableImpl.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -18,8 +18,10 @@
*/
package org.jiemamy.event;
+import org.jiemamy.spec.event.Observable;
+
/**
- * TODO for daisuke
+ * {@link Observable}の実装クラス
* @author daisuke
*/
public class ObservableImpl extends AbstractObservable {
Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -116,7 +116,7 @@
/**
* {@link TableModel#setBeginScript(String)}内ではfirePropertyChange()を実行していないが、
* {@link SetterInterceptor}が期待通り動作していれば
- * {@link TableModel#fireModelChange(java.lang.reflect.Field)}がAOPされて、
+ * {@link Observable#fireModelChange(java.lang.reflect.Field)}がAOPされて、
* Test用の{@link ModelChangeListener}がEventを補足しているはず。
*/
@Test
Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -131,10 +131,10 @@
// 上記ColumnModel用Collectionに対する操作を他のCollectionに対しても行う。
listener.clear();
- CheckConstraintModel check01 = rootModel.createJiemamyModel(CheckConstraintModel.class).init();
+ CheckConstraintModel check01 =
+ rootModel.createJiemamyModel(CheckConstraintModel.class).init("check_expression");
checks.add(check01);
check01.setName("check_changedName");
- check01.setExpression("check_expression");
IndexModel index01 = rootModel.createJiemamyModel(IndexModel.class).init();
indexes.add(index01);
index01.setName("index01");
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -47,13 +47,18 @@
}
/**
- * {@inheritDoc}
+ * モデルが初期化済みかどうかを調べる。
+ * @return 初期化済みであれば <code>true</code>
*/
public boolean isInitialized() {
// TODO Auto-generated method stub
return false;
}
+ /**
+ * 新規アダプタを登録する。
+ * @param adapter
+ */
public void registerAdapter(Object adapter) {
}
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -70,22 +70,7 @@
/**
* {@inheritDoc}
*/
- public DataType init() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isInitialized() {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
+ @SuppressWarnings("unused")
public <R, T extends JiemamyModel, E extends Exception>R process(Processor<T, R, E> processor) throws E {
// TODO Auto-generated method stub
return null;
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -81,14 +81,7 @@
/**
* {@inheritDoc}
*/
- public Constraint init() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
+ @SuppressWarnings("unused")
public <R, T extends JiemamyModel, E extends Exception>R process(Processor<T, R, E> processor) throws E {
// TODO Auto-generated method stub
return null;
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/view/DiagramPresentationModelAppender.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -25,7 +25,7 @@
import org.jiemamy.spec.view.model.DiagramPresentations;
/**
- * TODO for daisuke
+ * {@link RootModel} に対して {@link DiagramPresentationModel}を追加/削除するアペンダ。
* @author daisuke
*/
public class DiagramPresentationModelAppender implements JiemamyModelAppender {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -22,7 +22,9 @@
import org.seasar.framework.util.tiger.CollectionsUtil;
-import org.jiemamy.event.AbstractObservable;
+import org.jiemamy.event.ObservableImpl;
+import org.jiemamy.spec.Adaptable;
+import org.jiemamy.spec.event.Observable;
import org.jiemamy.spec.model.JiemamyModel;
/**
@@ -31,7 +33,7 @@
* @author daisuke
*/
@SuppressWarnings("serial")
-public class ModelContainer extends AbstractObservable {
+public class ModelContainer implements Adaptable {
/** コンテナ名 */
private String name;
@@ -39,6 +41,8 @@
/** コンテナが持つ子モデル */
private List<JiemamyModel> children = CollectionsUtil.newArrayList();
+ private Observable observable = new ObservableImpl();
+
/**
* コンストラクタ。
@@ -49,6 +53,24 @@
}
/**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public <T>T getAdapter(Class<T> adapter) {
+ if (adapter == Observable.class) {
+ return (T) observable;
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Object> getAdapters() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
* childrenを取得する。
* @return children
*/
@@ -65,6 +87,16 @@
}
/**
+ * {@inheritDoc}
+ */
+ public boolean hasAdapter(Class<?> adapter) {
+ if (adapter == Observable.class) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
* コンテナが持つ子モデルを設定する。
* @param children コンテナが持つ子モデル
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -70,15 +70,6 @@
}
/**
- * デフォルト値を取得する。
- * @return デフォルト値
- */
- @SuppressWarnings("unchecked")
- private <T>T getDefault() {
- return (T) defaultValue;
- }
-
- /**
* デフォルト値をbooleanとして取得する。
* @return デフォルト値
*/
@@ -134,4 +125,14 @@
return key;
}
+ /**
+ * デフォルト値を取得する。
+ * @param <T>
+ * @return デフォルト値
+ */
+ @SuppressWarnings("unchecked")
+ private <T>T getDefault() {
+ return (T) defaultValue;
+ }
+
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -93,7 +93,7 @@
Label label = new Label(composite, SWT.NULL);
label.setText("wizard.export.folder"); // RESOURCE
- txtOutputFolder = new Text(composite, SWT.BORDER);
+ txtOutputFolder = (new Text(composite, SWT.BORDER));
txtOutputFolder.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
txtOutputFolder.setEditable(false);
txtOutputFolder.setText(defaultFolder);
@@ -112,8 +112,8 @@
}
/**
- * TODO for daisuke
- * @return
+ * 出力先フォルダを取得する。
+ * @return 出力先フォルダ
*/
public File getOutputFolder() {
IResource resource = getOutputFolderResource();
@@ -124,8 +124,8 @@
}
/**
- * TODO for daisuke
- * @return
+ * 出力先フォルダをリソースとして取得する。
+ * @return 出力先フォルダ
*/
public IResource getOutputFolderResource() {
String outputDir = txtOutputFolder.getText();
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Adaptable.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Adaptable.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Adaptable.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,6 +41,10 @@
*/
<T>T getAdapter(Class<T> adapter);
+ /**
+ * このオブジェクトが持つアダプタのリストを取得する。
+ * @return アダプタのリスト
+ */
List<Object> getAdapters();
/**
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Processor.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Processor.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/Processor.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -23,7 +23,6 @@
*
* cf. http://d.hatena.ne.jp/daisuke-m/20080801/1217594494
*
- * @see org.jiemamy.spec.model.AbstractModel
* @param <R> 結果の型
* @param <T> 処理対象のオブジェクトの型
* @param <E> 処理が投げる可能性のある例外の型（投げない場合は{@link RuntimeException}を指定）
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/exception/CannotAppendException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/exception/CannotAppendException.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/exception/CannotAppendException.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -18,11 +18,38 @@
*/
package org.jiemamy.spec.exception;
+import org.jiemamy.spec.model.JiemamyModel;
+
/**
- * TODO for daisuke
+ * 指定した親モデルに対して、子モデルを追加できない場合にスローされる。
* @author daisuke
*/
@SuppressWarnings("serial")
public class CannotAppendException extends JiemamyRuntimeException {
+ /** 親モデル */
+ private JiemamyModel parent;
+
+ /** 子モデル */
+ private JiemamyModel child;
+
+
+ /**
+ * コンストラクタ。
+ * @param parent 親モデル
+ * @param child 子モデル
+ * @category instance creation
+ */
+ public CannotAppendException(JiemamyModel parent, JiemamyModel child) {
+ this.parent = parent;
+ this.child = child;
+ }
+
+ public JiemamyModel getChild() {
+ return child;
+ }
+
+ public JiemamyModel getParent() {
+ return parent;
+ }
}
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/Context.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/Context.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/Context.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -21,7 +21,7 @@
import java.util.Map;
/**
- * TODO for daisuke
+ * コンテキスト情報インターフェイス。
* @author daisuke
*/
public interface Context {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -22,7 +22,7 @@
import org.jiemamy.spec.extension.Context;
/**
- * TODO for daisuke
+ * エクスポートに関するコンテキスト情報
* @author daisuke
*/
public interface ExportContext extends Context, Adaptable {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -22,7 +22,7 @@
import org.jiemamy.spec.extension.Context;
/**
- * TODO for daisuke
+ * インポートに関するコンテキスト情報インターフェイス。
* @author daisuke
*/
public interface ImportContext extends Context, Adaptable {
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/ColumnModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/ColumnModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/ColumnModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -85,9 +85,9 @@
/**
* モデルの初期化を行う。
- * @param columnName
- * @param dataType
- * @return
+ * @param columnName カラム名
+ * @param dataType データ型
+ * @return 自モデル
*/
ColumnModel init(String columnName, DataType dataType);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/DomainModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/DomainModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/DomainModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -85,9 +85,9 @@
/**
* モデルを初期化する。
- * @param name
- * @param dataType
- * @return
+ * @param name ドメイン名
+ * @param dataType データ型
+ * @return 自モデル
*/
DomainModel init(String name, DataType dataType);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/JiemamyModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/JiemamyModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/JiemamyModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -78,8 +78,8 @@
void dispose();
/**
- * TODO for daisuke
- * @return
+ * モデルが初期化済みかどうかを調べる。
+ * @return 初期化済みであれば <code>true</code>
*/
boolean isInitialized();
}
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/RootModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/RootModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/RootModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -136,7 +136,7 @@
/**
* モデルを初期化する。
- * @return
+ * @return 自モデル
*/
RootModel init();
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyMapping.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyMapping.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyMapping.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -42,8 +42,8 @@
ColumnModel getReferenceColumn();
/**
- * TODO for daisuke
- * @return
+ * モデルを初期化する。
+ * @return 自インスタンス
*/
ForeignKeyMapping init();
@@ -58,7 +58,7 @@
* @param rootModel
* @param sourceTable
* @param referencePkColumn
- * @param createColumnWithFk
+ * @param createColumnWithFk カラムを自動で新規に追加することを許すかどうか
*/
void setDefaultColumns(RootModel rootModel, TableModel sourceTable, ColumnModel referencePkColumn,
boolean createColumnWithFk);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/connection/ForeignKeyModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -50,7 +50,7 @@
public String getDescription();
/**
- * 遅延評価の初期状態。を取得する。
+ * 遅延評価の初期状態を取得する。
* @return 遅延評価の初期状態。
*/
public InitiallyCheckTime getInitiallyCheckTime();
@@ -62,9 +62,9 @@
public String getLogicalName();
/**
- * 指定した主キーカラムに制約される参照元カラムを取得する。
- * @param referencePkColumn
- * @return
+ * 指定した主キーカラムに対するマッピング情報を取得する。
+ * @param referencePkColumn 主キーカラム
+ * @return マッピング情報
*/
public ForeignKeyMapping getMapping(ColumnModel referencePkColumn);
@@ -101,18 +101,18 @@
/**
* モデルを初期化する。
* @param rootModel
- * @param source
- * @param target
- * @return
+ * @param source 制約を受けるテーブル
+ * @param target 制約を与える参照テーブル
+ * @return 自モデル
*/
public ForeignKeyModel init(RootModel rootModel, TableModel source, TableModel target);
/**
* モデルを初期化する。
- * @param fkName
- * @param source
- * @param target
- * @return
+ * @param fkName 外部キー名
+ * @param source 制約を受けるテーブル
+ * @param target 制約を与える参照テーブル
+ * @return 自モデル
*/
public ForeignKeyModel init(String fkName, TableModel source, TableModel target);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/CheckConstraintModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/CheckConstraintModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/CheckConstraintModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -31,10 +31,11 @@
String getExpression();
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @param expression チェック制約定義式
+ * @return 自モデル
*/
- CheckConstraintModel init();
+ CheckConstraintModel init(String expression);
/**
* CHEKC制約定義式を設定する。
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/NotNullConstraintModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/NotNullConstraintModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/NotNullConstraintModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -25,8 +25,8 @@
public interface NotNullConstraintModel extends Constraint {
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @return 自モデル
*/
NotNullConstraintModel init();
}
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/PrimaryKeyConstraintModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/PrimaryKeyConstraintModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/constraint/PrimaryKeyConstraintModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -25,8 +25,8 @@
public interface PrimaryKeyConstraintModel extends Constraint {
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @return 自モデル
*/
PrimaryKeyConstraintModel init();
}
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/InsertDataSetModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/InsertDataSetModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/InsertDataSetModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -43,9 +43,9 @@
Map<AbstractEntityModel, List<RecordModel>> getRecords();
/**
- * TODO for daisuke
- * @param name
- * @return
+ * モデルの初期化を行う。
+ * @param name データセット名
+ * @return 自モデル
*/
InsertDataSetModel init(String name);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/RecordModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/RecordModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/dataset/RecordModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -36,8 +36,8 @@
Map<ColumnModel, String> getValues();
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @return 自モデル
*/
RecordModel init();
}
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/datatype/DataType.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/datatype/DataType.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/datatype/DataType.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -36,12 +36,6 @@
List<Object> getAdapters();
/**
- * TODO for daisuke
- * @return
- */
- DataType init();
-
- /**
* アダプタが適用されていた場合は、取り除く。
* 適用されていなかった場合は何もせず、自分自身を返す。
* @return アダプタが何も適用されていない状態のAdaptable
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexColumnModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexColumnModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexColumnModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -40,9 +40,9 @@
SortType getSortType();
/**
- * TODO for daisuke
- * @param column
- * @return
+ * モデルの初期化を行う。
+ * @param column インデックス対象カラム
+ * @return 自モデル
*/
IndexColumnModel init(ColumnModel column);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/index/IndexModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -41,8 +41,8 @@
String getName();
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @return 自モデル
*/
IndexModel init();
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/StickyModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/StickyModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/StickyModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -31,8 +31,8 @@
String getContents();
/**
- * TODO for daisuke
- * @return
+ * モデルの初期化を行う。
+ * @return 自モデル
*/
StickyModel init();
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/TableModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/TableModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/TableModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -68,16 +68,16 @@
List<ColumnModel> getPrimaryKeyColumns();
/**
- * モデルを初期化する。
+ * モデルの初期化を行う。
* @param rootModel
- * @return
+ * @return 自モデル
*/
TableModel init(RootModel rootModel);
/**
- * モデルを初期化する。
+ * モデルの初期化を行う。
* @param tableName
- * @return
+ * @return 自モデル
*/
TableModel init(String tableName);
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/ViewModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/ViewModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/model/node/ViewModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -33,17 +33,17 @@
String getDefinition();
/**
- * モデルを初期化する。
+ * モデルの初期化を行う。
* @param rootModel
- * @return
+ * @return 自モデル
*/
ViewModel init(RootModel rootModel);
/**
- * モデルを初期化する。
- * @param viewName
- * @param definition
- * @return
+ * モデルの初期化を行う。
+ * @param viewName ビュー名
+ * @param definition VIEW定義SELECT文
+ * @return 自モデル
*/
ViewModel init(String viewName, String definition);
Modified: zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/model/dataset/InsertDataSetModelChangeListener.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/model/dataset/InsertDataSetModelChangeListener.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.event/src/main/java/org/jiemamy/spec/event/model/dataset/InsertDataSetModelChangeListener.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -29,7 +29,7 @@
public interface InsertDataSetModelChangeListener extends ModelChangeListener {
/**
- * {@link InsertDataSetModel}が保持する{@link java.util.List<org.jiemamy.spec.model.dataset.RecordModel>}のCollectionに対する変更を処理する。
+ * {@link InsertDataSetModel}が保持するレコードのCollectionに対する変更を処理する。
*
* @param event
*/
Modified: zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/view/model/DiagramPresentationModel.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/view/model/DiagramPresentationModel.java 2008-10-04 11:34:20 UTC (rev 1987)
+++ zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/view/model/DiagramPresentationModel.java 2008-10-04 14:29:23 UTC (rev 1988)
@@ -66,9 +66,9 @@
Map<AbstractNodeModel, JmRectangle> getNodeLayouts();
/**
- * TODO for daisuke
- * @param name
- * @return
+ * モデルの初期化を行う。
+ * @param name プレゼンテーション名
+ * @return 自モデル
*/
DiagramPresentationModel init(String name);