[Jiemamy-notify] commit [1935] [GEN-59] パッケージ整理。

svnno****@sourc***** svnno****@sourc*****
2008年 9月 18日 (木) 08:44:26 JST

• 前の記事 [Jiemamy-notify] commit [1934] [GEN-59] いっぱいテスト落ちてるけど、ひとまず。
• 次の記事 [Jiemamy-notify] commit [1936] ビルドエラーの解消。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 1935
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1935
Author:   daisuke_m
Date:     2008-09-18 08:44:26 +0900 (Thu, 18 Sep 2008)

Log Message:
-----------
[GEN-59] パッケージ整理。

Modified Paths:
--------------
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.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/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeEvent.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeSupport.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/parser/DefaultModelParser.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/extension/dialect/validator/DefaultIdentifierValidator.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/interpreter/JiemamyInterpreterStab.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/constraint/ConstraintUtil.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/NotNullConstraintModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/PrimaryKeyConstraintModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/UniqueConstraintModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.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/adapter/DataTypeAdapter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/PrecisionedDataTypeAdapter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/SizedDataTypeAdapter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/TimezonedDataTypeAdapter.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/AbstractNodeModelImpl.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/utils/processor/IsSubColumnOfProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessor.java
    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/RemoveInheritedColumnsProcessor.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/test/java/org/jiemamy/core/model/ApplicationModelCreator.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ModelIdManagerTest.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/model/typedef/datatype/impl/GenericIntegerDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/IntegerDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBigIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBlobDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericClobDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericRealDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
    artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java
    artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/MySqlModelParser.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/test/java/org/jiemamy/dialect/mysql/parser/MySqlModelParserTest.java
    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/PostgresqlQuoter.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
    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/datatype/IntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParser.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/DataTypeConverter.java
    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/SerializeUniqueConstraintModel.java
    artemis/trunk/org.jiemamy.spec/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/CanceledException.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/DataTypeNotFoundException.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ExportException.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/IllegalDataTypeMappingException.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ImportException.java

Added Paths:
-----------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/DefaultConnectionAdvisor.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/InheritanceColumnModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/
    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/GeneralDataTypeImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/SpecialDataTypeImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Exporter.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Importer.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ConnectionAdvisor.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Dialect.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/IdentifierValidator.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ModelParser.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Quoter.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/DataTypeMapping.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/MappingInfo.java

Removed Paths:
-------------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/MappingInfo.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/quoter/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/package-info.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/package-info.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ConnectionAdvisor.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/DataTypeMapping.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Dialect.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ExportContext.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Exporter.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/IdentifierValidator.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ImportContext.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Importer.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ModelParser.java
    artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Quoter.java


-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -29,9 +29,9 @@
 import org.jiemamy.core.interpreter.JiemamyInterpreter;
 import org.jiemamy.core.interpreter.JiemamyInterpreterStab;
 import org.jiemamy.spec.exception.ExportException;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ExportContext;
-import org.jiemamy.spec.extension.Exporter;
+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;
 
 /**

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -25,9 +25,9 @@
 import org.jiemamy.spec.exception.GenericModelingModeException;
 import org.jiemamy.spec.exception.ImportException;
 import org.jiemamy.spec.exception.TooManyElementsException;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ImportContext;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.ImportContext;
+import org.jiemamy.spec.extension.composer.Importer;
+import org.jiemamy.spec.extension.dialect.Dialect;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.connection.ForeignKeyMapping;
 import org.jiemamy.spec.model.connection.ForeignKeyModel;

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -34,11 +34,11 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.extension.exporter.ExportContextImpl;
+import org.jiemamy.core.extension.composer.ExportContextImpl;
 import org.jiemamy.core.model.ApplicationModelCreator;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ExportContext;
-import org.jiemamy.spec.extension.Exporter;
+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;
 
 /**

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -32,12 +32,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.extension.importer.ImportContextImpl;
+import org.jiemamy.core.extension.composer.ImportContextImpl;
 import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.GetTableProcessor;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ImportContext;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.ImportContext;
+import org.jiemamy.spec.extension.composer.Importer;
+import org.jiemamy.spec.extension.dialect.Dialect;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.TableModel;
 

Modified: artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-09-17 23:44:26 UTC (rev 1935)
@@ -256,25 +256,23 @@
  org.jiemamy.core.event.model.typedef,
  org.jiemamy.core.event.model.typedef.constraint,
  org.jiemamy.core.event.model.typedef.datatype.adapter,
+ org.jiemamy.core.extension.composer,
  org.jiemamy.core.extension.dialect,
- org.jiemamy.core.extension.dialect.advisor,
  org.jiemamy.core.extension.dialect.mapping,
  org.jiemamy.core.extension.dialect.parser,
  org.jiemamy.core.extension.dialect.parser.expression,
  org.jiemamy.core.extension.dialect.validator,
- org.jiemamy.core.extension.exporter,
- org.jiemamy.core.extension.importer,
  org.jiemamy.core.interpreter,
  org.jiemamy.core.model,
  org.jiemamy.core.model.connection,
+ org.jiemamy.core.model.constraint,
  org.jiemamy.core.model.dataset,
+ org.jiemamy.core.model.datatype,
+ org.jiemamy.core.model.datatype.adapter,
+ org.jiemamy.core.model.index,
  org.jiemamy.core.model.node,
- org.jiemamy.core.model.node.index,
  org.jiemamy.core.model.presentation,
- org.jiemamy.core.model.typedef,
  org.jiemamy.core.model.typedef.constraint,
- org.jiemamy.core.model.typedef.datatype,
- org.jiemamy.core.model.typedef.datatype.adapter,
  org.jiemamy.core.model.typedef.datatype.impl,
  org.jiemamy.core.utils,
  org.jiemamy.core.utils.debug,

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeEvent.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeEvent.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeEvent.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,6 +16,9 @@
 
 import java.util.Collection;
 
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.Observable;
+
 /**
  * {@link Observable}のCollectionが発火する変更Event。
  * @param <C> Collectionの実装Class (e.g. java.util.Map, java.util.List)

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeListener.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -30,7 +30,7 @@
 public interface InsertDataSetModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link InsertDataSetModel}が保持する{@link  java.util.List<org.jiemamy.core.model.dataset.RecordModel>}のCollectionに対する変更を処理する。
+	 * {@link InsertDataSetModel}が保持する{@link List<RecordModel>}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeListener.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -29,7 +29,7 @@
 public interface AbstractNodeModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link AbstractNodeModel}が保持する{@link org.jiemamy.core.model.connection.AbstractConnectionModel}のCollectionに対する変更を処理する。
+	 * {@link AbstractNodeModel}が保持する{@link AbstractConnectionModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
@@ -37,7 +37,7 @@
 			ObservableCollectionChangeEvent<List<AbstractConnectionModel>, AbstractConnectionModel> event);
 	
 	/**
-	 * {@link AbstractNodeModel}が保持する{@link org.jiemamy.core.model.connection.AbstractConnectionModel}のCollectionに対する変更を処理する。
+	 * {@link AbstractNodeModel}が保持する{@link AbstractConnectionModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeListener.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -31,21 +31,21 @@
 public interface TableModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.constraint.CheckConstraintModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link CheckConstraintModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
 	void checkCollectionChange(ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event);
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.ColumnModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link ColumnModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
 	void columnCollectionChange(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event);
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.node.index.IndexModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link IndexModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeListener.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -33,7 +33,7 @@
 public interface DiagramPresentationModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link DiagramPresentationModel}が保持する{@link  java.util.List<JmPoint>}のCollectionに対する変更を処理する。
+	 * {@link DiagramPresentationModel}が保持する{@link  List<JmPoint>}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeSupport.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -17,7 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.util.ModelChangeListener;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeSupport.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.typedef.constraint.UniqueConstraintModel;
+import org.jiemamy.core.model.constraint.UniqueConstraintModel;
 import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.util.ModelChangeListener;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeSupport.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.spec.util.ModelChangeEvent;
 import org.jiemamy.spec.util.ModelChangeListener;
 

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContextImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/12
+ *
+ * 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.extension.composer;
+
+import org.jiemamy.core.interpreter.AbstractContext;
+import org.jiemamy.spec.extension.composer.ExportContext;
+
+/**
+ * エクスポートを行う際のコンテキスト情報。
+ * 
+ * @author daisuke
+ */
+public class ExportContextImpl extends AbstractContext implements ExportContext {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public <T>T getAdapter(Class<T> adapter) {
+		return null;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasAdapter(Class<?> adapter) {
+		return false;
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ExportContextImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContextImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/12
+ *
+ * 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.extension.composer;
+
+import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
+import org.jiemamy.core.interpreter.AbstractContext;
+import org.jiemamy.spec.extension.composer.ImportContext;
+
+/**
+ * インポートを行う際のコンテキスト情報。
+ * 
+ * @author daisuke
+ */
+public class ImportContextImpl extends AbstractContext implements ImportContext {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	public <T>T getAdapter(Class<T> adapter) {
+		if (adapter == DatabaseReadingContext.class) {
+			DatabaseReadingContext instance = null;
+			try {
+				instance = (DatabaseReadingContext) adapter.newInstance();
+				instance.setProperties(getProperties());
+			} catch (InstantiationException ignore) {
+				// ignore: return null
+			} catch (IllegalAccessException ignore) {
+				// ignore: return null
+			}
+			return (T) instance;
+		}
+		return null;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasAdapter(Class<?> adapter) {
+		if (adapter.isAssignableFrom(DatabaseReadingContext.class)) {
+			return true;
+		}
+		return false;
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/composer/ImportContextImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/DefaultConnectionAdvisor.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/DefaultConnectionAdvisor.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/DefaultConnectionAdvisor.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/DefaultConnectionAdvisor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core.extension.dialect;
+
+import java.sql.Connection;
+
+import org.jiemamy.spec.extension.dialect.ConnectionAdvisor;
+
+/**
+ * {@link ConnectionAdvisor}のデフォルト実装。
+ * @author daisuke
+ */
+public class DefaultConnectionAdvisor implements ConnectionAdvisor {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void setUpRead(Connection connection) {
+		// nothing to do
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void tearDownRead(Connection connection) {
+		// nothing to do
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/DefaultConnectionAdvisor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/GeneralDataTypeMapping.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -23,7 +23,7 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.spec.exception.DataTypeNotFoundException;
-import org.jiemamy.spec.extension.DataTypeMapping;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.spec.model.datatype.DataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 import org.jiemamy.spec.model.datatype.SpecialDataType;

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/MappingInfo.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/MappingInfo.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/MappingInfo.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,50 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/27
- *
- * 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.extension.dialect.mapping;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.jiemamy.spec.model.datatype.GeneralDataType;
-
-/**
- * マッピング情報を指定するアノテーション。
- * @author daisuke
- */
- ＠ Target(ElementType.TYPE)
- ＠ Retention(RetentionPolicy.RUNTIME)
-public @interface MappingInfo {
-	
-	/**
-	 * エイリアス型名の配列
-	 */
-	String[] alias() default {};
-	
-	/**
-	 * 一般データ型のクラス
-	 */
-	Class<? extends GeneralDataType> generic();
-	
-	/**
-	 * 型名
-	 */
-	String typeName();
-}

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -23,13 +23,14 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.typedef.datatype.adapter.DataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.DataTypeAdapter;
 import org.jiemamy.core.utils.JmStringUtil;
 import org.jiemamy.spec.exception.DataTypeNotFoundException;
 import org.jiemamy.spec.exception.IllegalDataTypeImplementationException;
 import org.jiemamy.spec.exception.IllegalDialectImplementation;
-import org.jiemamy.spec.extension.DataTypeMapping;
-import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.dialect.Dialect;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.DataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 import org.jiemamy.spec.model.datatype.SpecialDataType;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/DefaultModelParser.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/DefaultModelParser.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/DefaultModelParser.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.extension.dialect.parser;
 
-import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.extension.dialect.ModelParser;
 import org.jiemamy.spec.model.RootModel;
 
 /**

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
-import org.jiemamy.spec.extension.IdentifierValidator;
+import org.jiemamy.spec.extension.dialect.IdentifierValidator;
 
 /**
  * {@link IdentifierValidator}の抽象実装。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/DefaultIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/DefaultIdentifierValidator.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/DefaultIdentifierValidator.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.extension.dialect.validator;
 
-import org.jiemamy.spec.extension.IdentifierValidator;
+import org.jiemamy.spec.extension.dialect.IdentifierValidator;
 
 /**
  * {@link IdentifierValidator}のデフォルト実装。全て通す。

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -30,7 +30,7 @@
 import org.jiemamy.core.utils.ForEachUtil;
 import org.jiemamy.core.utils.visitor.AbstractResultSetVisitor;
 import org.jiemamy.core.utils.visitor.impl.EntityNamesVisitor;
-import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.dialect.Dialect;
 
 /**
  * データベースを読み込む。

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.interpreter;
 
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ExportContext;
+import org.jiemamy.spec.extension.composer.ExportContext;
+import org.jiemamy.spec.extension.dialect.Dialect;
 import org.jiemamy.spec.model.RootModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterStab.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterStab.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterStab.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -23,8 +23,8 @@
 
 import org.jiemamy.core.utils.EntityDependencyCalculator;
 import org.jiemamy.spec.exception.JiemamyRuntimeException;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.ExportContext;
+import org.jiemamy.spec.extension.composer.ExportContext;
+import org.jiemamy.spec.extension.dialect.Dialect;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
 import org.jiemamy.spec.model.node.TableModel;

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.model;
+
+import org.jiemamy.core.model.constraint.ConstraintSetModelImpl;
+import org.jiemamy.core.model.constraint.ConstraintUtil;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+import org.jiemamy.spec.model.datatype.DataType;
+
+/**
+ * カラム定義モデル
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class ColumnModelImpl extends AbstractModel implements ColumnModel {
+	
+	/** 物理名 */
+	private String name;
+	
+	/** 論理名 */
+	private String logicalName;
+	
+	/** 型 */
+	private DataType dataType;
+	
+	/** デフォルト値 */
+	private String defaultValue;
+	
+	/** 制約 */
+	private ConstraintSetModel constraints = new ConstraintSetModelImpl();
+	
+	/** 単純インデックスの有無 */
+	private boolean simpleIndex;
+	
+	/** 自由文字列 */
+	private String freeString;
+	
+	/** 説明文 */
+	private String description;
+	
+	/**
+	 * 代表カラムかどうか
+	 * 
+	 * 例えばEMP, DEPTテーブルがあり、EMPがDEPTを外部キー参照しているとする。
+	 * EMPのINSERT文用データを入力中に、ユーザは「DEPT_ID = 3 の部署」ではなく
+	 * 「経理部」をイメージするのが自然である。SQL的には 3 を出力すべきだが、
+	 * 入力は「経理部」で行いたい。このように、DEPTテーブルを代表するカラムを
+	 * 代表カラムと呼ぶ。
+	 */
+	private boolean representation;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ColumnModelImpl() {
+		this(null, null);
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name
+	 * @param dataType
+	 * @category instance creation
+	 */
+	public ColumnModelImpl(String name, DataType dataType) {
+		this.name = name;
+		this.dataType = dataType;
+	}
+	
+	/**
+	 * 制約を追加する。
+	 * @param constraint 制約
+	 */
+	public void addConstraint(Constraint constraint) {
+		constraints.add(constraint);
+	}
+	
+	/**
+	 * 制約を取得する。
+	 * @return 制約
+	 */
+	public ConstraintSetModel getConstraints() {
+		if (dataType instanceof DomainModel) {
+			DomainModel domainModel = (DomainModel) dataType;
+			return ConstraintUtil.marge(constraints, domainModel.getConstraint());
+		}
+		return constraints;
+	}
+	
+	/**
+	 * 型を取得する。
+	 * @return 型
+	 */
+	public DataType getDataType() {
+		return dataType;
+	}
+	
+	/**
+	 * デフォルト値を取得する。
+	 * @return デフォルト値
+	 */
+	public String getDefaultValue() {
+		if (dataType instanceof DomainModel && defaultValue == null) {
+			DomainModel domainModel = (DomainModel) dataType;
+			return domainModel.getDefaultValue();
+		}
+		return defaultValue;
+	}
+	
+	/**
+	 * 説明文を取得する。
+	 * @return 説明文
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * 自由文字列を取得する。
+	 * @return 自由文字列
+	 */
+	public String getFreeString() {
+		if (dataType instanceof DomainModel && freeString == null) {
+			DomainModel domainModel = (DomainModel) dataType;
+			return domainModel.getFreeString();
+		}
+		return freeString;
+	}
+	
+	/**
+	 * 論理名を取得する。
+	 * @return 論理名
+	 */
+	public String getLogicalName() {
+		return logicalName;
+	}
+	
+	/**
+	 * 物理名を取得する。
+	 * @return 物理名
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * 指定する制約を持つかどうか調べる。
+	 * @param clazz 制約クラス
+	 * @return 制約を持つ場合は<tt>true</tt>
+	 */
+	public boolean hasConstraint(Class<? extends Constraint> clazz) {
+		if (dataType instanceof DomainModel) {
+			DomainModel domainModel = (DomainModel) dataType;
+			return ConstraintUtil.marge(constraints, domainModel.getConstraint()).has(clazz);
+		}
+		return constraints.has(clazz);
+	}
+	
+	/**
+	 * 代表カラムかどうかを取得する。
+	 * @return 代表カラムかどうか
+	 */
+	public boolean isRepresentation() {
+		return representation;
+	}
+	
+	/**
+	 * 単純インデックスの有無を取得する。
+	 * @return 単純インデックスの有無
+	 */
+	public boolean isSimpleIndex() {
+		if (dataType instanceof DomainModel && simpleIndex == false) {
+			DomainModel domainModel = (DomainModel) dataType;
+			return domainModel.isSimpleIndex();
+		}
+		return simpleIndex;
+	}
+	
+	/**
+	 * 制約を削除する。
+	 * @param constraintClass   制約クラス
+	 */
+	public void removeConstraint(Class<? extends Constraint> constraintClass) {
+		constraints.remove(constraintClass);
+	}
+	
+	/**
+	 * 型を設定する。
+	 * @param dataType   型
+	 */
+	public void setDataType(DataType dataType) {
+		this.dataType = dataType;
+	}
+	
+	/**
+	 * デフォルト値を設定する。
+	 * @param defaultValue   デフォルト値
+	 */
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+	
+	/**
+	 * 説明文を設定する。
+	 * @param description   説明文
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * 自由文字列を設定する。
+	 * @param freeString   自由文字列
+	 */
+	public void setFreeString(String freeString) {
+		this.freeString = freeString;
+	}
+	
+	/**
+	 * 論理名を設定する。
+	 * @param logicalName   論理名
+	 */
+	public void setLogicalName(String logicalName) {
+		this.logicalName = logicalName;
+	}
+	
+	/**
+	 * 物理名を設定する。
+	 * @param name   物理名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 代表カラムかどうかを設定する。
+	 * @param representation   代表カラムかどうか
+	 */
+	public void setRepresentation(boolean representation) {
+		this.representation = representation;
+	}
+	
+	/**
+	 * 単純インデックスの有無を設定する。
+	 * @param simpleIndex   単純インデックスの有無
+	 */
+	public void setSimpleIndex(boolean simpleIndex) {
+		this.simpleIndex = simpleIndex;
+	}
+	
+//	/**
+//	 * {@inheritDoc}
+//	 */
+//	@Override
+//	public String toString() {
+//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+//	}
+	
+	/**
+	 * 制約を設定する。
+	 * @param constraints   制約
+	 */
+	void setConstraints(ConstraintSetModel constraints) {
+		this.constraints = constraints;
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ColumnModelImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.model;
+
+import org.jiemamy.core.model.constraint.ConstraintSetModelImpl;
+import org.jiemamy.spec.adapter.Adaptable;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+import org.jiemamy.spec.model.datatype.DataType;
+
+/**
+ * ドメイン定義モデル
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class DomainModelImpl extends AbstractModel implements DomainModel {
+	
+	/** ドメイン名 */
+	private String name;
+	
+	/** 論理名 */
+	private String logicalName;
+	
+	/** ドメインとして定義された型 */
+	private DataType dataType;
+	
+	/** デフォルト値 */
+	private String defaultValue;
+	
+	/** 制約 */
+	private ConstraintSetModel constraints = new ConstraintSetModelImpl();
+	
+	/** 単純インデックスの有無 */
+	private boolean simpleIndex;
+	
+	/** 自由文字列 */
+	private String freeString;
+	
+	/** 説明文 */
+	private String description;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public DomainModelImpl() {
+		this(null, null);
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name
+	 * @param dataType
+	 * @category instance creation
+	 */
+	public DomainModelImpl(String name, DataType dataType) {
+		this.name = name;
+		this.dataType = dataType;
+	}
+	
+	/**
+	 * 制約を追加する。
+	 * @param constraint 制約
+	 */
+	public void addConstraint(Constraint constraint) {
+		constraints.add(constraint);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public <T>T getAdapter(Class<T> adapter) {
+		return dataType.getAdapter(adapter);
+	}
+	
+	/**
+	 * 制約を取得する。
+	 * @return 制約のSet
+	 */
+	public ConstraintSetModel getConstraint() {
+		return constraints;
+	}
+	
+	/**
+	 * ドメインとして定義された型を取得する。
+	 * @return ドメインとして定義された型
+	 */
+	public DataType getDataType() {
+		return dataType;
+	}
+	
+	/**
+	 * デフォルト値を取得する。
+	 * @return デフォルト値
+	 */
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+	
+	/**
+	 * 説明文を取得する。
+	 * @return 説明文
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * 自由文字列を取得する。
+	 * @return 自由文字列
+	 */
+	public String getFreeString() {
+		return freeString;
+	}
+	
+	/**
+	 * 論理名を取得する。
+	 * @return 論理名
+	 */
+	public String getLogicalName() {
+		return logicalName;
+	}
+	
+	/**
+	 * ドメイン名を取得する。
+	 * @return ドメイン名
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean hasAdapter(Class<?> adapter) {
+		return dataType.hasAdapter(adapter);
+	}
+	
+	/**
+	 * 指定する制約を持つかどうか調べる。
+	 * @param clazz 制約クラス
+	 * @return 制約を持つ場合は<tt>true</tt>
+	 */
+	public boolean hasConstraint(Class<? extends Constraint> clazz) {
+		return constraints.has(clazz);
+	}
+	
+	/**
+	 * 単純インデックスの有無を取得する。
+	 * @return 単純インデックスの有無
+	 */
+	public boolean isSimpleIndex() {
+		return simpleIndex;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public Adaptable removeAdapter() {
+		return dataType.removeAdapter();
+	}
+	
+	/**
+	 * 制約を削除する。
+	 * @param constraintClass 制約クラス
+	 */
+	public void removeConstraint(Class<? extends Constraint> constraintClass) {
+		constraints.remove(constraintClass);
+	}
+	
+	/**
+	 * ドメインとして定義された型を設定する。
+	 * @param dataType ドメインとして定義された型
+	 */
+	public void setDataType(DataType dataType) {
+		this.dataType = dataType;
+	}
+	
+	/**
+	 * デフォルト値を設定する。
+	 * @param defaultValue デフォルト値
+	 */
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+	
+	/**
+	 * 説明文を設定する。
+	 * @param description 説明文
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * 自由文字列を設定する。
+	 * @param freeString 自由文字列
+	 */
+	public void setFreeString(String freeString) {
+		this.freeString = freeString;
+	}
+	
+	/**
+	 * ドメイン名を設定する。
+	 * @param name ドメイン名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 単純インデックスの有無を設定する。
+	 * @param simpleIndex 単純インデックスの有無
+	 */
+	public void setSimpleIndex(boolean simpleIndex) {
+		this.simpleIndex = simpleIndex;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return dataType.toString();
+	}
+	
+	/**
+	 * 制約を取得する。
+	 * @return 制約
+	 */
+	ConstraintSetModel getConstraints() {
+		return constraints;
+	}
+	
+	/**
+	 * 制約を設定する。
+	 * @param constraints 制約
+	 */
+	void setConstraints(ConstraintSetModel constraints) {
+		this.constraints = constraints;
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/DomainModelImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/InheritanceColumnModel.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/InheritanceColumnModel.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/InheritanceColumnModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.model;
+
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.datatype.DataType;
+
+/**
+ * 継承カラムモデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class InheritanceColumnModel extends ColumnModelImpl implements ColumnModel {
+	
+	/** 基底カラム */
+	private ColumnModel superColumn;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public InheritanceColumnModel() {
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param superColumn 継承基底カラム
+	 * @category instance creation
+	 */
+	public InheritanceColumnModel(ColumnModel superColumn) {
+		this.superColumn = superColumn;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addConstraint(Constraint constraint) {
+		superColumn.getConstraints().add(constraint);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DataType getDataType() {
+		return superColumn.getDataType();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getDefaultValue() {
+		return superColumn.getDefaultValue();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getDescription() {
+		return superColumn.getDescription();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getFreeString() {
+		return superColumn.getFreeString();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getName() {
+		return superColumn.getName();
+	}
+	
+	/**
+	 * 基底カラムを取得する。
+	 * @return 基底カラム
+	 */
+	public ColumnModel getSuperColumn() {
+		return superColumn;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean hasConstraint(Class<? extends Constraint> clazz) {
+		return superColumn.getConstraints().has(clazz);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeConstraint(Class<? extends Constraint> constraintClass) {
+		superColumn.getConstraints().remove(constraintClass);
+	}
+	
+	/**
+	 * 基底カラムを設定する。
+	 * @param superColumn 基底カラム
+	 */
+	void setSuperColumn(ColumnModel superColumn) {
+		this.superColumn = superColumn;
+	}
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/InheritanceColumnModel.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -272,7 +272,7 @@
 	 * @param mappings マッピングのリスト
 	 */
 	void setMappings(List<ForeignKeyMapping> mappings) {
-		mappings = mappings;
+		this.mappings = mappings;
 	}
 	
 }

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint)

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/typedef/constraint/AbstractConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/AbstractConstraintModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import org.jiemamy.core.model.AbstractModel;
 import org.jiemamy.spec.model.constraint.Constraint;

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/typedef/constraint/CheckConstraintModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/CheckConstraintModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import org.jiemamy.spec.model.constraint.CheckConstraintModel;
 

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/typedef/constraint/ConstraintSetModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintSetModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import java.util.Collection;
 import java.util.Map;
@@ -107,7 +107,7 @@
 	 * @param constraintMap 制約のMap
 	 */
 	public void setConstraintMap(Map<Class<? extends Constraint>, Constraint> constraintMap) {
-		constraintMap = constraintMap;
+		this.constraintMap = constraintMap;
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/ConstraintUtil.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import org.jiemamy.spec.model.constraint.Constraint;
 import org.jiemamy.spec.model.constraint.ConstraintSetModel;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/NotNullConstraintModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/NotNullConstraintModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import org.jiemamy.spec.model.constraint.NotNullConstraintModel;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/PrimaryKeyConstraintModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/PrimaryKeyConstraintModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/UniqueConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/UniqueConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/UniqueConstraintModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 
 /**
  * UNIQUE制約モデル。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/package-info.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/constraint/package-info.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -6,5 +6,5 @@
  * 
  * @author daisuke
  */
-package org.jiemamy.core.model.typedef.constraint;
+package org.jiemamy.core.model.constraint;
 

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -61,6 +61,6 @@
 	 * @param values カラムに対応するデータ
 	 */
 	void setValues(Map<ColumnModel, String> values) {
-		values = values;
+		this.values = values;
 	}
 }

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/AbstractDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/08
+ *
+ * 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.model.datatype;
+
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.core.model.datatype.adapter.DataTypeAdapter;
+import org.jiemamy.spec.model.datatype.DataType;
+
+/**
+ * データ型抽象クラス。
+ * @author daisuke
+ */
+public abstract class AbstractDataType extends AbstractModel implements DataType {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public AbstractDataType removeAdapter() {
+		return this;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return this.getClass().getName();
+	}
+	
+	/**
+	 * 自身に適用可能なアダプタを登録する。
+	 * @param adapter   アダプタのインスタンス
+	 */
+	protected void register(DataTypeAdapter adapter) {
+		addAdapter(adapter);
+	}
+	
+}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/GeneralDataTypeImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/GeneralDataTypeImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/GeneralDataTypeImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/19
+ *
+ * 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.model.datatype;
+
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+
+/**
+ * DBに依存しない、汎用的DataTypeクラス。
+ * @author daisuke
+ */
+public abstract class GeneralDataTypeImpl extends AbstractDataType implements GeneralDataType {
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/GeneralDataTypeImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/SpecialDataTypeImpl.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/SpecialDataTypeImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/SpecialDataTypeImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/19
+ *
+ * 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.model.datatype;
+
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
+
+/**
+ * DBに依存した、特殊データ型クラス。
+ * @author daisuke
+ */
+public abstract class SpecialDataTypeImpl extends AbstractDataType {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		MappingInfo annotation = this.getClass().getAnnotation(MappingInfo.class);
+		return annotation.typeName();
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/SpecialDataTypeImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter)

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/DataTypeAdapter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/DataTypeAdapter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/DataTypeAdapter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.datatype.adapter;
+package org.jiemamy.core.model.datatype.adapter;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.JiemamyModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/PrecisionedDataTypeAdapter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/PrecisionedDataTypeAdapter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.datatype.adapter;
+package org.jiemamy.core.model.datatype.adapter;
 
 import org.jiemamy.core.model.AbstractModel;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/SizedDataTypeAdapter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/SizedDataTypeAdapter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.datatype.adapter;
+package org.jiemamy.core.model.datatype.adapter;
 
 import org.jiemamy.core.model.AbstractModel;
 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/TimezonedDataTypeAdapter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/adapter/TimezonedDataTypeAdapter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.typedef.datatype.adapter;
+package org.jiemamy.core.model.datatype.adapter;
 
 import org.jiemamy.core.model.AbstractModel;
 

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/package-info.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,11 @@
+/**
+ * Jiemamyの「データ型」のドメインモデルを提供するパッケージ。
+ * 
+ * このパッケージは、データベースの持つデータ型のドメインモデルクラスを含む。
+ * 例えば、VARCHAR, INTEGER, 挙げられ、データベース毎にデータ型のセットを持つ。
+ * 「型定義」と「データ型」は混同しないように注意すること。
+ * 
+ * @author daisuke
+ */
+package org.jiemamy.core.model.datatype;
+


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/datatype/package-info.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index (from rev 1934, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index)

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/node/index/IndexColumnModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexColumnModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.node.index;
+package org.jiemamy.core.model.index;
 
 import org.jiemamy.core.model.AbstractModel;
 import org.jiemamy.spec.model.ColumnModel;

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/node/index/IndexModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/index/IndexModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.core.model.node.index;
+package org.jiemamy.core.model.index;
 
 import java.util.ArrayList;
 import java.util.List;

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -78,7 +78,7 @@
 	 * @param sourceConnections このモデルを接続元とするコネクションのリスト
 	 */
 	void setSourceConnections(List<AbstractConnectionModel> sourceConnections) {
-		sourceConnections = sourceConnections;
+		this.sourceConnections = sourceConnections;
 	}
 	
 	/**
@@ -86,6 +86,6 @@
 	 * @param targetConnections このモデルを接続先とするコネクションのリスト
 	 */
 	void setTargetConnections(List<AbstractConnectionModel> targetConnections) {
-		targetConnections = targetConnections;
+		this.targetConnections = targetConnections;
 	}
 }

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -134,6 +134,6 @@
 	 * @param indexes インデックスのリスト
 	 */
 	void setIndexes(List<IndexModel> indexes) {
-		indexes = indexes;
+		this.indexes = indexes;
 	}
 }

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,290 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModelImpl;
-import org.jiemamy.core.model.typedef.constraint.ConstraintUtil;
-import org.jiemamy.spec.model.ColumnModel;
-import org.jiemamy.spec.model.DomainModel;
-import org.jiemamy.spec.model.constraint.Constraint;
-import org.jiemamy.spec.model.constraint.ConstraintSetModel;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * カラム定義モデル
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ColumnModelImpl extends AbstractModel implements ColumnModel {
-	
-	/** 物理名 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** 型 */
-	private DataType dataType;
-	
-	/** デフォルト値 */
-	private String defaultValue;
-	
-	/** 制約 */
-	private ConstraintSetModel constraints = new ConstraintSetModelImpl();
-	
-	/** 単純インデックスの有無 */
-	private boolean simpleIndex;
-	
-	/** 自由文字列 */
-	private String freeString;
-	
-	/** 説明文 */
-	private String description;
-	
-	/**
-	 * 代表カラムかどうか
-	 * 
-	 * 例えばEMP, DEPTテーブルがあり、EMPがDEPTを外部キー参照しているとする。
-	 * EMPのINSERT文用データを入力中に、ユーザは「DEPT_ID = 3 の部署」ではなく
-	 * 「経理部」をイメージするのが自然である。SQL的には 3 を出力すべきだが、
-	 * 入力は「経理部」で行いたい。このように、DEPTテーブルを代表するカラムを
-	 * 代表カラムと呼ぶ。
-	 */
-	private boolean representation;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ColumnModelImpl() {
-		this(null, null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name
-	 * @param dataType
-	 * @category instance creation
-	 */
-	public ColumnModelImpl(String name, DataType dataType) {
-		this.name = name;
-		this.dataType = dataType;
-	}
-	
-	/**
-	 * 制約を追加する。
-	 * @param constraint 制約
-	 */
-	public void addConstraint(Constraint constraint) {
-		constraints.add(constraint);
-	}
-	
-	/**
-	 * 制約を取得する。
-	 * @return 制約
-	 */
-	public ConstraintSetModel getConstraints() {
-		if (dataType instanceof DomainModel) {
-			DomainModel domainModel = (DomainModel) dataType;
-			return ConstraintUtil.marge(constraints, domainModel.getConstraint());
-		}
-		return constraints;
-	}
-	
-	/**
-	 * 型を取得する。
-	 * @return 型
-	 */
-	public DataType getDataType() {
-		return dataType;
-	}
-	
-	/**
-	 * デフォルト値を取得する。
-	 * @return デフォルト値
-	 */
-	public String getDefaultValue() {
-		if (dataType instanceof DomainModel && defaultValue == null) {
-			DomainModel domainModel = (DomainModel) dataType;
-			return domainModel.getDefaultValue();
-		}
-		return defaultValue;
-	}
-	
-	/**
-	 * 説明文を取得する。
-	 * @return 説明文
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * 自由文字列を取得する。
-	 * @return 自由文字列
-	 */
-	public String getFreeString() {
-		if (dataType instanceof DomainModel && freeString == null) {
-			DomainModel domainModel = (DomainModel) dataType;
-			return domainModel.getFreeString();
-		}
-		return freeString;
-	}
-	
-	/**
-	 * 論理名を取得する。
-	 * @return 論理名
-	 */
-	public String getLogicalName() {
-		return logicalName;
-	}
-	
-	/**
-	 * 物理名を取得する。
-	 * @return 物理名
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * 指定する制約を持つかどうか調べる。
-	 * @param clazz 制約クラス
-	 * @return 制約を持つ場合は<tt>true</tt>
-	 */
-	public boolean hasConstraint(Class<? extends Constraint> clazz) {
-		if (dataType instanceof DomainModel) {
-			DomainModel domainModel = (DomainModel) dataType;
-			return ConstraintUtil.marge(constraints, domainModel.getConstraint()).has(clazz);
-		}
-		return constraints.has(clazz);
-	}
-	
-	/**
-	 * 代表カラムかどうかを取得する。
-	 * @return 代表カラムかどうか
-	 */
-	public boolean isRepresentation() {
-		return representation;
-	}
-	
-	/**
-	 * 単純インデックスの有無を取得する。
-	 * @return 単純インデックスの有無
-	 */
-	public boolean isSimpleIndex() {
-		if (dataType instanceof DomainModel && simpleIndex == false) {
-			DomainModel domainModel = (DomainModel) dataType;
-			return domainModel.isSimpleIndex();
-		}
-		return simpleIndex;
-	}
-	
-	/**
-	 * 制約を削除する。
-	 * @param constraintClass   制約クラス
-	 */
-	public void removeConstraint(Class<? extends Constraint> constraintClass) {
-		constraints.remove(constraintClass);
-	}
-	
-	/**
-	 * 型を設定する。
-	 * @param dataType   型
-	 */
-	public void setDataType(DataType dataType) {
-		this.dataType = dataType;
-	}
-	
-	/**
-	 * デフォルト値を設定する。
-	 * @param defaultValue   デフォルト値
-	 */
-	public void setDefaultValue(String defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-	
-	/**
-	 * 説明文を設定する。
-	 * @param description   説明文
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * 自由文字列を設定する。
-	 * @param freeString   自由文字列
-	 */
-	public void setFreeString(String freeString) {
-		this.freeString = freeString;
-	}
-	
-	/**
-	 * 論理名を設定する。
-	 * @param logicalName   論理名
-	 */
-	public void setLogicalName(String logicalName) {
-		this.logicalName = logicalName;
-	}
-	
-	/**
-	 * 物理名を設定する。
-	 * @param name   物理名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * 代表カラムかどうかを設定する。
-	 * @param representation   代表カラムかどうか
-	 */
-	public void setRepresentation(boolean representation) {
-		this.representation = representation;
-	}
-	
-	/**
-	 * 単純インデックスの有無を設定する。
-	 * @param simpleIndex   単純インデックスの有無
-	 */
-	public void setSimpleIndex(boolean simpleIndex) {
-		this.simpleIndex = simpleIndex;
-	}
-	
-//	/**
-//	 * {@inheritDoc}
-//	 */
-//	@Override
-//	public String toString() {
-//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
-//	}
-	
-	/**
-	 * 制約を設定する。
-	 * @param constraints   制約
-	 */
-	void setConstraints(ConstraintSetModel constraints) {
-		constraints = constraints;
-	}
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,265 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModelImpl;
-import org.jiemamy.spec.adapter.Adaptable;
-import org.jiemamy.spec.model.DomainModel;
-import org.jiemamy.spec.model.constraint.Constraint;
-import org.jiemamy.spec.model.constraint.ConstraintSetModel;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * ドメイン定義モデル
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class DomainModelImpl extends AbstractModel implements DomainModel {
-	
-	/** ドメイン名 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** ドメインとして定義された型 */
-	private DataType dataType;
-	
-	/** デフォルト値 */
-	private String defaultValue;
-	
-	/** 制約 */
-	private ConstraintSetModel constraints = new ConstraintSetModelImpl();
-	
-	/** 単純インデックスの有無 */
-	private boolean simpleIndex;
-	
-	/** 自由文字列 */
-	private String freeString;
-	
-	/** 説明文 */
-	private String description;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public DomainModelImpl() {
-		this(null, null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name
-	 * @param dataType
-	 * @category instance creation
-	 */
-	public DomainModelImpl(String name, DataType dataType) {
-		this.name = name;
-		this.dataType = dataType;
-	}
-	
-	/**
-	 * 制約を追加する。
-	 * @param constraint 制約
-	 */
-	public void addConstraint(Constraint constraint) {
-		constraints.add(constraint);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public <T>T getAdapter(Class<T> adapter) {
-		return dataType.getAdapter(adapter);
-	}
-	
-	/**
-	 * 制約を取得する。
-	 * @return 制約のSet
-	 */
-	public ConstraintSetModel getConstraint() {
-		return constraints;
-	}
-	
-	/**
-	 * ドメインとして定義された型を取得する。
-	 * @return ドメインとして定義された型
-	 */
-	public DataType getDataType() {
-		return dataType;
-	}
-	
-	/**
-	 * デフォルト値を取得する。
-	 * @return デフォルト値
-	 */
-	public String getDefaultValue() {
-		return defaultValue;
-	}
-	
-	/**
-	 * 説明文を取得する。
-	 * @return 説明文
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * 自由文字列を取得する。
-	 * @return 自由文字列
-	 */
-	public String getFreeString() {
-		return freeString;
-	}
-	
-	/**
-	 * 論理名を取得する。
-	 * @return 論理名
-	 */
-	public String getLogicalName() {
-		return logicalName;
-	}
-	
-	/**
-	 * ドメイン名を取得する。
-	 * @return ドメイン名
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean hasAdapter(Class<?> adapter) {
-		return dataType.hasAdapter(adapter);
-	}
-	
-	/**
-	 * 指定する制約を持つかどうか調べる。
-	 * @param clazz 制約クラス
-	 * @return 制約を持つ場合は<tt>true</tt>
-	 */
-	public boolean hasConstraint(Class<? extends Constraint> clazz) {
-		return constraints.has(clazz);
-	}
-	
-	/**
-	 * 単純インデックスの有無を取得する。
-	 * @return 単純インデックスの有無
-	 */
-	public boolean isSimpleIndex() {
-		return simpleIndex;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Adaptable removeAdapter() {
-		return dataType.removeAdapter();
-	}
-	
-	/**
-	 * 制約を削除する。
-	 * @param constraintClass 制約クラス
-	 */
-	public void removeConstraint(Class<? extends Constraint> constraintClass) {
-		constraints.remove(constraintClass);
-	}
-	
-	/**
-	 * ドメインとして定義された型を設定する。
-	 * @param dataType ドメインとして定義された型
-	 */
-	public void setDataType(DataType dataType) {
-		this.dataType = dataType;
-	}
-	
-	/**
-	 * デフォルト値を設定する。
-	 * @param defaultValue デフォルト値
-	 */
-	public void setDefaultValue(String defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-	
-	/**
-	 * 説明文を設定する。
-	 * @param description 説明文
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * 自由文字列を設定する。
-	 * @param freeString 自由文字列
-	 */
-	public void setFreeString(String freeString) {
-		this.freeString = freeString;
-	}
-	
-	/**
-	 * ドメイン名を設定する。
-	 * @param name ドメイン名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * 単純インデックスの有無を設定する。
-	 * @param simpleIndex 単純インデックスの有無
-	 */
-	public void setSimpleIndex(boolean simpleIndex) {
-		this.simpleIndex = simpleIndex;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		return dataType.toString();
-	}
-	
-	/**
-	 * 制約を取得する。
-	 * @return 制約
-	 */
-	ConstraintSetModel getConstraints() {
-		return constraints;
-	}
-	
-	/**
-	 * 制約を設定する。
-	 * @param constraints 制約
-	 */
-	void setConstraints(ConstraintSetModel constraints) {
-		this.constraints = constraints;
-	}
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,131 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import org.jiemamy.spec.model.ColumnModel;
-import org.jiemamy.spec.model.constraint.Constraint;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * 継承カラムモデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class InheritanceColumnModel extends ColumnModelImpl implements ColumnModel {
-	
-	/** 基底カラム */
-	private ColumnModel superColumn;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public InheritanceColumnModel() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param superColumn 継承基底カラム
-	 * @category instance creation
-	 */
-	public InheritanceColumnModel(ColumnModel superColumn) {
-		this.superColumn = superColumn;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void addConstraint(Constraint constraint) {
-		superColumn.getConstraints().add(constraint);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DataType getDataType() {
-		return superColumn.getDataType();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getDefaultValue() {
-		return superColumn.getDefaultValue();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getDescription() {
-		return superColumn.getDescription();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getFreeString() {
-		return superColumn.getFreeString();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getName() {
-		return superColumn.getName();
-	}
-	
-	/**
-	 * 基底カラムを取得する。
-	 * @return 基底カラム
-	 */
-	public ColumnModel getSuperColumn() {
-		return superColumn;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean hasConstraint(Class<? extends Constraint> clazz) {
-		return superColumn.getConstraints().has(clazz);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void removeConstraint(Class<? extends Constraint> constraintClass) {
-		superColumn.getConstraints().remove(constraintClass);
-	}
-	
-	/**
-	 * 基底カラムを設定する。
-	 * @param superColumn 基底カラム
-	 */
-	void setSuperColumn(ColumnModel superColumn) {
-		superColumn = superColumn;
-	}
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,65 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/08
- *
- * 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.model.typedef.datatype;
-
-import java.util.List;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.datatype.adapter.DataTypeAdapter;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * データ型抽象クラス。
- * @author daisuke
- */
-public abstract class AbstractDataType extends AbstractModel implements DataType {
-	
-	/**
-	 * {@inheritDoc}
-	 * publicとして公開。
-	 */
-	@Override
-	public List<Object> getAdapters() {
-		return super.getAdapters();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public AbstractDataType removeAdapter() {
-		return this;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		return this.getClass().getName();
-	}
-	
-	/**
-	 * 自身に適用可能なアダプタを登録する。
-	 * @param adapter   アダプタのインスタンス
-	 */
-	protected void register(DataTypeAdapter adapter) {
-		addAdapter(adapter);
-	}
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,29 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/19
- *
- * 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.model.typedef.datatype;
-
-import org.jiemamy.spec.model.datatype.GeneralDataType;
-
-/**
- * DBに依存しない、汎用的DataTypeクラス。
- * @author daisuke
- */
-public abstract class GeneralDataTypeImpl extends AbstractDataType implements GeneralDataType {
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,38 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/19
- *
- * 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.model.typedef.datatype;
-
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-
-/**
- * DBに依存した、特殊データ型クラス。
- * @author daisuke
- */
-public abstract class SpecialDataTypeImpl extends AbstractDataType {
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		MappingInfo annotation = this.getClass().getAnnotation(MappingInfo.class);
-		return annotation.typeName();
-	}
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/package-info.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/package-info.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,11 +0,0 @@
-/**
- * Jiemamyの「データ型」のドメインモデルを提供するパッケージ。
- * 
- * このパッケージは、データベースの持つデータ型のドメインモデルクラスを含む。
- * 例えば、VARCHAR, INTEGER, 挙げられ、データベース毎にデータ型のセットを持つ。
- * 「型定義」と「データ型」は混同しないように注意すること。
- * 
- * @author daisuke
- */
-package org.jiemamy.core.model.typedef.datatype;
-

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/package-info.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/package-info.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,11 +0,0 @@
-/**
- * Jiemamyの「型定義」のドメインモデルを提供するパッケージ。
- * 
- * このパッケージは、型定義を表現するドメインモデルクラスを含む。
- * 型定義とは、例えば「foo DECIMAL(5,2) UNIQUE NOT NULL」という情報である。
- * 「型定義」と「データ型」は混同しないように注意すること。
- * 
- * @author daisuke
- */
-package org.jiemamy.core.model.typedef;
-

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/IsSubColumnOfProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/IsSubColumnOfProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/IsSubColumnOfProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.utils.processor;
 
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.spec.model.ColumnModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.util.Processor;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.spec.model.ColumnModel;
 import org.jiemamy.spec.model.node.TableModel;
 import org.jiemamy.spec.util.Processor;

Modified: 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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/CreateNewColumnProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.typedef.ColumnModelImpl;
+import org.jiemamy.core.model.ColumnModelImpl;
 import org.jiemamy.spec.model.ColumnModel;
 import org.jiemamy.spec.model.datatype.DataType;
 import org.jiemamy.spec.model.node.TableModel;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RemoveInheritedColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RemoveInheritedColumnsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RemoveInheritedColumnsProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.core.utils.processor.IsSubColumnOfProcessor;
 import org.jiemamy.spec.model.ColumnModel;
 import org.jiemamy.spec.model.node.TableModel;
@@ -42,7 +42,7 @@
 	 * @category instance creation
 	 */
 	public RemoveInheritedColumnsProcessor(TableModel parentTable) {
-		parentTable = parentTable;
+		this.parentTable = parentTable;
 	}
 	
 	/**

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -44,7 +44,7 @@
 	 */
 	public GetDataSetProcessor(int index, AbstractEntityModel entity) {
 		this.index = index;
-		entity = entity;
+		this.entity = 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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -47,8 +47,8 @@
 	 */
 	public SetDataSetProcessor(int index, AbstractEntityModel entity, List<RecordModel> records) {
 		this.index = index;
-		entity = entity;
-		records = records;
+		this.entity = entity;
+		this.records = records;
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -23,10 +23,10 @@
 
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
+import org.jiemamy.core.model.constraint.NotNullConstraintModelImpl;
+import org.jiemamy.core.model.constraint.PrimaryKeyConstraintModelImpl;
+import org.jiemamy.core.model.constraint.UniqueConstraintModel;
 import org.jiemamy.core.model.dataset.RecordModelImpl;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModelImpl;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModelImpl;
-import org.jiemamy.core.model.typedef.constraint.UniqueConstraintModel;
 import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.NumericDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ModelIdManagerTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ModelIdManagerTest.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ModelIdManagerTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -25,6 +25,7 @@
 import org.junit.Test;
 
 import org.jiemamy.core.model.node.TableModelImpl;
+import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.node.TableModel;
 
 /**
@@ -48,7 +49,7 @@
 	}
 	
 	/**
-	 * {@link org.jiemamy.core.model.ModelIdManager#register(org.jiemamy.core.model.AbstractModel)} のためのテスト・メソッド。
+	 * {@link org.jiemamy.core.model.ModelIdManager#register(JiemamyModel)} のためのテスト・メソッド。
 	 */
 	@Test
 	public void test_newModelIdが正しく動作するか確認する() {
@@ -58,7 +59,7 @@
 	}
 	
 	/**
-	 * {@link org.jiemamy.core.model.ModelIdManager#unregister(org.jiemamy.core.model.AbstractModel)} のためのテスト・メソッド。
+	 * {@link org.jiemamy.core.model.ModelIdManager#unregister(JiemamyModel)} のためのテスト・メソッド。
 	 */
 	@Test
 	public void test_removeModelIdが正しく動作するか確認する() {

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -29,6 +29,7 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.core.model.constraint.ConstraintSetModelImpl;
 import org.jiemamy.spec.model.constraint.Constraint;
 import org.jiemamy.spec.model.constraint.ConstraintSetModel;
 

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericIntegerDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericIntegerDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericIntegerDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/IntegerDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/IntegerDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/IntegerDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -27,13 +27,13 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.extension.dialect.advisor.DefaultConnectionAdvisor;
+import org.jiemamy.core.extension.dialect.DefaultConnectionAdvisor;
 import org.jiemamy.core.extension.dialect.mapping.SpecialDataTypeMapping;
 import org.jiemamy.core.extension.dialect.parser.DefaultModelParser;
 import org.jiemamy.core.extension.dialect.validator.DefaultIdentifierValidator;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModelImpl;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModelImpl;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.constraint.NotNullConstraintModelImpl;
+import org.jiemamy.core.model.constraint.PrimaryKeyConstraintModelImpl;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.core.utils.ForEachUtil;
 import org.jiemamy.core.utils.JmIOUtil;
 import org.jiemamy.core.utils.processor.entity.table.CreateNewColumnProcessor;
@@ -42,12 +42,12 @@
 import org.jiemamy.core.utils.visitor.AbstractResultSetVisitor;
 import org.jiemamy.spec.exception.DataTypeNotFoundException;
 import org.jiemamy.spec.exception.IllegalDataTypeMappingException;
-import org.jiemamy.spec.extension.ConnectionAdvisor;
-import org.jiemamy.spec.extension.DataTypeMapping;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.IdentifierValidator;
-import org.jiemamy.spec.extension.ModelParser;
-import org.jiemamy.spec.extension.Quoter;
+import org.jiemamy.spec.extension.dialect.ConnectionAdvisor;
+import org.jiemamy.spec.extension.dialect.Dialect;
+import org.jiemamy.spec.extension.dialect.IdentifierValidator;
+import org.jiemamy.spec.extension.dialect.ModelParser;
+import org.jiemamy.spec.extension.dialect.Quoter;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.spec.model.ColumnModel;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
@@ -145,7 +145,7 @@
 	 * @param advisor {@link ConnectionAdvisor}
 	 */
 	protected void setAdvisor(ConnectionAdvisor advisor) {
-		advisor = advisor;
+		this.advisor = advisor;
 	}
 	
 	/**
@@ -161,7 +161,7 @@
 	 * @param parser {@link ModelParser}
 	 */
 	protected void setParser(ModelParser parser) {
-		parser = parser;
+		this.parser = parser;
 	}
 	
 	/**
@@ -169,7 +169,7 @@
 	 * @param quoter {@link Quoter}
 	 */
 	protected void setQuoter(Quoter quoter) {
-		quoter = quoter;
+		this.quoter = quoter;
 	}
 	
 	/**
@@ -177,7 +177,7 @@
 	 * @param validator {@link IdentifierValidator}
 	 */
 	protected void setValidator(IdentifierValidator validator) {
-		validator = validator;
+		this.validator = validator;
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,7 @@
  */
 package org.jiemamy.dialect;
 
-import org.jiemamy.spec.extension.Quoter;
-import org.jiemamy.spec.extension.Quoter.QuoteKind;
+import org.jiemamy.spec.extension.dialect.Quoter;
 
 /**
  * {@link Quoter}のデフォルト実装。

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBigIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBigIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBigIntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBlobDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBlobDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBlobDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericClobDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericClobDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericClobDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericIntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericRealDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericRealDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericRealDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 
-import org.jiemamy.core.extension.dialect.advisor.DefaultConnectionAdvisor;
+import org.jiemamy.core.extension.dialect.DefaultConnectionAdvisor;
 import org.jiemamy.core.extension.dialect.mapping.GeneralDataTypeMapping;
 import org.jiemamy.core.extension.dialect.validator.ReservedWordsProvider;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
@@ -33,12 +33,12 @@
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
 import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
-import org.jiemamy.spec.extension.ConnectionAdvisor;
-import org.jiemamy.spec.extension.DataTypeMapping;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.IdentifierValidator;
-import org.jiemamy.spec.extension.ModelParser;
-import org.jiemamy.spec.extension.Quoter;
+import org.jiemamy.spec.extension.dialect.ConnectionAdvisor;
+import org.jiemamy.spec.extension.dialect.Dialect;
+import org.jiemamy.spec.extension.dialect.IdentifierValidator;
+import org.jiemamy.spec.extension.dialect.ModelParser;
+import org.jiemamy.spec.extension.dialect.Quoter;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.spec.model.RootModel;
 import org.jiemamy.spec.model.node.AbstractEntityModel;
 

Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -69,6 +69,7 @@
 	 * setup
 	 * @throws java.lang.Exception
 	 */
+	@SuppressWarnings("unchecked")
 	@Before
 	public void setUp() throws Exception {
 		dialect = new AbstractDialect() {

Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -28,9 +28,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBlobDataType;
 import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.mysql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/MySqlModelParser.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/MySqlModelParser.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/MySqlModelParser.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -20,7 +20,7 @@
 
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
 import org.jiemamy.dialect.mysql.parser.expression.MySqlRootModelExpression;
-import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.extension.dialect.ModelParser;
 import org.jiemamy.spec.model.RootModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/test/java/org/jiemamy/dialect/mysql/parser/MySqlModelParserTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/test/java/org/jiemamy/dialect/mysql/parser/MySqlModelParserTest.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/test/java/org/jiemamy/dialect/mysql/parser/MySqlModelParserTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -33,7 +33,7 @@
 public class MySqlModelParserTest {
 	
 	/**
-	 * {@link org.jiemamy.dialect.mysql.parser.MySqlModelParser#parse(org.jiemamy.core.model.RootModel)} のためのテスト・メソッド。
+	 * {@link org.jiemamy.dialect.mysql.parser.MySqlModelParser#parse(RootModel)} のためのテスト・メソッド。
 	 */
 	@Test
 	public void testParser() {

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -37,7 +37,7 @@
 import org.jiemamy.dialect.postgresql.datatype.TimestampDataType;
 import org.jiemamy.dialect.postgresql.datatype.VarbitDataType;
 import org.jiemamy.dialect.postgresql.datatype.VarcharDataType;
-import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.extension.dialect.ModelParser;
 
 /**
  * PostgreSQLに対するSQL方言実装クラス。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.spec.extension.Quoter;
+import org.jiemamy.spec.extension.dialect.Quoter;
 
 /**
  * PostgreSQL用 {@link Quoter}実装。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBlobDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericClobDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
+import org.jiemamy.spec.extension.dialect.mapping.MappingInfo;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -30,16 +30,16 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
 import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
 import org.jiemamy.dialect.postgresql.datatype.IntegerDataType;
 import org.jiemamy.dialect.postgresql.datatype.VarcharDataType;
 import org.jiemamy.spec.exception.DataTypeNotFoundException;
-import org.jiemamy.spec.extension.DataTypeMapping;
-import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.dialect.Dialect;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.spec.model.datatype.DataType;
 import org.jiemamy.spec.model.datatype.GeneralDataType;
 import org.jiemamy.spec.model.datatype.SpecialDataType;

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import org.jiemamy.dialect.AbstractDialect;
 import org.jiemamy.dialect.sql99.datatype.IntegerDataType;
 import org.jiemamy.dialect.sql99.parser.Sql99ModelParser;
-import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.extension.dialect.ModelParser;
 
 /**
  * 標準SQL99に対するSQL方言実装クラス。

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/datatype/IntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/datatype/IntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/datatype/IntegerDataType.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.sql99.datatype;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParser.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParser.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParser.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.sql99.parser;
 
-import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.extension.dialect.ModelParser;
 import org.jiemamy.spec.model.RootModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -37,9 +37,9 @@
 import org.jiemamy.eclipse.extension.validator.ModelValidator;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
 import org.jiemamy.eclipse.preference.JiemamyPreferenceImpl;
-import org.jiemamy.spec.extension.Dialect;
-import org.jiemamy.spec.extension.Exporter;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.Exporter;
+import org.jiemamy.spec.extension.composer.Importer;
+import org.jiemamy.spec.extension.dialect.Dialect;
 
 /**
  * Jiemamy Eclipse Pluginクラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -34,8 +34,8 @@
 import org.jiemamy.eclipse.editor.DiagramEditor;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.spec.exception.ExportException;
-import org.jiemamy.spec.extension.ExportContext;
-import org.jiemamy.spec.extension.Exporter;
+import org.jiemamy.spec.extension.composer.ExportContext;
+import org.jiemamy.spec.extension.composer.Exporter;
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.RootModel;
 

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -34,8 +34,8 @@
 import org.jiemamy.eclipse.editor.DiagramEditor;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.spec.exception.ImportException;
-import org.jiemamy.spec.extension.ImportContext;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.ImportContext;
+import org.jiemamy.spec.extension.composer.Importer;
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.RootModel;
 

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -39,8 +39,8 @@
 import org.jiemamy.eclipse.action.ImportAction;
 import org.jiemamy.eclipse.action.PropertyAction;
 import org.jiemamy.eclipse.action.SaveDiagramImageAction;
-import org.jiemamy.spec.extension.Exporter;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.Exporter;
+import org.jiemamy.spec.extension.composer.Importer;
 
 /**
  * コンテキストメニュープロバイダ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -25,8 +25,8 @@
 import org.eclipse.gef.commands.Command;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
 import org.jiemamy.core.utils.processor.connection.DetachConnectionProcessor;
 import org.jiemamy.core.utils.processor.entity.table.AddInheritedColumnsProcessor;
 import org.jiemamy.core.utils.processor.entity.table.RemoveInheritedColumnsProcessor;

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -31,7 +31,7 @@
 import org.seasar.framework.container.S2Container;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.core.model.InheritanceColumnModel;
 import org.jiemamy.core.utils.processor.entity.GetInheritanceParents;
 import org.jiemamy.core.utils.processor.entity.table.RefreshInheritedColumnsProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetColorProcessor;

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/DataTypeConverter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/DataTypeConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/DataTypeConverter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -20,7 +20,7 @@
 
 import org.seasar.extension.dxo.converter.ConversionContext;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.core.model.datatype.AbstractDataType;
 import org.jiemamy.spec.model.DomainModel;
 import org.jiemamy.spec.model.datatype.DataType;
 

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-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/AbstractSerializeConstraintModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -21,7 +21,7 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-import org.jiemamy.core.model.typedef.constraint.AbstractConstraintModel;
+import org.jiemamy.core.model.constraint.AbstractConstraintModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.spec.model.JiemamyModel;
 import org.jiemamy.spec.model.constraint.Constraint;

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeUniqueConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeUniqueConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeUniqueConstraintModel.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -20,7 +20,7 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.model.typedef.constraint.UniqueConstraintModel;
+import org.jiemamy.core.model.constraint.UniqueConstraintModel;
 
 /**
  * {@link UniqueConstraintModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.spec/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.spec/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/META-INF/MANIFEST.MF	2008-09-17 23:44:26 UTC (rev 1935)
@@ -10,6 +10,9 @@
 Export-Package: org.jiemamy.spec.adapter,
  org.jiemamy.spec.exception,
  org.jiemamy.spec.extension,
+ org.jiemamy.spec.extension.composer,
+ org.jiemamy.spec.extension.dialect,
+ org.jiemamy.spec.extension.dialect.mapping,
  org.jiemamy.spec.geometory,
  org.jiemamy.spec.model,
  org.jiemamy.spec.model.connection,

Modified: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/CanceledException.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/CanceledException.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/CanceledException.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.spec.exception;
 
-import org.jiemamy.spec.extension.Exporter;
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.Exporter;
+import org.jiemamy.spec.extension.composer.Importer;
 
 /**
  * {@link Importer} / {@link Exporter} がダイアログでキャンセルされた時にスローされる例外。

Modified: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/DataTypeNotFoundException.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/DataTypeNotFoundException.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/DataTypeNotFoundException.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.spec.exception;
 
-import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.dialect.Dialect;
 import org.jiemamy.spec.model.datatype.DataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ExportException.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ExportException.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ExportException.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.spec.exception;
 
-import org.jiemamy.spec.extension.Exporter;
+import org.jiemamy.spec.extension.composer.Exporter;
 
 /**
  * {@link Exporter}実行時に問題が発生した場合にスローされる例外。

Modified: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/IllegalDataTypeMappingException.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/IllegalDataTypeMappingException.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/IllegalDataTypeMappingException.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.spec.exception;
 
-import org.jiemamy.spec.extension.DataTypeMapping;
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.spec.model.datatype.DataType;
 
 /**

Modified: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ImportException.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ImportException.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/exception/ImportException.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.spec.exception;
 
-import org.jiemamy.spec.extension.Importer;
+import org.jiemamy.spec.extension.composer.Importer;
 
 /**
  * {@link Importer}実行時に問題が発生した場合にスローされる例外。

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ConnectionAdvisor.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ConnectionAdvisor.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ConnectionAdvisor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,40 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/10
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.spec.extension;
-
-import java.sql.Connection;
-
-/**
- * DBメタデータの読み出し前後に行うべき処理を司るインターフェイス。
- * @author daisuke
- */
-public interface ConnectionAdvisor {
-	
-	/**
-	 * エンティティ・リレーションの読み出し前に行うべき処理。
-	 * @param connection DB接続
-	 */
-	void setUpRead(Connection connection);
-	
-	/**
-	 * エンティティ・リレーションの読み出し後に行うべき処理。
-	 * @param connection DB接続
-	 */
-	void tearDownRead(Connection connection);
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/DataTypeMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/DataTypeMapping.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/DataTypeMapping.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,71 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/30
- *
- * 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.spec.extension;
-
-import java.util.List;
-
-import org.jiemamy.spec.exception.DataTypeNotFoundException;
-import org.jiemamy.spec.model.datatype.DataType;
-import org.jiemamy.spec.model.datatype.GeneralDataType;
-import org.jiemamy.spec.model.datatype.SpecialDataType;
-
-/**
- * データ型同士の対応関係（マッピング）を表現するクラス。
- * @author daisuke
- */
-public interface DataTypeMapping {
-	
-	/**
-	 * 登録されたデータ型を全て取得する。
-	 * @return 登録されたデータ型のリスト
-	 */
-	public List<Class<? extends DataType>> getAllModelingDataTypes();
-	
-	/**
-	 * データ型から型名を取得する。
-	 * @param dataType データ型
-	 * @return 型名
-	 */
-	public String getTypeName(DataType dataType);
-	
-	/**
-	 * 特殊データ型から一般データ型を取得する。
-	 * 
-	 * <p>この時、多くの情報が失われることに注意して使用する。</p>
-	 * 
-	 * @param specialDataType 特殊データ型
-	 * @return 一般データ型
-	 */
-	public GeneralDataType resolveGeneralDataType(SpecialDataType specialDataType);
-	
-	/**
-	 * 一般データ型から特殊データ型を取得する。
-	 * @param generalDataType 一般データ型
-	 * @return 特殊データ型
-	 */
-	public SpecialDataType resolveSpecialDataType(GeneralDataType generalDataType);
-	
-	/**
-	 * 型名から特殊データ型
-	 * @param typeName 型名
-	 * @return 特殊データ型
-	 * @throws DataTypeNotFoundException 該当するデータ型が存在しない場合。
-	 */
-	public SpecialDataType resolveSpecialDataType(String typeName) throws DataTypeNotFoundException;
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Dialect.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Dialect.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Dialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,76 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * 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.spec.extension;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.jiemamy.spec.model.RootModel;
-import org.jiemamy.spec.model.node.AbstractEntityModel;
-
-/**
- * SQL方言インターフェイス。
- * @author daisuke
- */
-public interface Dialect {
-	
-	/**
-	 * エンティティ情報から{@link AbstractEntityModel}を生成する。
-	 * 
-	 * <p>渡したEntity情報がTABLEやVIEWではなかった場合（INDEX等）<code>null</code>を返す。</p>
-	 * 
-	 * @param rootModel 
-	 * @param entity エンティティ情報
-	 * @param connection DB接続
-	 * @return 生成された {@link AbstractEntityModel}
-	 * @throws SQLException 
-	 */
-	AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, Connection connection) throws SQLException;
-	
-	/**
-	 * このSQL方言用の{@link ConnectionAdvisor}を取得する。
-	 * @return {@link ConnectionAdvisor}
-	 */
-	ConnectionAdvisor getAdvisor();
-	
-	/**
-	 * モデリング用DataType・一般型・型名間のマッピング情報を取得する。
-	 * @return マッピング情報
-	 */
-	DataTypeMapping getDataTypeMapping();
-	
-	/**
-	 * このSQL方言用の{@link ModelParser}を取得する。
-	 * @return {@link ModelParser}
-	 */
-	ModelParser getParser();
-	
-	/**
-	 * このSQL方言用の{@link Quoter}を取得する。
-	 * @return {@link Quoter}
-	 */
-	Quoter getQuoter();
-	
-	/**
-	 * このSQL方言用の{@link IdentifierValidator}を取得する。
-	 * @return {@link IdentifierValidator}
-	 */
-	IdentifierValidator getValidator();
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ExportContext.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ExportContext.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ExportContext.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,29 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/17
- *
- * 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.spec.extension;
-
-import org.jiemamy.spec.adapter.Adaptable;
-
-/**
- * TODO for daisuke
- * @author daisuke
- */
-public interface ExportContext extends Context, Adaptable {
-	
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Exporter.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Exporter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Exporter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,46 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.spec.extension;
-
-import org.jiemamy.spec.exception.ExportException;
-import org.jiemamy.spec.model.RootModel;
-
-/**
- * Jiemamyモデルから外部リソースに出力を行うインターフェイス。
- * @author daisuke
- */
-public interface Exporter {
-	
-	/**
-	 * モデルを外部リソースにエクスポートする。
-	 * ファイル出力であれば、ファイルに保存する所までの責務を負う。
-	 * @param rootModel エクスポート対象モデル
-	 * @param ctx エクスポートのコンテキスト
-	 * @return エクスポートが正常に行われた場合はtrue、contextの設定により、出力が行われなかった場合はfalse
-	 * @throws ExportException エクスポートに失敗した時
-	 */
-	boolean export(RootModel rootModel, ExportContext ctx) throws ExportException;
-	
-	/**
-	 * Exporterの名称を取得する。
-	 * @return 名称
-	 */
-	String getName();
-	
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/IdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/IdentifierValidator.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/IdentifierValidator.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,33 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/10
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.spec.extension;
-
-/**
- * 識別子の妥当性を判断するインターフェイス。
- * @author daisuke
- */
-public interface IdentifierValidator {
-	
-	/**
-	 * 指定した語が、識別子として適切かどうかを調べる。
-	 * @param word 語
-	 * @return 適切であればtrue
-	 */
-	boolean validate(String word);
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ImportContext.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ImportContext.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ImportContext.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,29 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/17
- *
- * 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.spec.extension;
-
-import org.jiemamy.spec.adapter.Adaptable;
-
-/**
- * TODO for daisuke
- * @author daisuke
- */
-public interface ImportContext extends Context, Adaptable {
-	
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Importer.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Importer.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Importer.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.spec.extension;
-
-import org.jiemamy.spec.exception.ImportException;
-import org.jiemamy.spec.model.RootModel;
-
-/**
- * 外部リソースからJiemamyモデルに入力を行うインターフェイス。
- * @author daisuke
- */
-public interface Importer {
-	
-	/**
-	 * Importerの名称を取得する。
-	 * @return 名称
-	 */
-	String getName();
-	
-	/**
-	 * 外部リソースからモデルにデータをインポートする。
-	 * @param rootModel インポート対象モデル
-	 * @param ctx インポートのコンテキスト
-	 * @return インポートが正常に行われた場合はtrue、contextの設定により、入力が行われなかった場合はfalse
-	 * @throws ImportException インポートに失敗した時
-	 */
-	boolean import_(RootModel rootModel, ImportContext ctx) throws ImportException;
-	
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ModelParser.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ModelParser.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ModelParser.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,36 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/12
- *
- * 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.spec.extension;
-
-import org.jiemamy.spec.model.RootModel;
-
-/**
- * モデル解析用インターフェイス。
- * @author j5ik2o
- */
-public interface ModelParser {
-	
-	/**
-	 * 与えられたRootModelを解析し、SQLに変換する。
-	 * @param rootModel RootModel
-	 * @return SQL
-	 */
-	public String parse(RootModel rootModel);
-	
-}

Deleted: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Quoter.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Quoter.java	2008-09-17 19:52:14 UTC (rev 1934)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Quoter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -1,50 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/09
- *
- * 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.spec.extension;
-
-/**
- * SQL文中の引用符処理を行うインターフェイス。
- * @author daisuke
- */
-public interface Quoter {
-	
-	/**
-	 * 引用符で囲む。
-	 * 
-	 * <p>input -> 'input' など。</p>
-	 * 
-	 * @param input 入力文字列
-	 * @param kind 引用の種類
-	 * @return 囲んだ結果
-	 */
-	String quote(String input, QuoteKind kind);
-	
-
-	/**
-	 * 引用の種類。
-	 * @author daisuke
-	 */
-	public enum QuoteKind {
-		/** 識別子 */
-		IDENTIFIER,
-
-		/** データ */
-		DATA
-	}
-}

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ExportContext.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/17
+ *
+ * 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.spec.extension.composer;
+
+import org.jiemamy.spec.adapter.Adaptable;
+import org.jiemamy.spec.extension.Context;
+
+/**
+ * TODO for daisuke
+ * @author daisuke
+ */
+public interface ExportContext extends Context, Adaptable {
+	
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ExportContext.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Exporter.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Exporter.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Exporter.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Exporter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/19
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.spec.extension.composer;
+
+import org.jiemamy.spec.exception.ExportException;
+import org.jiemamy.spec.model.RootModel;
+
+/**
+ * Jiemamyモデルから外部リソースに出力を行うインターフェイス。
+ * @author daisuke
+ */
+public interface Exporter {
+	
+	/**
+	 * モデルを外部リソースにエクスポートする。
+	 * ファイル出力であれば、ファイルに保存する所までの責務を負う。
+	 * @param rootModel エクスポート対象モデル
+	 * @param ctx エクスポートのコンテキスト
+	 * @return エクスポートが正常に行われた場合はtrue、contextの設定により、出力が行われなかった場合はfalse
+	 * @throws ExportException エクスポートに失敗した時
+	 */
+	boolean export(RootModel rootModel, ExportContext ctx) throws ExportException;
+	
+	/**
+	 * Exporterの名称を取得する。
+	 * @return 名称
+	 */
+	String getName();
+	
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Exporter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ImportContext.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/17
+ *
+ * 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.spec.extension.composer;
+
+import org.jiemamy.spec.adapter.Adaptable;
+import org.jiemamy.spec.extension.Context;
+
+/**
+ * TODO for daisuke
+ * @author daisuke
+ */
+public interface ImportContext extends Context, Adaptable {
+	
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/ImportContext.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Importer.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Importer.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Importer.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Importer.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/19
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.spec.extension.composer;
+
+import org.jiemamy.spec.exception.ImportException;
+import org.jiemamy.spec.model.RootModel;
+
+/**
+ * 外部リソースからJiemamyモデルに入力を行うインターフェイス。
+ * @author daisuke
+ */
+public interface Importer {
+	
+	/**
+	 * Importerの名称を取得する。
+	 * @return 名称
+	 */
+	String getName();
+	
+	/**
+	 * 外部リソースからモデルにデータをインポートする。
+	 * @param rootModel インポート対象モデル
+	 * @param ctx インポートのコンテキスト
+	 * @return インポートが正常に行われた場合はtrue、contextの設定により、入力が行われなかった場合はfalse
+	 * @throws ImportException インポートに失敗した時
+	 */
+	boolean import_(RootModel rootModel, ImportContext ctx) throws ImportException;
+	
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/composer/Importer.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ConnectionAdvisor.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ConnectionAdvisor.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ConnectionAdvisor.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ConnectionAdvisor.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.spec.extension.dialect;
+
+import java.sql.Connection;
+
+/**
+ * DBメタデータの読み出し前後に行うべき処理を司るインターフェイス。
+ * @author daisuke
+ */
+public interface ConnectionAdvisor {
+	
+	/**
+	 * エンティティ・リレーションの読み出し前に行うべき処理。
+	 * @param connection DB接続
+	 */
+	void setUpRead(Connection connection);
+	
+	/**
+	 * エンティティ・リレーションの読み出し後に行うべき処理。
+	 * @param connection DB接続
+	 */
+	void tearDownRead(Connection connection);
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ConnectionAdvisor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Dialect.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Dialect.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Dialect.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Dialect.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * 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.spec.extension.dialect;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.jiemamy.spec.extension.dialect.mapping.DataTypeMapping;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+
+/**
+ * SQL方言インターフェイス。
+ * @author daisuke
+ */
+public interface Dialect {
+	
+	/**
+	 * エンティティ情報から{@link AbstractEntityModel}を生成する。
+	 * 
+	 * <p>渡したEntity情報がTABLEやVIEWではなかった場合（INDEX等）<code>null</code>を返す。</p>
+	 * 
+	 * @param rootModel 
+	 * @param entity エンティティ情報
+	 * @param connection DB接続
+	 * @return 生成された {@link AbstractEntityModel}
+	 * @throws SQLException 
+	 */
+	AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, Connection connection) throws SQLException;
+	
+	/**
+	 * このSQL方言用の{@link ConnectionAdvisor}を取得する。
+	 * @return {@link ConnectionAdvisor}
+	 */
+	ConnectionAdvisor getAdvisor();
+	
+	/**
+	 * モデリング用DataType・一般型・型名間のマッピング情報を取得する。
+	 * @return マッピング情報
+	 */
+	DataTypeMapping getDataTypeMapping();
+	
+	/**
+	 * このSQL方言用の{@link ModelParser}を取得する。
+	 * @return {@link ModelParser}
+	 */
+	ModelParser getParser();
+	
+	/**
+	 * このSQL方言用の{@link Quoter}を取得する。
+	 * @return {@link Quoter}
+	 */
+	Quoter getQuoter();
+	
+	/**
+	 * このSQL方言用の{@link IdentifierValidator}を取得する。
+	 * @return {@link IdentifierValidator}
+	 */
+	IdentifierValidator getValidator();
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Dialect.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/IdentifierValidator.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/IdentifierValidator.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/IdentifierValidator.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/IdentifierValidator.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.spec.extension.dialect;
+
+/**
+ * 識別子の妥当性を判断するインターフェイス。
+ * @author daisuke
+ */
+public interface IdentifierValidator {
+	
+	/**
+	 * 指定した語が、識別子として適切かどうかを調べる。
+	 * @param word 語
+	 * @return 適切であればtrue
+	 */
+	boolean validate(String word);
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/IdentifierValidator.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ModelParser.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/ModelParser.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ModelParser.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ModelParser.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/12
+ *
+ * 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.spec.extension.dialect;
+
+import org.jiemamy.spec.model.RootModel;
+
+/**
+ * モデル解析用インターフェイス。
+ * @author j5ik2o
+ */
+public interface ModelParser {
+	
+	/**
+	 * 与えられたRootModelを解析し、SQLに変換する。
+	 * @param rootModel RootModel
+	 * @return SQL
+	 */
+	public String parse(RootModel rootModel);
+	
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/ModelParser.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Quoter.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/Quoter.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Quoter.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Quoter.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/09
+ *
+ * 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.spec.extension.dialect;
+
+/**
+ * SQL文中の引用符処理を行うインターフェイス。
+ * @author daisuke
+ */
+public interface Quoter {
+	
+	/**
+	 * 引用符で囲む。
+	 * 
+	 * <p>input -> 'input' など。</p>
+	 * 
+	 * @param input 入力文字列
+	 * @param kind 引用の種類
+	 * @return 囲んだ結果
+	 */
+	String quote(String input, QuoteKind kind);
+	
+
+	/**
+	 * 引用の種類。
+	 * @author daisuke
+	 */
+	public enum QuoteKind {
+		/** 識別子 */
+		IDENTIFIER,
+
+		/** データ */
+		DATA
+	}
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/Quoter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/DataTypeMapping.java (from rev 1934, artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/DataTypeMapping.java)
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/DataTypeMapping.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/DataTypeMapping.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/08/30
+ *
+ * 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.spec.extension.dialect.mapping;
+
+import java.util.List;
+
+import org.jiemamy.spec.exception.DataTypeNotFoundException;
+import org.jiemamy.spec.model.datatype.DataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
+
+/**
+ * データ型同士の対応関係（マッピング）を表現するクラス。
+ * @author daisuke
+ */
+public interface DataTypeMapping {
+	
+	/**
+	 * 登録されたデータ型を全て取得する。
+	 * @return 登録されたデータ型のリスト
+	 */
+	public List<Class<? extends DataType>> getAllModelingDataTypes();
+	
+	/**
+	 * データ型から型名を取得する。
+	 * @param dataType データ型
+	 * @return 型名
+	 */
+	public String getTypeName(DataType dataType);
+	
+	/**
+	 * 特殊データ型から一般データ型を取得する。
+	 * 
+	 * <p>この時、多くの情報が失われることに注意して使用する。</p>
+	 * 
+	 * @param specialDataType 特殊データ型
+	 * @return 一般データ型
+	 */
+	public GeneralDataType resolveGeneralDataType(SpecialDataType specialDataType);
+	
+	/**
+	 * 一般データ型から特殊データ型を取得する。
+	 * @param generalDataType 一般データ型
+	 * @return 特殊データ型
+	 */
+	public SpecialDataType resolveSpecialDataType(GeneralDataType generalDataType);
+	
+	/**
+	 * 型名から特殊データ型
+	 * @param typeName 型名
+	 * @return 特殊データ型
+	 * @throws DataTypeNotFoundException 該当するデータ型が存在しない場合。
+	 */
+	public SpecialDataType resolveSpecialDataType(String typeName) throws DataTypeNotFoundException;
+}


Property changes on: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/DataTypeMapping.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/MappingInfo.java
===================================================================
--- artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/MappingInfo.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.spec/src/main/java/org/jiemamy/spec/extension/dialect/mapping/MappingInfo.java	2008-09-17 23:44:26 UTC (rev 1935)
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/08/27
+ *
+ * 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.spec.extension.dialect.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+
+/**
+ * マッピング情報を指定するアノテーション。
+ * @author daisuke
+ */
+ ＠ Target(ElementType.TYPE)
+ ＠ Retention(RetentionPolicy.RUNTIME)
+public @interface MappingInfo {
+	
+	/**
+	 * エイリアス型名の配列
+	 */
+	String[] alias() default {};
+	
+	/**
+	 * 一般データ型のクラス
+	 */
+	Class<? extends GeneralDataType> generic();
+	
+	/**
+	 * 型名
+	 */
+	String typeName();
+}

• 前の記事 [Jiemamy-notify] commit [1934] [GEN-59] いっぱいテスト落ちてるけど、ひとまず。
• 次の記事 [Jiemamy-notify] commit [1936] ビルドエラーの解消。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]