[Jiemamy-notify] commit [1934] [GEN-59] いっぱいテスト落ちてるけど、ひとまず。

svnno****@sourc***** svnno****@sourc*****
2008年 9月 18日 (木) 04:52:14 JST

• 前の記事 [Jiemamy-notify] commit [1933] Share project "org.jiemamy.spec" into "svn+ssh://svn. sourceforge.jp/svnroot/jiemamy"
• 次の記事 [Jiemamy-notify] commit [1935] [GEN-59] パッケージ整理。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

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

Log Message:
-----------
[GEN-59] いっぱいテスト落ちてるけど、ひとまず。

Modified Paths:
--------------
    artemis/trunk/org.jiemamy.composer/.project
    artemis/trunk/org.jiemamy.composer/META-INF/MANIFEST.MF
    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/.project
    artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/AbstractObservable.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableList.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableMap.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableSet.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeSupport.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/dataset/InsertDataSetModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeSupport.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/AbstractNodeModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeSupport.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/node/TableModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeSupport.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/presentation/DiagramPresentationModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeListener.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/CheckConstraintModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeSupport.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeListener.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/PrecisionedDataTypeAdapterChangeListener.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/advisor/DefaultConnectionAdvisor.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/MappingInfo.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/parser/ExpressionContext.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/AbstractContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreter.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/AbstractModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ModelIdManager.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.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/AbstractConstraintModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java
    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/adapter/DataTypeAdapter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.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/SetDefaultColumnsProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.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/GetColumnProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetPrimaryKeyColumnsProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/IsCompositeKeyTableProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RefreshInheritedColumnsProcessor.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/GenerateEntityNameProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/AbstractCreateModelProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewDomainProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewForeignKeyProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewInsertDataSetProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewPresentationProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewStickyProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewTableProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewViewProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/GetDataSetProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/dataset/SetDataSetProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetColorProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetConstraintProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/RemoveFromDiagramProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/impl/PrimaryKeyVisitor.java
    artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon
    artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.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/node/TableModelTest.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.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java
    artemis/trunk/org.jiemamy.dialect/.project
    artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF
    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/generic/GenericDialectTest.java
    artemis/trunk/org.jiemamy.dialect.mysql/.project
    artemis/trunk/org.jiemamy.dialect.mysql/META-INF/MANIFEST.MF
    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/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlColumnModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlDomainModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlNodeModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlRootModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlTableModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlViewModelExpression.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/test/java/org/jiemamy/dialect/mysql/parser/MySqlModelParserTest.java
    artemis/trunk/org.jiemamy.dialect.postgresql/.project
    artemis/trunk/org.jiemamy.dialect.postgresql/META-INF/MANIFEST.MF
    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/.project
    artemis/trunk/org.jiemamy.dialect.sql99/META-INF/MANIFEST.MF
    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.dialect.sql99/src/main/resources/jiemamy-dialect-sql99.dicon
    artemis/trunk/org.jiemamy.dialect.sql99/src/test/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParserTest.java
    artemis/trunk/org.jiemamy.eclipse/.project
    artemis/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
    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/AutoLayoutAction.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.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/FitNodeConstraintAction.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/action/SaveDiagramImageAction.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor2.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/DiagramEditorPaletteFactory.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.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/command/DeleteRelationCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
    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/ViewEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/IsDisplayedProcessor.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/LabelStringProcessor.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java
    artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
    artemis/trunk/org.jiemamy.project/pom.xml
    artemis/trunk/org.jiemamy.serializer/.project
    artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializer.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractNodeModelConverter.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractSerializeConnectionModelConverter.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/CustomBeanConverter.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/converter/UUIDConverter.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerImpl.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerStab.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeConnectionModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeRelationModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyMapping.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeInsertDataSetModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeRecordModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeStickyModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeViewModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexColumnModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/presentation/SerializeDiagramPresentationModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeColumnModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.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/SerializeCheckConstraintModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeConstraintSetModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeNotNullConstraintModel.java
    artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializePrimaryKeyConstraintModel.java
    artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/core/model/RootModelDxoTest.java
    artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/SerializationTest.java

Added Paths:
-----------
    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/importer/ImportContextImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModelImpl.java
    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/constraint/CheckConstraintModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModelImpl.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.irenka/src/main/java/org/jiemamy/irenka/hack/specific/FieldHacker.java

Removed Paths:
-------------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/adapter/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeEvent.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeListener.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/Observable.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/exception/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/Dialect.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/ConnectionAdvisor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/DataTypeMapping.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ModelParser.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/quoter/Quoter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/IdentifierValidator.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/Exporter.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/Importer.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMapping.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmColor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmPoint.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmRectangle.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/Constraint.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModel.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/DataType.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataType.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataType.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/Processor.java


-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/.project
===================================================================
--- artemis/trunk/org.jiemamy.composer/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.composer/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.composer/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -7,8 +7,9 @@
  lib/freemarker-2.3.11.jar
 Bundle-Vendor: Jiemamy Project
 Export-Package: org.jiemamy.composer.exporter
-Require-Bundle: org.jiemamy.core,
- org.jiemamy.serializer,
- org.jiemamy.dialect
+Require-Bundle: org.jiemamy.serializer,
+ org.jiemamy.dialect,
+ org.jiemamy.spec,
+ org.jiemamy.core
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core,org.jiemamy.serializer

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -26,13 +26,13 @@
 
 import org.apache.commons.io.IOUtils;
 
-import org.jiemamy.core.exception.ExportException;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.exporter.ExportContext;
-import org.jiemamy.core.extension.exporter.Exporter;
 import org.jiemamy.core.interpreter.JiemamyInterpreter;
 import org.jiemamy.core.interpreter.JiemamyInterpreterStab;
-import org.jiemamy.core.model.RootModel;
+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.model.RootModel;
 
 /**
  * モデルからSQLを構築するエクスポータ。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -12,19 +12,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.GenericModelingModeException;
-import org.jiemamy.core.exception.ImportException;
-import org.jiemamy.core.exception.TooManyElementsException;
 import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.importer.ImportContext;
-import org.jiemamy.core.extension.importer.Importer;
 import org.jiemamy.core.interpreter.DatabaseReader;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
+import org.jiemamy.core.model.connection.ForeignKeyMappingImpl;
 import org.jiemamy.core.utils.DriverUtil;
 import org.jiemamy.core.utils.JmIOUtil;
 import org.jiemamy.core.utils.processor.entity.table.GetColumnProcessor;
@@ -32,6 +22,17 @@
 import org.jiemamy.core.utils.processor.root.creation.CreateNewForeignKeyProcessor;
 import org.jiemamy.core.utils.visitor.AbstractResultSetVisitor;
 import org.jiemamy.dialect.generic.GeneralDialect;
+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.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * データベースからモデルを生成するインポータ。
@@ -240,7 +241,7 @@
 						fkModel.setName(fkName);
 					}
 					
-					ForeignKeyMapping mapping = new ForeignKeyMapping();
+					ForeignKeyMapping mapping = new ForeignKeyMappingImpl();
 					mapping.setConstraintColumn(source.process(new GetColumnProcessor(fkColumnName)));
 					mapping.setReferenceColumn(target.process(new GetColumnProcessor(pkColumnName)));
 					

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -34,11 +34,12 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.exporter.ExportContext;
-import org.jiemamy.core.extension.exporter.Exporter;
+import org.jiemamy.core.extension.exporter.ExportContextImpl;
 import org.jiemamy.core.model.ApplicationModelCreator;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.ExportContext;
+import org.jiemamy.spec.extension.Exporter;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link SqlExporter}のテストクラス。
@@ -75,7 +76,7 @@
 		
 		BufferedReader reader = null;
 		try {
-			ExportContext ctx = new ExportContext();
+			ExportContext ctx = new ExportContextImpl();
 			ctx.setValue(SqlExporter.OUTPUT_FILE, outputFile);
 			ctx.setValue(SqlExporter.OVERWRITE, true);
 			ctx.setValue(SqlExporter.DIALECT, dialect);

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -32,12 +32,14 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.importer.ImportContext;
-import org.jiemamy.core.extension.importer.Importer;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
+import org.jiemamy.core.extension.importer.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.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * {@link DatabaseImporter}のテストクラス。
@@ -89,8 +91,8 @@
 	 */
 	@Test
 	public void test01_DBからのインポートテスト() throws Exception {
-		RootModel rootModel = new RootModel();
-		ImportContext ctx = new ImportContext();
+		RootModel rootModel = new RootModelImpl();
+		ImportContext ctx = new ImportContextImpl();
 		ctx.setValue(DatabaseImporter.DIALECT, dialect);
 		ctx.setValue(DatabaseImporter.DATABASE_NAME, "jpoll");
 		ctx.setValue(DatabaseImporter.DRIVER_JAR_PATH, new URL[] {

Modified: artemis/trunk/org.jiemamy.core/.project
===================================================================
--- artemis/trunk/org.jiemamy.core/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -246,17 +246,21 @@
  org.hamcrest.core,
  org.hamcrest.internal,
  org.jiemamy.core,
- org.jiemamy.core.adapter,
  org.jiemamy.core.event,
  org.jiemamy.core.event.collectionimpl,
  org.jiemamy.core.event.model,
- org.jiemamy.core.exception,
+ org.jiemamy.core.event.model.connection,
+ org.jiemamy.core.event.model.dataset,
+ org.jiemamy.core.event.model.node,
+ org.jiemamy.core.event.model.presentation,
+ 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.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.quoter,
  org.jiemamy.core.extension.dialect.validator,
  org.jiemamy.core.extension.exporter,
  org.jiemamy.core.extension.importer,
@@ -273,6 +277,7 @@
  org.jiemamy.core.model.typedef.datatype.adapter,
  org.jiemamy.core.model.typedef.datatype.impl,
  org.jiemamy.core.utils,
+ org.jiemamy.core.utils.debug,
  org.jiemamy.core.utils.processor,
  org.jiemamy.core.utils.processor.base,
  org.jiemamy.core.utils.processor.connection,
@@ -439,3 +444,4 @@
  org.xmlpull.v1
 Eclipse-BuddyPolicy: registered
 Eclipse-LazyStart: false
+Require-Bundle: org.jiemamy.spec

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/AbstractObservable.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/AbstractObservable.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/AbstractObservable.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -19,6 +19,10 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Observable;
+
 /**
  * {@link Observable}の全てのinterfaceを実装した抽象Class。
  * ChangeEventを発火するもの、つまりChangeEventを監視される対象Classはこれを継承できる。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeEvent.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeEvent.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeEvent.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,68 +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.event;
-
-import java.lang.reflect.Field;
-import java.util.EventObject;
-
-/**
- * モデル変更イベント。
- * 
- * DOCME JiemamyChangeEventみたいな名称が適切？(必ずしもModel用とは限らない？)
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ModelChangeEvent extends EventObject {
-	
-	/** 変更されたフィールド */
-	protected transient Field field;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ModelChangeEvent() {
-		super(null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param source イベントが発生したオブジェクト
-	 * @param field 変更されたフィールド
-	 * @category instance creation
-	 */
-	public ModelChangeEvent(Observable source, Field field) {
-		super(source);
-		this.field = field;
-	}
-	
-	/**
-	 * 変更されたフィールドを取得する。
-	 * @return 変更されたフィールド
-	 */
-	public Field getField() {
-		return field;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		return getClass().getName() + "[source=" + source + ", field=" + field + "]";
-	}
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,34 +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.event;
-
-import java.util.EventListener;
-
-/**
- * モデルの変更に対するリスナ。
- * 
- * <p>{@link Observable}なインスタンスを監視することができる。</p>
- * 
- * @author daisuke
- */
-public interface ModelChangeListener extends EventListener {
-	
-	/**
-	 * モデルのフィールドが変更された際にコールされるメソッド。
-	 * @param e 変更されたモデルとフィールドを表す{@link ModelChangeEvent}
-	 */
-	void modelChanged(ModelChangeEvent e);
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/Observable.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/Observable.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/Observable.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others. Created on 2008/07/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.event;
-
-import java.lang.reflect.Field;
-
-/**
- * ModelChangeListenerが監視可能な対象を表現する。
- * @author shin1
- */
-public interface Observable {
-	
-	/**
-	 * モデルの変更リスナーを追加する。
-	 * @param listener 追加するリスナー
-	 */
-	void addModelChangeListener(ModelChangeListener listener);
-	
-	/**
-	 * リスナーにモデルの変更を通知する。
-	 * @param field 変更されたフィールド
-	 */
-	void fireModelChange(Field field);
-	
-	/**
-	 * モデルの変更リスナーを削除する。
-	 * @param listener 削除するリスナー
-	 */
-	void removeModelChangeListener(ModelChangeListener listener);
-}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/ObservableCollectionChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,6 +14,7 @@
  */
 package org.jiemamy.core.event;
 
+import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link Observable}のCollectionに対する変更のリスナ。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/SetterInterceptor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,6 +21,8 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
+import org.jiemamy.spec.util.Observable;
+
 /**
  * {@link org.jiemamy.core.model.AbstractModel}のSetterをInterceptし、Setter動作後に
  * {@link org.jiemamy.core.model.AbstractModel#fireModelChange(Field)}を実行する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableList.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableList.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableList.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,11 +27,11 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.Observable;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link ObservableCollectionChangeEvent}を通知する{@link List}の実装。。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableMap.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableMap.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableMap.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,11 +27,11 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.Observable;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link ObservableCollectionChangeEvent}を通知する{@link Map}の実装。。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableSet.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableSet.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/collectionimpl/ObservableSet.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,11 +25,11 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.Observable;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Observable;
 
 /**
  * {@link ObservableCollectionChangeEvent}を通知する{@link java.util.Set}の実装。。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -16,12 +16,12 @@
 
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.typedef.DomainModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * RootModel用のListener
@@ -31,22 +31,22 @@
 public interface RootModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link RootModel}が保持する{@link org.jiemamy.core.model.typedef.DomainModel}のCollectionに対する変更を処理する。
+	 * {@link RootModel}が保持する{@link DiagramPresentationModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void domainCollectionChange(ObservableCollectionChangeEvent<List<DomainModel>, DomainModel> event);
+	void diagramPresentationCollectionChange(
+			ObservableCollectionChangeEvent<List<DiagramPresentationModel>, DiagramPresentationModel> event);
 	
 	/**
-	 * {@link RootModel}が保持する{@link org.jiemamy.core.model.presentation.DiagramPresentationModel}のCollectionに対する変更を処理する。
+	 * {@link RootModel}が保持する{@link DomainModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void diagramPresentationCollectionChange(
-			ObservableCollectionChangeEvent<List<DiagramPresentationModel>, DiagramPresentationModel> event);
+	void domainCollectionChange(ObservableCollectionChangeEvent<List<DomainModel>, DomainModel> event);
 	
 	/**
-	 * {@link RootModel}が保持する{@link org.jiemamy.core.model.dataset.InsertDataSetModel}のCollectionに対する変更を処理する。
+	 * {@link RootModel}が保持する{@link InsertDataSetModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/RootModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,15 +17,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.typedef.DomainModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、RootModelからそれらを引き受ける。
@@ -132,25 +132,25 @@
 	}
 	
 	/**
-	 * domainsのcollectionを監視するListenerに通知されたEventをRootModelの監視Listenerへ通知する。
+	 * diagramPresentationsのcollectionを監視するListenerに通知されたEventをRootModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireDomainsCollectionChangeEvent(ObservableCollectionChangeEvent<List<DomainModel>, DomainModel> event) {
+	public void fireDiagramPresentationsCollectionChangeEvent(
+			ObservableCollectionChangeEvent<List<DiagramPresentationModel>, DiagramPresentationModel> event) {
 		for (RootModelChangeListener l : listeners) {
-			l.domainCollectionChange(event);
+			l.diagramPresentationCollectionChange(event);
 		}
 	}
 	
 	/**
-	 * diagramPresentationsのcollectionを監視するListenerに通知されたEventをRootModelの監視Listenerへ通知する。
+	 * domainsのcollectionを監視するListenerに通知されたEventをRootModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireDiagramPresentationsCollectionChangeEvent(
-			ObservableCollectionChangeEvent<List<DiagramPresentationModel>, DiagramPresentationModel> event) {
+	public void fireDomainsCollectionChangeEvent(ObservableCollectionChangeEvent<List<DomainModel>, DomainModel> event) {
 		for (RootModelChangeListener l : listeners) {
-			l.diagramPresentationCollectionChange(event);
+			l.domainCollectionChange(event);
 		}
 	}
 	

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,7 @@
  */
 package org.jiemamy.core.event.model.connection;
 
-import org.jiemamy.core.event.ModelChangeListener;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * ForeignKeyMapping用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/ForeignKeyMappingChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、ForeignKeyMappingからそれらを引き受ける。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,7 @@
  */
 package org.jiemamy.core.event.model.connection;
 
-import org.jiemamy.core.event.ModelChangeListener;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * InheritanceModel用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/connection/InheritanceModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.model.connection.InheritanceModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、InheritanceModelからそれらを引き受ける。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -16,10 +16,11 @@
 
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * InsertDataSetModel用のListener
@@ -34,5 +35,5 @@
 	 * @param event
 	 */
 	void recordCollectionChange(
-			ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>, java.util.List<org.jiemamy.core.model.dataset.RecordModel>> event);
+			ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<RecordModel>>, java.util.List<RecordModel>> event);
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/InsertDataSetModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、InsertDataSetModelからそれらを引き受ける。
@@ -42,14 +43,14 @@
 	 * @see ObservableCollectionChangeListener
 	 * @see #fireRecordsCollectionChangeEvent(ObservableCollectionChangeEvent)
 	 */
-	private ObservableCollectionChangeListener<Map<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>, java.util.List<org.jiemamy.core.model.dataset.RecordModel>> recordsCollectionChangeListener =
-			new ObservableCollectionChangeListener<Map<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>() {
+	private ObservableCollectionChangeListener<Map<AbstractEntityModel, java.util.List<RecordModel>>, java.util.List<RecordModel>> recordsCollectionChangeListener =
+			new ObservableCollectionChangeListener<Map<AbstractEntityModel, List<RecordModel>>, List<RecordModel>>() {
 				
 				/**
 				 * {@inheritDoc}
 				 */
 				public void collectionChanged(
-						ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>, java.util.List<org.jiemamy.core.model.dataset.RecordModel>> event) {
+						ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<RecordModel>>, java.util.List<RecordModel>> event) {
 					fireRecordsCollectionChangeEvent(event);
 				}
 			};
@@ -78,8 +79,8 @@
 	 */
 	public InsertDataSetModelChangeSupport(InsertDataSetModel source) {
 		source.addModelChangeListener(insertDataSetModelChangeListener);
-		((ObservableMap<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>) source
-			.getRecords()).addListener(recordsCollectionChangeListener);
+		((ObservableMap<AbstractEntityModel, List<RecordModel>>) source.getRecords())
+			.addListener(recordsCollectionChangeListener);
 	}
 	
 	/**
@@ -93,25 +94,25 @@
 	}
 	
 	/**
-	 * recordsのcollectionを監視するListenerに通知されたEventをInsertDataSetModelの監視Listenerへ通知する。
+	 * InsertDataSetModel自身を監視するListenerに通知されたEventをInsertDataSetModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ObservableCollectionChangeEvent}
+	 * @param event {@link ModelChangeEvent}
 	 */
-	public void fireRecordsCollectionChangeEvent(
-			ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<org.jiemamy.core.model.dataset.RecordModel>>, java.util.List<org.jiemamy.core.model.dataset.RecordModel>> event) {
+	public void fireModelChange(ModelChangeEvent event) {
 		for (InsertDataSetModelChangeListener l : listeners) {
-			l.recordCollectionChange(event);
+			l.modelChanged(event);
 		}
 	}
 	
 	/**
-	 * InsertDataSetModel自身を監視するListenerに通知されたEventをInsertDataSetModelの監視Listenerへ通知する。
+	 * recordsのcollectionを監視するListenerに通知されたEventをInsertDataSetModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ModelChangeEvent}
+	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireModelChange(ModelChangeEvent event) {
+	public void fireRecordsCollectionChangeEvent(
+			ObservableCollectionChangeEvent<Map<AbstractEntityModel, java.util.List<RecordModel>>, List<RecordModel>> event) {
 		for (InsertDataSetModelChangeListener l : listeners) {
-			l.modelChanged(event);
+			l.recordCollectionChange(event);
 		}
 	}
 	

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -16,10 +16,10 @@
 
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * RecordModel用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/dataset/RecordModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、RecordModelからそれらを引き受ける。
@@ -91,24 +91,24 @@
 	}
 	
 	/**
-	 * valuesのcollectionを監視するListenerに通知されたEventをRecordModelの監視Listenerへ通知する。
+	 * RecordModel自身を監視するListenerに通知されたEventをRecordModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ObservableCollectionChangeEvent}
+	 * @param event {@link ModelChangeEvent}
 	 */
-	public void fireValuesCollectionChangeEvent(ObservableCollectionChangeEvent<Map<ColumnModel, String>, String> event) {
+	public void fireModelChange(ModelChangeEvent event) {
 		for (RecordModelChangeListener l : listeners) {
-			l.valuCollectionChange(event);
+			l.modelChanged(event);
 		}
 	}
 	
 	/**
-	 * RecordModel自身を監視するListenerに通知されたEventをRecordModelの監視Listenerへ通知する。
+	 * valuesのcollectionを監視するListenerに通知されたEventをRecordModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ModelChangeEvent}
+	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireModelChange(ModelChangeEvent event) {
+	public void fireValuesCollectionChangeEvent(ObservableCollectionChangeEvent<Map<ColumnModel, String>, String> event) {
 		for (RecordModelChangeListener l : listeners) {
-			l.modelChanged(event);
+			l.valuCollectionChange(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:51:13 UTC (rev 1933)
+++ 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)
@@ -16,10 +16,10 @@
 
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * AbstractNodeModel用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/AbstractNodeModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,13 +17,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、AbstractNodeModelからそれらを引き受ける。
@@ -112,6 +112,17 @@
 	}
 	
 	/**
+	 * AbstractNodeModel自身を監視するListenerに通知されたEventをAbstractNodeModelの監視Listenerへ通知する。
+	 * 
+	 * @param event {@link ModelChangeEvent}
+	 */
+	public void fireModelChange(ModelChangeEvent event) {
+		for (AbstractNodeModelChangeListener l : listeners) {
+			l.modelChanged(event);
+		}
+	}
+	
+	/**
 	 * sourceConnectionsのcollectionを監視するListenerに通知されたEventをAbstractNodeModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
@@ -136,17 +147,6 @@
 	}
 	
 	/**
-	 * AbstractNodeModel自身を監視するListenerに通知されたEventをAbstractNodeModelの監視Listenerへ通知する。
-	 * 
-	 * @param event {@link ModelChangeEvent}
-	 */
-	public void fireModelChange(ModelChangeEvent event) {
-		for (AbstractNodeModelChangeListener l : listeners) {
-			l.modelChanged(event);
-		}
-	}
-	
-	/**
 	 * AbstractNodeModel自身のEventを監視するListenerを削除する。
 	 * 
 	 * @param l {@link AbstractNodeModelChangeListener}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,7 @@
  */
 package org.jiemamy.core.event.model.node;
 
-import org.jiemamy.core.event.ModelChangeListener;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * StickyModel用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/StickyModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.model.node.StickyModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、StickyModelからそれらを引き受ける。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -16,12 +16,12 @@
 
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.index.IndexModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.index.IndexModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * TableModel用のListener
@@ -31,23 +31,23 @@
 public interface TableModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.ColumnModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.constraint.CheckConstraintModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void columnCollectionChange(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event);
+	void checkCollectionChange(ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event);
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.node.index.IndexModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.ColumnModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void indexCollectionChange(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event);
+	void columnCollectionChange(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event);
 	
 	/**
-	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.typedef.constraint.CheckConstraintModel}のCollectionに対する変更を処理する。
+	 * {@link TableModel}が保持する{@link org.jiemamy.core.model.node.index.IndexModel}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void checkCollectionChange(ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event);
+	void indexCollectionChange(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event);
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/TableModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,15 +17,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.index.IndexModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.index.IndexModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、TableModelからそれらを引き受ける。
@@ -129,36 +129,36 @@
 	}
 	
 	/**
-	 * columnsのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+	 * checksのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireColumnsCollectionChangeEvent(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event) {
+	public void fireChecksCollectionChangeEvent(
+			ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event) {
 		for (TableModelChangeListener l : listeners) {
-			l.columnCollectionChange(event);
+			l.checkCollectionChange(event);
 		}
 	}
 	
 	/**
-	 * indexesのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+	 * columnsのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireIndexesCollectionChangeEvent(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event) {
+	public void fireColumnsCollectionChangeEvent(ObservableCollectionChangeEvent<List<ColumnModel>, ColumnModel> event) {
 		for (TableModelChangeListener l : listeners) {
-			l.indexCollectionChange(event);
+			l.columnCollectionChange(event);
 		}
 	}
 	
 	/**
-	 * checksのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
+	 * indexesのcollectionを監視するListenerに通知されたEventをTableModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireChecksCollectionChangeEvent(
-			ObservableCollectionChangeEvent<List<CheckConstraintModel>, CheckConstraintModel> event) {
+	public void fireIndexesCollectionChangeEvent(ObservableCollectionChangeEvent<List<IndexModel>, IndexModel> event) {
 		for (TableModelChangeListener l : listeners) {
-			l.checkCollectionChange(event);
+			l.indexCollectionChange(event);
 		}
 	}
 	

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,7 @@
  */
 package org.jiemamy.core.event.model.node;
 
-import org.jiemamy.core.event.ModelChangeListener;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * ViewModel用のListener

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/node/ViewModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、ViewModelからそれらを引き受ける。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -16,11 +16,14 @@
 
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * DiagramPresentationModel用のListener
@@ -30,26 +33,25 @@
 public interface DiagramPresentationModelChangeListener extends ModelChangeListener {
 	
 	/**
-	 * {@link DiagramPresentationModel}が保持する{@link  org.jiemamy.core.model.presentation.JmRectangle}のCollectionに対する変更を処理する。
+	 * {@link DiagramPresentationModel}が保持する{@link  java.util.List<JmPoint>}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void nodeLayoutCollectionChange(
-			ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>, org.jiemamy.core.model.presentation.JmRectangle> event);
+	void connectionLayoutCollectionChange(
+			ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<JmPoint>>, java.util.List<JmPoint>> event);
 	
 	/**
-	 * {@link DiagramPresentationModel}が保持する{@link  org.jiemamy.core.model.presentation.JmColor}のCollectionに対する変更を処理する。
+	 * {@link DiagramPresentationModel}が保持する{@link  JmColor}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void nodeColorCollectionChange(
-			ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>, org.jiemamy.core.model.presentation.JmColor> event);
+	void nodeColorCollectionChange(ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmColor>, JmColor> event);
 	
 	/**
-	 * {@link DiagramPresentationModel}が保持する{@link  java.util.List<org.jiemamy.core.model.presentation.JmPoint>}のCollectionに対する変更を処理する。
+	 * {@link DiagramPresentationModel}が保持する{@link  JmRectangle}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void connectionLayoutCollectionChange(
-			ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>, java.util.List<org.jiemamy.core.model.presentation.JmPoint>> event);
+	void nodeLayoutCollectionChange(
+			ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmRectangle>, JmRectangle> event);
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/presentation/DiagramPresentationModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,14 +18,17 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、DiagramPresentationModelからそれらを引き受ける。
@@ -44,14 +47,14 @@
 	 * @see ObservableCollectionChangeListener
 	 * @see #fireNodeLayoutsCollectionChangeEvent(ObservableCollectionChangeEvent)
 	 */
-	private ObservableCollectionChangeListener<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>, org.jiemamy.core.model.presentation.JmRectangle> nodeLayoutsCollectionChangeListener =
-			new ObservableCollectionChangeListener<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>, org.jiemamy.core.model.presentation.JmRectangle>() {
+	private ObservableCollectionChangeListener<Map<AbstractNodeModel, JmRectangle>, JmRectangle> nodeLayoutsCollectionChangeListener =
+			new ObservableCollectionChangeListener<Map<AbstractNodeModel, JmRectangle>, JmRectangle>() {
 				
 				/**
 				 * {@inheritDoc}
 				 */
 				public void collectionChanged(
-						ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>, org.jiemamy.core.model.presentation.JmRectangle> event) {
+						ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmRectangle>, JmRectangle> event) {
 					fireNodeLayoutsCollectionChangeEvent(event);
 				}
 			};
@@ -62,14 +65,14 @@
 	 * @see ObservableCollectionChangeListener
 	 * @see #fireNodeColorsCollectionChangeEvent(ObservableCollectionChangeEvent)
 	 */
-	private ObservableCollectionChangeListener<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>, org.jiemamy.core.model.presentation.JmColor> nodeColorsCollectionChangeListener =
-			new ObservableCollectionChangeListener<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>, org.jiemamy.core.model.presentation.JmColor>() {
+	private ObservableCollectionChangeListener<Map<AbstractNodeModel, JmColor>, JmColor> nodeColorsCollectionChangeListener =
+			new ObservableCollectionChangeListener<Map<AbstractNodeModel, JmColor>, JmColor>() {
 				
 				/**
 				 * {@inheritDoc}
 				 */
 				public void collectionChanged(
-						ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>, org.jiemamy.core.model.presentation.JmColor> event) {
+						ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmColor>, JmColor> event) {
 					fireNodeColorsCollectionChangeEvent(event);
 				}
 			};
@@ -80,14 +83,14 @@
 	 * @see ObservableCollectionChangeListener
 	 * @see #fireConnectionLayoutsCollectionChangeEvent(ObservableCollectionChangeEvent)
 	 */
-	private ObservableCollectionChangeListener<Map<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>, java.util.List<org.jiemamy.core.model.presentation.JmPoint>> connectionLayoutsCollectionChangeListener =
-			new ObservableCollectionChangeListener<Map<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>() {
+	private ObservableCollectionChangeListener<Map<AbstractConnectionModel, java.util.List<JmPoint>>, java.util.List<JmPoint>> connectionLayoutsCollectionChangeListener =
+			new ObservableCollectionChangeListener<Map<AbstractConnectionModel, java.util.List<JmPoint>>, java.util.List<JmPoint>>() {
 				
 				/**
 				 * {@inheritDoc}
 				 */
 				public void collectionChanged(
-						ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>, java.util.List<org.jiemamy.core.model.presentation.JmPoint>> event) {
+						ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<JmPoint>>, java.util.List<JmPoint>> event) {
 					fireConnectionLayoutsCollectionChangeEvent(event);
 				}
 			};
@@ -116,12 +119,12 @@
 	 */
 	public DiagramPresentationModelChangeSupport(DiagramPresentationModel source) {
 		source.addModelChangeListener(diagramPresentationModelChangeListener);
-		((ObservableMap<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>) source.getNodeLayouts())
+		((ObservableMap<AbstractNodeModel, JmRectangle>) source.getNodeLayouts())
 			.addListener(nodeLayoutsCollectionChangeListener);
-		((ObservableMap<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>) source.getNodeColors())
+		((ObservableMap<AbstractNodeModel, JmColor>) source.getNodeColors())
 			.addListener(nodeColorsCollectionChangeListener);
-		((ObservableMap<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>) source
-			.getConnectionLayouts()).addListener(connectionLayoutsCollectionChangeListener);
+		((ObservableMap<AbstractConnectionModel, java.util.List<JmPoint>>) source.getConnectionLayouts())
+			.addListener(connectionLayoutsCollectionChangeListener);
 	}
 	
 	/**
@@ -135,49 +138,49 @@
 	}
 	
 	/**
-	 * nodeLayoutsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
+	 * connectionLayoutsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireNodeLayoutsCollectionChangeEvent(
-			ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmRectangle>, org.jiemamy.core.model.presentation.JmRectangle> event) {
+	public void fireConnectionLayoutsCollectionChangeEvent(
+			ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<JmPoint>>, java.util.List<JmPoint>> event) {
 		for (DiagramPresentationModelChangeListener l : listeners) {
-			l.nodeLayoutCollectionChange(event);
+			l.connectionLayoutCollectionChange(event);
 		}
 	}
 	
 	/**
-	 * nodeColorsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
+	 * DiagramPresentationModel自身を監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ObservableCollectionChangeEvent}
+	 * @param event {@link ModelChangeEvent}
 	 */
-	public void fireNodeColorsCollectionChangeEvent(
-			ObservableCollectionChangeEvent<Map<AbstractNodeModel, org.jiemamy.core.model.presentation.JmColor>, org.jiemamy.core.model.presentation.JmColor> event) {
+	public void fireModelChange(ModelChangeEvent event) {
 		for (DiagramPresentationModelChangeListener l : listeners) {
-			l.nodeColorCollectionChange(event);
+			l.modelChanged(event);
 		}
 	}
 	
 	/**
-	 * connectionLayoutsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
+	 * nodeColorsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
 	 * 
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireConnectionLayoutsCollectionChangeEvent(
-			ObservableCollectionChangeEvent<Map<AbstractConnectionModel, java.util.List<org.jiemamy.core.model.presentation.JmPoint>>, java.util.List<org.jiemamy.core.model.presentation.JmPoint>> event) {
+	public void fireNodeColorsCollectionChangeEvent(
+			ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmColor>, JmColor> event) {
 		for (DiagramPresentationModelChangeListener l : listeners) {
-			l.connectionLayoutCollectionChange(event);
+			l.nodeColorCollectionChange(event);
 		}
 	}
 	
 	/**
-	 * DiagramPresentationModel自身を監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
+	 * nodeLayoutsのcollectionを監視するListenerに通知されたEventをDiagramPresentationModelの監視Listenerへ通知する。
 	 * 
-	 * @param event {@link ModelChangeEvent}
+	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
-	public void fireModelChange(ModelChangeEvent event) {
+	public void fireNodeLayoutsCollectionChangeEvent(
+			ObservableCollectionChangeEvent<Map<AbstractNodeModel, JmRectangle>, JmRectangle> event) {
 		for (DiagramPresentationModelChangeListener l : listeners) {
-			l.modelChanged(event);
+			l.nodeLayoutCollectionChange(event);
 		}
 	}
 	

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/InheritanceColumnModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,7 @@
  */
 package org.jiemamy.core.event.model.typedef;
 
-import org.jiemamy.core.event.ModelChangeListener;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * InheritanceColumnModel用のListener

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:51:13 UTC (rev 1933)
+++ 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)
@@ -17,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.model.typedef.InheritanceColumnModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、InheritanceColumnModelからそれらを引き受ける。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,7 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * CheckConstraintModel用のListener
@@ -28,5 +26,5 @@
  * @author shin1ogawa
  */
 public interface CheckConstraintModelChangeListener extends ModelChangeListener {
-
+	
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/CheckConstraintModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,11 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
 
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、CheckConstraintModelからそれらを引き受ける。
  * 
@@ -35,7 +35,6 @@
 	/** CheckConstraintModel自身のEventを監視するListenerのリスト */
 	private List<CheckConstraintModelChangeListener> listeners = new ArrayList<CheckConstraintModelChangeListener>();
 	
-	
 	/**
 	 * CheckConstraintModelの属性の変更Eventを処理するListener
 	 * 
@@ -50,6 +49,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -71,7 +71,6 @@
 		listeners.add(l);
 	}
 	
-	
 	/**
 	 * CheckConstraintModel自身を監視するListenerに通知されたEventをCheckConstraintModelの監視Listenerへ通知する。
 	 * 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,11 +18,12 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import  org.jiemamy.core.model.typedef.constraint.Constraint;
 import java.util.Map;
-import org.jiemamy.core.event.ModelChangeListener;
+
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * ConstraintSetModel用のListener
@@ -30,12 +31,12 @@
  * @author shin1ogawa
  */
 public interface ConstraintSetModelChangeListener extends ModelChangeListener {
-
 	
 	/**
-	 * {@link ConstraintSetModel}が保持する{@link  org.jiemamy.core.model.typedef.constraint.Constraint}のCollectionに対する変更を処理する。
+	 * {@link ConstraintSetModel}が保持する{@link Constraint}のCollectionに対する変更を処理する。
 	 * 
 	 * @param event
 	 */
-	void constraintMaCollectionChange(ObservableCollectionChangeEvent<Map<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint> event);
+	void constraintMaCollectionChange(
+			ObservableCollectionChangeEvent<Map<Class<? extends Constraint>, Constraint>, Constraint> event);
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/ConstraintSetModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,16 +18,17 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import  org.jiemamy.core.model.typedef.constraint.Constraint;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
+
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、ConstraintSetModelからそれらを引き受ける。
@@ -39,20 +40,20 @@
 	/** ConstraintSetModel自身のEventを監視するListenerのリスト */
 	private List<ConstraintSetModelChangeListener> listeners = new ArrayList<ConstraintSetModelChangeListener>();
 	
-	
 	/** 
 	 * constraintMapのリストを監視するListener 
 	 * 
 	 * @see ObservableCollectionChangeListener
 	 * @see #fireConstraintMapCollectionChangeEvent(ObservableCollectionChangeEvent)
 	 */
-	private ObservableCollectionChangeListener<Map<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint> constraintMapCollectionChangeListener =
-			new ObservableCollectionChangeListener<Map<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>() {
+	private ObservableCollectionChangeListener<Map<Class<? extends Constraint>, Constraint>, Constraint> constraintMapCollectionChangeListener =
+			new ObservableCollectionChangeListener<Map<Class<? extends Constraint>, Constraint>, Constraint>() {
 				
 				/**
 				 * {@inheritDoc}
 				 */
-				public void collectionChanged(ObservableCollectionChangeEvent<Map<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint> event) {
+				public void collectionChanged(
+						ObservableCollectionChangeEvent<Map<Class<? extends Constraint>, Constraint>, Constraint> event) {
 					fireConstraintMapCollectionChangeEvent(event);
 				}
 			};
@@ -71,6 +72,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -78,9 +80,11 @@
 	 * @param source {@link ConstraintSetModel}
 	 * @category instance creation
 	 */
+	@SuppressWarnings("unchecked")
 	public ConstraintSetModelChangeSupport(ConstraintSetModel source) {
 		source.addModelChangeListener(constraintSetModelChangeListener);
-		((ObservableMap<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>) source.getConstraintMap()).addListener(constraintMapCollectionChangeListener);
+		((ObservableMap<Class<? extends Constraint>, Constraint>) source.getConstraintMap())
+			.addListener(constraintMapCollectionChangeListener);
 	}
 	
 	/**
@@ -99,7 +103,7 @@
 	 * @param event {@link ObservableCollectionChangeEvent}
 	 */
 	public void fireConstraintMapCollectionChangeEvent(
-			ObservableCollectionChangeEvent<Map<Class<? extends org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint>,  org.jiemamy.core.model.typedef.constraint.Constraint> event) {
+			ObservableCollectionChangeEvent<Map<Class<? extends Constraint>, Constraint>, Constraint> event) {
 		for (ConstraintSetModelChangeListener l : listeners) {
 			l.constraintMaCollectionChange(event);
 		}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,7 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * NotNullConstraintModel用のListener
@@ -28,5 +26,5 @@
  * @author shin1ogawa
  */
 public interface NotNullConstraintModelChangeListener extends ModelChangeListener {
-
+	
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/NotNullConstraintModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,11 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModel;
 
+import org.jiemamy.spec.model.constraint.NotNullConstraintModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、NotNullConstraintModelからそれらを引き受ける。
  * 
@@ -33,9 +33,9 @@
 public class NotNullConstraintModelChangeSupport {
 	
 	/** NotNullConstraintModel自身のEventを監視するListenerのリスト */
-	private List<NotNullConstraintModelChangeListener> listeners = new ArrayList<NotNullConstraintModelChangeListener>();
+	private List<NotNullConstraintModelChangeListener> listeners =
+			new ArrayList<NotNullConstraintModelChangeListener>();
 	
-	
 	/**
 	 * NotNullConstraintModelの属性の変更Eventを処理するListener
 	 * 
@@ -50,6 +50,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -71,7 +72,6 @@
 		listeners.add(l);
 	}
 	
-	
 	/**
 	 * NotNullConstraintModel自身を監視するListenerに通知されたEventをNotNullConstraintModelの監視Listenerへ通知する。
 	 * 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,7 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * PrimaryKeyConstraintModel用のListener
@@ -28,5 +26,5 @@
  * @author shin1ogawa
  */
 public interface PrimaryKeyConstraintModelChangeListener extends ModelChangeListener {
-
+	
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeSupport.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeSupport.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/PrimaryKeyConstraintModelChangeSupport.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,11 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
 
+import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
+
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、PrimaryKeyConstraintModelからそれらを引き受ける。
  * 
@@ -33,9 +33,9 @@
 public class PrimaryKeyConstraintModelChangeSupport {
 	
 	/** PrimaryKeyConstraintModel自身のEventを監視するListenerのリスト */
-	private List<PrimaryKeyConstraintModelChangeListener> listeners = new ArrayList<PrimaryKeyConstraintModelChangeListener>();
+	private List<PrimaryKeyConstraintModelChangeListener> listeners =
+			new ArrayList<PrimaryKeyConstraintModelChangeListener>();
 	
-	
 	/**
 	 * PrimaryKeyConstraintModelの属性の変更Eventを処理するListener
 	 * 
@@ -50,6 +50,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -71,7 +72,6 @@
 		listeners.add(l);
 	}
 	
-	
 	/**
 	 * PrimaryKeyConstraintModel自身を監視するListenerに通知されたEventをPrimaryKeyConstraintModelの監視Listenerへ通知する。
 	 * 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/constraint/UniqueConstraintModelChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,7 @@
  */
 package org.jiemamy.core.event.model.typedef.constraint;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.constraint.UniqueConstraintModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * UniqueConstraintModel用のListener
@@ -28,5 +26,5 @@
  * @author shin1ogawa
  */
 public interface UniqueConstraintModelChangeListener extends 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:51:13 UTC (rev 1933)
+++ 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)
@@ -20,10 +20,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
+
 import org.jiemamy.core.model.typedef.constraint.UniqueConstraintModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、UniqueConstraintModelからそれらを引き受ける。
@@ -35,7 +35,6 @@
 	/** UniqueConstraintModel自身のEventを監視するListenerのリスト */
 	private List<UniqueConstraintModelChangeListener> listeners = new ArrayList<UniqueConstraintModelChangeListener>();
 	
-	
 	/**
 	 * UniqueConstraintModelの属性の変更Eventを処理するListener
 	 * 
@@ -50,6 +49,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -71,7 +71,6 @@
 		listeners.add(l);
 	}
 	
-	
 	/**
 	 * UniqueConstraintModel自身を監視するListenerに通知されたEventをUniqueConstraintModelの監視Listenerへ通知する。
 	 * 

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeListener.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeListener.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/event/model/typedef/datatype/adapter/PrecisionedDataTypeAdapterChangeListener.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,7 @@
  */
 package org.jiemamy.core.event.model.typedef.datatype.adapter;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * PrecisionedDataTypeAdapter用のListener
@@ -28,5 +26,5 @@
  * @author shin1ogawa
  */
 public interface PrecisionedDataTypeAdapterChangeListener extends 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:51:13 UTC (rev 1933)
+++ 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)
@@ -20,10 +20,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
+
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Event関連の処理をModel内に直接記述するとModelのSourceの可読性が低くなるため、PrecisionedDataTypeAdapterからそれらを引き受ける。
@@ -33,9 +33,9 @@
 public class PrecisionedDataTypeAdapterChangeSupport {
 	
 	/** PrecisionedDataTypeAdapter自身のEventを監視するListenerのリスト */
-	private List<PrecisionedDataTypeAdapterChangeListener> listeners = new ArrayList<PrecisionedDataTypeAdapterChangeListener>();
+	private List<PrecisionedDataTypeAdapterChangeListener> listeners =
+			new ArrayList<PrecisionedDataTypeAdapterChangeListener>();
 	
-	
 	/**
 	 * PrecisionedDataTypeAdapterの属性の変更Eventを処理するListener
 	 * 
@@ -50,6 +50,7 @@
 			fireModelChange(event);
 		}
 	};
+	
 
 	/**
 	 * コンストラクタ。
@@ -71,7 +72,6 @@
 		listeners.add(l);
 	}
 	
-	
 	/**
 	 * PrecisionedDataTypeAdapter自身を監視するListenerに通知されたEventをPrecisionedDataTypeAdapterの監視Listenerへ通知する。
 	 * 

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/Dialect.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/Dialect.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/Dialect.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,81 +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.extension.dialect;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.jiemamy.core.extension.dialect.advisor.ConnectionAdvisor;
-import org.jiemamy.core.extension.dialect.mapping.DataTypeMapping;
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
-import org.jiemamy.core.extension.dialect.quoter.Quoter;
-import org.jiemamy.core.extension.dialect.validator.IdentifierValidator;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.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.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/ConnectionAdvisor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/ConnectionAdvisor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/ConnectionAdvisor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.dialect.advisor;
-
-import java.sql.Connection;
-
-/**
- * DBメタデータの読み出し前後に行うべき処理を司るインターフェイス。
- * @author daisuke
- */
-public interface ConnectionAdvisor {
-	
-	/**
-	 * エンティティ・リレーションの読み出し前に行うべき処理。
-	 * @param connection DB接続
-	 */
-	void setUpRead(Connection connection);
-	
-	/**
-	 * エンティティ・リレーションの読み出し後に行うべき処理。
-	 * @param connection DB接続
-	 */
-	void tearDownRead(Connection connection);
-}

Modified: 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/advisor/DefaultConnectionAdvisor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/advisor/DefaultConnectionAdvisor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,6 +20,8 @@
 
 import java.sql.Connection;
 
+import org.jiemamy.spec.extension.ConnectionAdvisor;
+
 /**
  * {@link ConnectionAdvisor}のデフォルト実装。
  * @author daisuke

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/DataTypeMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/DataTypeMapping.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/DataTypeMapping.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,72 +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.core.extension.dialect.mapping;
-
-import java.util.List;
-
-import org.jiemamy.core.exception.DataTypeNotFoundException;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-
-/**
- * データ型同士の対応関係（マッピング）を表現するクラス。
- * @author daisuke
- */
-public interface DataTypeMapping {
-	
-	/**
-	 * 登録されたデータ型を全て取得する。
-	 * @return 登録されたデータ型のリスト
-	 */
-	public List<Class<? extends AbstractDataType>> 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;
-}

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:51:13 UTC (rev 1933)
+++ 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)
@@ -22,11 +22,11 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.DataTypeNotFoundException;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.spec.exception.DataTypeNotFoundException;
+import org.jiemamy.spec.extension.DataTypeMapping;
+import org.jiemamy.spec.model.datatype.DataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般SQL方言における、データ型同士のマッピング情報を保持するクラス。
@@ -34,13 +34,13 @@
  */
 public class GeneralDataTypeMapping implements DataTypeMapping {
 	
-	private List<Class<? extends AbstractDataType>> entries = CollectionsUtil.newArrayList();
+	private List<Class<? extends DataType>> entries = CollectionsUtil.newArrayList();
 	
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Class<? extends AbstractDataType>> getAllModelingDataTypes() {
+	public List<Class<? extends DataType>> getAllModelingDataTypes() {
 		return entries;
 	}
 	

Modified: 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:51:13 UTC (rev 1933)
+++ 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)
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * マッピング情報を指定するアノテーション。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -23,16 +23,16 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.DataTypeNotFoundException;
-import org.jiemamy.core.exception.IllegalDataTypeImplementationException;
-import org.jiemamy.core.exception.IllegalDialectImplementation;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
 import org.jiemamy.core.model.typedef.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.model.datatype.DataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 特殊SQL方言における、データ型同士のマッピング情報を保持するクラス。
@@ -42,7 +42,7 @@
 	
 	private Dialect dialect;
 	
-	private List<Class<? extends AbstractDataType>> classes = CollectionsUtil.newArrayList();
+	private List<Class<? extends DataType>> classes = CollectionsUtil.newArrayList();
 	
 
 	/**
@@ -57,7 +57,7 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Class<? extends AbstractDataType>> getAllModelingDataTypes() {
+	public List<Class<? extends DataType>> getAllModelingDataTypes() {
 		return classes;
 	}
 	
@@ -65,7 +65,7 @@
 	 * {@inheritDoc}
 	 */
 	public String getTypeName(DataType dataType) {
-		for (Class<? extends AbstractDataType> clazz : classes) {
+		for (Class<? extends DataType> clazz : classes) {
 			if (clazz == dataType.getClass()) {
 				return clazz.getAnnotation(MappingInfo.class).typeName();
 			}
@@ -85,7 +85,7 @@
 	 * {@inheritDoc}
 	 */
 	public GeneralDataType resolveGeneralDataType(SpecialDataType specialDataType) {
-		for (Class<? extends AbstractDataType> clazz : classes) {
+		for (Class<? extends DataType> clazz : classes) {
 			if (clazz == specialDataType.getClass()) {
 				try {
 					GeneralDataType generalDataType = clazz.getAnnotation(MappingInfo.class).generic().newInstance();
@@ -107,7 +107,7 @@
 	 * {@inheritDoc}
 	 */
 	public SpecialDataType resolveSpecialDataType(GeneralDataType generalDataType) {
-		for (Class<? extends AbstractDataType> clazz : classes) {
+		for (Class<? extends DataType> clazz : classes) {
 			if (clazz.getAnnotation(MappingInfo.class).generic() == generalDataType.getClass()) {
 				try {
 					SpecialDataType specialDataType = (SpecialDataType) clazz.newInstance();
@@ -127,7 +127,7 @@
 	 * {@inheritDoc}
 	 */
 	public SpecialDataType resolveSpecialDataType(String typeName) throws DataTypeNotFoundException {
-		for (Class<? extends AbstractDataType> clazz : classes) {
+		for (Class<? extends DataType> clazz : classes) {
 			if (clazz.getAnnotation(MappingInfo.class).typeName().equalsIgnoreCase(typeName)
 					|| JmStringUtil.containsIgnoreCase(clazz.getAnnotation(MappingInfo.class).alias(), typeName)) {
 				try {

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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,7 +18,8 @@
  */
 package org.jiemamy.core.extension.dialect.parser;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link ModelParser}のデフォルト実装。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ExpressionContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ExpressionContext.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ExpressionContext.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.extension.dialect.parser;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * 式解析時のコンテキスト情報。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ModelParser.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ModelParser.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/parser/ModelParser.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.dialect.parser;
-
-import org.jiemamy.core.model.RootModel;
-
-/**
- * モデル解析用インターフェイス。
- * @author j5ik2o
- */
-public interface ModelParser {
-	
-	/**
-	 * 与えられたRootModelを解析し、SQLに変換する。
-	 * @param rootModel RootModel
-	 * @return SQL
-	 */
-	public String parse(RootModel rootModel);
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/quoter/Quoter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/quoter/Quoter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/quoter/Quoter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.dialect.quoter;
-
-/**
- * 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
-	}
-}

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:51:13 UTC (rev 1933)
+++ 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)
@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
+import org.jiemamy.spec.extension.IdentifierValidator;
+
 /**
  * {@link IdentifierValidator}の抽象実装。
  * @author daisuke

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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,6 +18,8 @@
  */
 package org.jiemamy.core.extension.dialect.validator;
 
+import org.jiemamy.spec.extension.IdentifierValidator;
+
 /**
  * {@link IdentifierValidator}のデフォルト実装。全て通す。
  * @author daisuke

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/IdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/IdentifierValidator.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/IdentifierValidator.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.dialect.validator;
-
-/**
- * 識別子の妥当性を判断するインターフェイス。
- * @author daisuke
- */
-public interface IdentifierValidator {
-	
-	/**
-	 * 指定した語が、識別子として適切かどうかを調べる。
-	 * @param word 語
-	 * @return 適切であればtrue
-	 */
-	boolean validate(String word);
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContext.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContext.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,44 +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.core.extension.exporter;
-
-import org.jiemamy.core.interpreter.AbstractContext;
-
-/**
- * エクスポートを行う際のコンテキスト情報。
- * 
- * @author daisuke
- */
-public class ExportContext extends AbstractContext {
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public <T>T getAdapter(Class<T> adapter) {
-		return null;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean hasAdapter(Class<?> adapter) {
-		return false;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContextImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContext.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContextImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/ExportContextImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.exporter;
+
+import org.jiemamy.core.interpreter.AbstractContext;
+import org.jiemamy.spec.extension.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/exporter/ExportContextImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/Exporter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/Exporter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/exporter/Exporter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.exporter;
-
-import org.jiemamy.core.exception.ExportException;
-import org.jiemamy.core.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.core/src/main/java/org/jiemamy/core/extension/importer/ImportContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContext.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContext.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,61 +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.core.extension.importer;
-
-import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
-import org.jiemamy.core.interpreter.AbstractContext;
-
-/**
- * インポートを行う際のコンテキスト情報。
- * 
- * @author daisuke
- */
-public class ImportContext extends AbstractContext {
-	
-	/**
-	 * {@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;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContextImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContext.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContextImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/ImportContextImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.importer;
+
+import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
+import org.jiemamy.core.interpreter.AbstractContext;
+import org.jiemamy.spec.extension.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/importer/ImportContextImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/Importer.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/Importer.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/importer/Importer.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.extension.importer;
-
-import org.jiemamy.core.exception.ImportException;
-import org.jiemamy.core.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;
-	
-}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/AbstractContext.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,11 +18,12 @@
  */
 package org.jiemamy.core.interpreter;
 
+import java.util.List;
 import java.util.Map;
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.adapter.Adaptable;
+import org.jiemamy.spec.adapter.Adaptable;
 
 /**
  * コンテキスト情報。
@@ -36,6 +37,14 @@
 	
 
 	/**
+	 * {@inheritDoc}
+	 */
+	public List<Object> getAdapters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	/**
 	 * コンテキスト値のマップを取得する。
 	 * @return コンテキスト値のマップ
 	 */
@@ -71,5 +80,4 @@
 	public <T>void setValue(String key, T value) {
 		properties.put(key, value);
 	}
-	
 }

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,10 +27,10 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
-import org.jiemamy.core.extension.dialect.Dialect;
 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;
 
 /**
  * データベースを読み込む。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreter.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.interpreter;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * TODO for daisuke

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.interpreter;
 
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.exporter.ExportContext;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.extension.Dialect;
+import org.jiemamy.spec.extension.ExportContext;
+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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/JiemamyInterpreterStab.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,14 +21,14 @@
 import java.text.DateFormat;
 import java.util.Date;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.exporter.ExportContext;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
 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.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * モデルのインタプリタの「とりあえず実装」。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/AbstractModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,7 +21,8 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.core.event.AbstractObservable;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * Jiemamyが扱う、ユーザが定義するDB設計に関わるデータ（モデル）クラスの抽象クラス。
@@ -96,6 +97,14 @@
 	}
 	
 	/**
+	 * 適用可能なアダプタのリストを取得する。
+	 * @return 適用可能なアダプタのリスト
+	 */
+	public List<Object> getAdapters() {
+		return UnmodifiableList.decorate(adapters);
+	}
+	
+	/**
 	 * {@inheritDoc}
 	 */
 	public UUID getId() {
@@ -133,19 +142,7 @@
 		return processor.process((T) this);
 	}
 	
-	protected void addAdapter(Object adapter) {
-		adapters.add(adapter);
-	}
-	
 	/**
-	 * 適用可能なアダプタのリストを取得する。
-	 * @return 適用可能なアダプタのリスト
-	 */
-	protected List<Object> getAdapters() {
-		return UnmodifiableList.decorate(adapters);
-	}
-	
-	/**
 	 * モデルIDを設定する。
 	 * 
 	 * <p>モデルIDは、このモデルのライフサイクル（生成から削除まで）を通して一貫しているべきであり、通常このメソッドは
@@ -154,8 +151,12 @@
 	 * @param id モデルID
 	 * @category accessing
 	 */
-	void setId(UUID id) {
+	public void setId(UUID id) {
 		this.id = id;
 	}
 	
+	protected void addAdapter(Object adapter) {
+		adapters.add(adapter);
+	}
+	
 }

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/JiemamyModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,75 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/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;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import org.seasar.framework.util.Disposable;
-
-import org.jiemamy.core.adapter.Adaptable;
-import org.jiemamy.core.event.Observable;
-import org.jiemamy.core.utils.Processor;
-
-/**
- * Jiemamyが扱う、ユーザが定義するDB設計に関わるデータ（モデル）インターフェイス。
- * @author daisuke
- */
-public interface JiemamyModel extends Serializable, Disposable, Observable, Adaptable {
-	
-	/**
-	 * モデルIDを取得する。
-	 * 
-	 * @return id モデルID
-	 */
-	public UUID getId();
-	
-	/**
-	 * {@link Processor}による処理を実行する。
-	 * 
-	 * <p>Jiemamyのモデルクラスは、基本的に単純なJavaBeansであり、accessorメソッド以外のメソッドはほとんど実装されていない。
-	 * 通常、モデルが持つメソッドだと考えられる処理の多くは{@link Processor}クラスとして切り出されており、
-	 * org.jiemamy.utils.processorパッケージに配置されている。</p>
-	 * 
-	 * <p>例えば、通常はAのように実装されていると予想される処理は、Bのように書くことにより実行することができる。</p>
-	 * 
-	 * <ul>
-	 *   <li>A: <code>RootModel#addTable(TableModel);</code></li>
-	 *   <li>B: <code>RootModel.process(new AddTableProcessor(TableModel));</code></li>
-	 * </ul>
-	 * 
-	 * <p>与える{@link Processor}によっては、戻り値を得ることも可能であり、戻り値の型は {@link Processor}に依る。
-	 * また、チェック例外を受け取る事も可能であり、例外の種類は同様に {@link Processor}に依る。</p>
-	 * 
-	 * <p>これはVisitorパターンの実装であり、processメソッドはacceptメソッド、ProcessorはVisitorにあたる要素である。</p>
-	 * 
-	 * <p>cf. http://d.hatena.ne.jp/daisuke-m/20080801/1217594494</p>
-	 * 
-	 * @param <R> 処理結果の型（Processorによって指定される）
-	 * @param <T> 処理対象モデルの型（Processorによって指定される）
-	 * @param <E> 処理が投げる可能性のある例外の型
-	 *     （Processorによって指定され、チェック例外を投げない場合は {@link RuntimeException}が指定されている。
-	 * @param processor 実行するプロセッサ
-	 * @return プロセス結果
-	 * @throws E Processorが例外を投げた場合
-	 */
-	@SuppressWarnings("unchecked")
-	public <R, T extends JiemamyModel, E extends Exception>R process(Processor<T, R, E> processor) throws E;
-	
-}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ModelIdManager.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ModelIdManager.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/ModelIdManager.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,6 +23,8 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
+import org.jiemamy.spec.model.JiemamyModel;
+
 /**
  * モデルIDを管理するマネージャクラス。
  * @author j5ik2o
@@ -47,7 +49,7 @@
 	
 
 	/** モデル管理マップ */
-	private Map<UUID, AbstractModel> modelMap = CollectionsUtil.newHashMap();
+	private Map<UUID, JiemamyModel> modelMap = CollectionsUtil.newHashMap();
 	
 
 	/**
@@ -85,7 +87,7 @@
 	 * モデルに新しいモデルIDを設定し，モデル管理マップに登録する。
 	 * @param model モデル
 	 */
-	synchronized void register(AbstractModel model) {
+	synchronized void register(JiemamyModel model) {
 		UUID id = UUID.randomUUID();
 		model.setId(id);
 		modelMap.put(id, model);
@@ -96,7 +98,7 @@
 	 * <p>モデルIDに関連づくオブジェクトも破棄されます</p>
 	 * @param model モデル
 	 */
-	synchronized void unregister(AbstractModel model) {
+	synchronized void unregister(JiemamyModel model) {
 		modelMap.remove(model.getId());
 		model.setId(null);
 	}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,283 +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;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.event.collectionimpl.ObservableSet;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.typedef.DomainModel;
-
-/**
- * 1つのDBスキーマ・データ全体を表す。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class RootModel extends AbstractModel {
-	
-	/** SQL方言クラス名 */
-	private String dialectClassName;
-	
-	/** 開始スクリプト */
-	private String beginScript;
-	
-	/** 終了スクリプト */
-	private String endScript;
-	
-	/** 説明文 */
-	private String description;
-	
-	/** スキーマ名 */
-	private String schemaName;
-	
-	/** ドメインのリスト */
-	private List<DomainModel> domains = ObservableList.decorate(new ArrayList<DomainModel>());
-	
-	/** ノードのリスト */
-	private Set<AbstractNodeModel> nodes = ObservableSet.decorate(new HashSet<AbstractNodeModel>());
-	
-	/**
-	 * コネクションのリスト
-	 * 
-	 * THINK bacchusでは、connectionsを保持していなかった。nodesを辿れば全てのconnectionsが取れるから。
-	 * しかし、モデル的に考えると「ノード」と「コネクション」の間には従属関係がなく、等レベルの要素な気がする。
-	 * （対する、テーブルとカラムの間には親子の従属関係がある）
-	 * その為、connectionはnodeにぶら下がる形でなく、RootModelの中でリストを持ってみた。
-	 */
-	private Set<AbstractConnectionModel> connections = ObservableSet.decorate(new HashSet<AbstractConnectionModel>());
-	
-	/**
-	 * ダイアグラム表現（レイアウト等）のリスト
-	 * 
-	 * bacchusでは、1つのDBモデルに対して、表現（見た目）が1つしか定義できなかったが、
-	 * presentationモデルを分離してCollectionで持つことにより、複数の表現を保持できる。
-	 * （FOOテーブルとその周辺のER図、BARテーブルとその周辺のER図... 等）
-	 */
-	private List<DiagramPresentationModel> diagramPresentations =
-			ObservableList.decorate(new ArrayList<DiagramPresentationModel>());
-	
-	/**
-	 * INSERTデータセット
-	 * 
-	 * bacchusでは、1つのDBモデルに対して、INSERTするデータセットが1つしか定義できなかったが、
-	 * データセットモデルを分離してCollectionで持つことにより、複数のデータセットを保持できる。
-	 * （テストA用のデータセット、テストB用のデータセット... 等）
-	 */
-	private List<InsertDataSetModel> insertDataSets = ObservableList.decorate(new ArrayList<InsertDataSetModel>());
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void dispose() {
-		for (DomainModel domain : domains) {
-			domain.dispose();
-		}
-		for (AbstractNodeModel node : nodes) {
-			node.dispose();
-		}
-		for (AbstractConnectionModel connection : connections) {
-			connection.dispose();
-		}
-		for (DiagramPresentationModel diagramPresentation : diagramPresentations) {
-			diagramPresentation.dispose();
-		}
-		for (InsertDataSetModel insertDataSet : insertDataSets) {
-			insertDataSet.dispose();
-		}
-		super.dispose();
-	}
-	
-	/**
-	 * 開始スクリプトを取得する。
-	 * @return 開始スクリプト
-	 */
-	public String getBeginScript() {
-		return beginScript;
-	}
-	
-	/**
-	 * コネクションのリストを取得する。
-	 * @return コネクションのリスト
-	 */
-	public Set<AbstractConnectionModel> getConnections() {
-		return connections;
-	}
-	
-	/**
-	 * 説明文を取得する。
-	 * @return 説明文
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * ダイアグラム表現（レイアウト等）のリストを取得する。
-	 * @return ダイアグラム表現（レイアウト等）のリスト
-	 */
-	public List<DiagramPresentationModel> getDiagramPresentations() {
-		return diagramPresentations;
-	}
-	
-	/**
-	 * SQL方言クラス名を取得する。
-	 * @return RDBMS名
-	 */
-	public String getDialectClassName() {
-		return dialectClassName;
-	}
-	
-	/**
-	 * ドメインのリストを取得する。
-	 * @return ドメインのリスト
-	 */
-	public List<DomainModel> getDomains() {
-		return domains;
-	}
-	
-	/**
-	 * 終了スクリプトを取得する。
-	 * @return 終了スクリプト
-	 */
-	public String getEndScript() {
-		return endScript;
-	}
-	
-	/**
-	 * INSERTデータセットを取得する。
-	 * @return INSERTデータセット
-	 */
-	public List<InsertDataSetModel> getInsertDataSets() {
-		return insertDataSets;
-	}
-	
-	/**
-	 * ノードのリストを取得する。
-	 * @return ノードのリスト
-	 */
-	public Set<AbstractNodeModel> getNodes() {
-		return nodes;
-	}
-	
-	/**
-	 * スキーマ名を取得する。
-	 * @return スキーマ名
-	 */
-	public String getSchemaName() {
-		return schemaName;
-	}
-	
-	/**
-	 * 開始スクリプトを設定する。
-	 * @param beginScript 開始スクリプト
-	 */
-	public void setBeginScript(String beginScript) {
-		this.beginScript = beginScript;
-	}
-	
-	/**
-	 * 説明文を設定する。
-	 * @param description 説明文
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * SQL方言クラス名を設定する。
-	 * @param dialectClassName RDBMS名
-	 */
-	public void setDialectClassName(String dialectClassName) {
-		this.dialectClassName = dialectClassName;
-	}
-	
-	/**
-	 * 終了スクリプトを設定する。
-	 * @param endScript 終了スクリプト
-	 */
-	public void setEndScript(String endScript) {
-		this.endScript = endScript;
-	}
-	
-	/**
-	 * スキーマ名を設定する。
-	 * @param schemaName スキーマ名
-	 */
-	public void setSchemaName(String schemaName) {
-		this.schemaName = schemaName;
-	}
-	
-//	/**
-//	 * {@inheritDoc}
-//	 */
-//	@Override
-//	public String toString() {
-//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
-//	}
-	
-	/**
-	 * コネクションのリストを設定する。
-	 * @param connections コネクションのリスト
-	 */
-	void setConnections(ObservableSet<AbstractConnectionModel> connections) {
-		this.connections = connections;
-	}
-	
-	/**
-	 * ダイアグラム表現（レイアウト等）のリストを設定する。
-	 * @param diagramPresentations ダイアグラム表現（レイアウト等）のリスト
-	 */
-	void setDiagramPresentations(ObservableList<DiagramPresentationModel> diagramPresentations) {
-		this.diagramPresentations = diagramPresentations;
-	}
-	
-	/**
-	 * ドメインのリストを設定する。
-	 * @param domains ドメインのリスト
-	 */
-	void setDomains(ObservableList<DomainModel> domains) {
-		this.domains = domains;
-	}
-	
-	/**
-	 * INSERTデータセットを設定する。
-	 * @param insertDataSets INSERTデータセット
-	 */
-	void setInsertDataSets(ObservableList<InsertDataSetModel> insertDataSets) {
-		this.insertDataSets = insertDataSets;
-	}
-	
-	/**
-	 * ノードのリストを設定する。
-	 * @param nodes ノードのリスト
-	 */
-	void setNodes(ObservableSet<AbstractNodeModel> nodes) {
-		this.nodes = nodes;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/RootModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,284 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.jiemamy.core.event.collectionimpl.ObservableList;
+import org.jiemamy.core.event.collectionimpl.ObservableSet;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+
+/**
+ * 1つのDBスキーマ・データ全体を表す。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class RootModelImpl extends AbstractModel implements RootModel {
+	
+	/** SQL方言クラス名 */
+	private String dialectClassName;
+	
+	/** 開始スクリプト */
+	private String beginScript;
+	
+	/** 終了スクリプト */
+	private String endScript;
+	
+	/** 説明文 */
+	private String description;
+	
+	/** スキーマ名 */
+	private String schemaName;
+	
+	/** ドメインのリスト */
+	private List<DomainModel> domains = ObservableList.decorate(new ArrayList<DomainModel>());
+	
+	/** ノードのリスト */
+	private Set<AbstractNodeModel> nodes = ObservableSet.decorate(new HashSet<AbstractNodeModel>());
+	
+	/**
+	 * コネクションのリスト
+	 * 
+	 * THINK bacchusでは、connectionsを保持していなかった。nodesを辿れば全てのconnectionsが取れるから。
+	 * しかし、モデル的に考えると「ノード」と「コネクション」の間には従属関係がなく、等レベルの要素な気がする。
+	 * （対する、テーブルとカラムの間には親子の従属関係がある）
+	 * その為、connectionはnodeにぶら下がる形でなく、RootModelの中でリストを持ってみた。
+	 */
+	private Set<AbstractConnectionModel> connections = ObservableSet.decorate(new HashSet<AbstractConnectionModel>());
+	
+	/**
+	 * ダイアグラム表現（レイアウト等）のリスト
+	 * 
+	 * bacchusでは、1つのDBモデルに対して、表現（見た目）が1つしか定義できなかったが、
+	 * presentationモデルを分離してCollectionで持つことにより、複数の表現を保持できる。
+	 * （FOOテーブルとその周辺のER図、BARテーブルとその周辺のER図... 等）
+	 */
+	private List<DiagramPresentationModel> diagramPresentations =
+			ObservableList.decorate(new ArrayList<DiagramPresentationModel>());
+	
+	/**
+	 * INSERTデータセット
+	 * 
+	 * bacchusでは、1つのDBモデルに対して、INSERTするデータセットが1つしか定義できなかったが、
+	 * データセットモデルを分離してCollectionで持つことにより、複数のデータセットを保持できる。
+	 * （テストA用のデータセット、テストB用のデータセット... 等）
+	 */
+	private List<InsertDataSetModel> insertDataSets = ObservableList.decorate(new ArrayList<InsertDataSetModel>());
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		for (DomainModel domain : domains) {
+			domain.dispose();
+		}
+		for (AbstractNodeModel node : nodes) {
+			node.dispose();
+		}
+		for (AbstractConnectionModel connection : connections) {
+			connection.dispose();
+		}
+		for (DiagramPresentationModel diagramPresentation : diagramPresentations) {
+			diagramPresentation.dispose();
+		}
+		for (InsertDataSetModel insertDataSet : insertDataSets) {
+			insertDataSet.dispose();
+		}
+		super.dispose();
+	}
+	
+	/**
+	 * 開始スクリプトを取得する。
+	 * @return 開始スクリプト
+	 */
+	public String getBeginScript() {
+		return beginScript;
+	}
+	
+	/**
+	 * コネクションのリストを取得する。
+	 * @return コネクションのリスト
+	 */
+	public Set<AbstractConnectionModel> getConnections() {
+		return connections;
+	}
+	
+	/**
+	 * 説明文を取得する。
+	 * @return 説明文
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * ダイアグラム表現（レイアウト等）のリストを取得する。
+	 * @return ダイアグラム表現（レイアウト等）のリスト
+	 */
+	public List<DiagramPresentationModel> getDiagramPresentations() {
+		return diagramPresentations;
+	}
+	
+	/**
+	 * SQL方言クラス名を取得する。
+	 * @return RDBMS名
+	 */
+	public String getDialectClassName() {
+		return dialectClassName;
+	}
+	
+	/**
+	 * ドメインのリストを取得する。
+	 * @return ドメインのリスト
+	 */
+	public List<DomainModel> getDomains() {
+		return domains;
+	}
+	
+	/**
+	 * 終了スクリプトを取得する。
+	 * @return 終了スクリプト
+	 */
+	public String getEndScript() {
+		return endScript;
+	}
+	
+	/**
+	 * INSERTデータセットを取得する。
+	 * @return INSERTデータセット
+	 */
+	public List<InsertDataSetModel> getInsertDataSets() {
+		return insertDataSets;
+	}
+	
+	/**
+	 * ノードのリストを取得する。
+	 * @return ノードのリスト
+	 */
+	public Set<AbstractNodeModel> getNodes() {
+		return nodes;
+	}
+	
+	/**
+	 * スキーマ名を取得する。
+	 * @return スキーマ名
+	 */
+	public String getSchemaName() {
+		return schemaName;
+	}
+	
+	/**
+	 * 開始スクリプトを設定する。
+	 * @param beginScript 開始スクリプト
+	 */
+	public void setBeginScript(String beginScript) {
+		this.beginScript = beginScript;
+	}
+	
+	/**
+	 * 説明文を設定する。
+	 * @param description 説明文
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * SQL方言クラス名を設定する。
+	 * @param dialectClassName RDBMS名
+	 */
+	public void setDialectClassName(String dialectClassName) {
+		this.dialectClassName = dialectClassName;
+	}
+	
+	/**
+	 * 終了スクリプトを設定する。
+	 * @param endScript 終了スクリプト
+	 */
+	public void setEndScript(String endScript) {
+		this.endScript = endScript;
+	}
+	
+	/**
+	 * スキーマ名を設定する。
+	 * @param schemaName スキーマ名
+	 */
+	public void setSchemaName(String schemaName) {
+		this.schemaName = schemaName;
+	}
+	
+//	/**
+//	 * {@inheritDoc}
+//	 */
+//	@Override
+//	public String toString() {
+//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+//	}
+	
+	/**
+	 * コネクションのリストを設定する。
+	 * @param connections コネクションのリスト
+	 */
+	void setConnections(ObservableSet<AbstractConnectionModel> connections) {
+		this.connections = connections;
+	}
+	
+	/**
+	 * ダイアグラム表現（レイアウト等）のリストを設定する。
+	 * @param diagramPresentations ダイアグラム表現（レイアウト等）のリスト
+	 */
+	void setDiagramPresentations(ObservableList<DiagramPresentationModel> diagramPresentations) {
+		this.diagramPresentations = diagramPresentations;
+	}
+	
+	/**
+	 * ドメインのリストを設定する。
+	 * @param domains ドメインのリスト
+	 */
+	void setDomains(ObservableList<DomainModel> domains) {
+		this.domains = domains;
+	}
+	
+	/**
+	 * INSERTデータセットを設定する。
+	 * @param insertDataSets INSERTデータセット
+	 */
+	void setInsertDataSets(ObservableList<InsertDataSetModel> insertDataSets) {
+		this.insertDataSets = insertDataSets;
+	}
+	
+	/**
+	 * ノードのリストを設定する。
+	 * @param nodes ノードのリスト
+	 */
+	void setNodes(ObservableSet<AbstractNodeModel> nodes) {
+		this.nodes = nodes;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,88 +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.connection;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-
-/**
- * コネクション（FKと継承等）の抽象クラス。
- * 
- * @author daisuke
- */
-public abstract class AbstractConnectionModel extends AbstractModel {
-	
-	/** 接続元ノード */
-	protected AbstractNodeModel source;
-	
-	/** 接続先ノード */
-	protected AbstractNodeModel target;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @param source 接続元ノード
-	 * @param target 接続先ノード
-	 * @category instance creation
-	 */
-	public AbstractConnectionModel(AbstractNodeModel source, AbstractNodeModel target) {
-		this.source = source;
-		this.target = target;
-	}
-	
-	/**
-	 * 接続元ノードを取得する。
-	 * @return 接続元ノード
-	 */
-	public AbstractNodeModel getSource() {
-		return source;
-	}
-	
-	/**
-	 * 接続先ノードを取得する。 
-	 * @return 接続先ノード
-	 */
-	public AbstractNodeModel getTarget() {
-		return target;
-	}
-	
-	/**
-	 * 接続元ノードを設定する。
-	 * @param source 接続元ノード
-	 */
-	public void setSource(AbstractNodeModel source) {
-		this.source = source;
-	}
-	
-	/**
-	 * 接続先ノードを設定する。
-	 * @param target 接続先ノード
-	 */
-	public void setTarget(AbstractNodeModel target) {
-		this.target = target;
-	}
-	
-//	/**
-//	 * {@inheritDoc}
-//	 */
-//	@Override
-//	public String toString() {
-//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
-//	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractConnectionModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,89 @@
+/*
+ * 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.connection;
+
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+
+/**
+ * コネクション（FKと継承等）の抽象クラス。
+ * 
+ * @author daisuke
+ */
+public abstract class AbstractConnectionModelImpl extends AbstractModel implements AbstractConnectionModel {
+	
+	/** 接続元ノード */
+	protected AbstractNodeModel source;
+	
+	/** 接続先ノード */
+	protected AbstractNodeModel target;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @param source 接続元ノード
+	 * @param target 接続先ノード
+	 * @category instance creation
+	 */
+	public AbstractConnectionModelImpl(AbstractNodeModel source, AbstractNodeModel target) {
+		this.source = source;
+		this.target = target;
+	}
+	
+	/**
+	 * 接続元ノードを取得する。
+	 * @return 接続元ノード
+	 */
+	public AbstractNodeModel getSource() {
+		return source;
+	}
+	
+	/**
+	 * 接続先ノードを取得する。 
+	 * @return 接続先ノード
+	 */
+	public AbstractNodeModel getTarget() {
+		return target;
+	}
+	
+	/**
+	 * 接続元ノードを設定する。
+	 * @param source 接続元ノード
+	 */
+	public void setSource(AbstractNodeModel source) {
+		this.source = source;
+	}
+	
+	/**
+	 * 接続先ノードを設定する。
+	 * @param target 接続先ノード
+	 */
+	public void setTarget(AbstractNodeModel target) {
+		this.target = target;
+	}
+	
+//	/**
+//	 * {@inheritDoc}
+//	 */
+//	@Override
+//	public String toString() {
+//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+//	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,73 +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.connection;
-
-import org.jiemamy.core.model.node.AbstractEntityModel;
-
-/**
- * コネクション（FKと継承）のAbstractモデル。
- * 
- * @author daisuke
- */
-public abstract class AbstractRelationModel extends AbstractConnectionModel {
-	
-	/**
-	 * コンストラクタ。
-	 * @param source 接続元モデル
-	 * @param target 接続先モデル
-	 * @category instance creation
-	 */
-	public AbstractRelationModel(AbstractEntityModel source, AbstractEntityModel target) {
-		super(source, target);
-	}
-	
-	/**
-	 * 接続元ノードを取得する。
-	 * @return 接続元ノード
-	 */
-	@Override
-	public AbstractEntityModel getSource() {
-		return (AbstractEntityModel) source;
-	}
-	
-	/**
-	 * 接続先ノードを取得する。 
-	 * @return 接続先ノード
-	 */
-	@Override
-	public AbstractEntityModel getTarget() {
-		return (AbstractEntityModel) target;
-	}
-	
-	/**
-	 * 接続元ノードを設定する。
-	 * @param source 接続元ノード
-	 */
-	public void setSource(AbstractEntityModel source) {
-		super.setSource(source);
-	}
-	
-	/**
-	 * 接続先ノードを設定する。
-	 * @param target 接続先ノード
-	 */
-	public void setTarget(AbstractEntityModel target) {
-		super.setTarget(target);
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/AbstractRelationModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,41 @@
+/*
+ * 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.connection;
+
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+
+/**
+ * コネクション（FKと継承）のAbstractモデル。
+ * 
+ * @author daisuke
+ */
+public abstract class AbstractRelationModelImpl extends AbstractConnectionModelImpl implements AbstractRelationModel {
+	
+	/**
+	 * コンストラクタ。
+	 * @param source 接続元モデル
+	 * @param target 接続先モデル
+	 * @category instance creation
+	 */
+	public AbstractRelationModelImpl(AbstractEntityModel source, AbstractEntityModel target) {
+		super(source, target);
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMapping.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMapping.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,75 +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.connection;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-
-/**
- * 外部キーマッピングのモデル。
- * 
- * カラムとカラムの関係を表すモデルクラス。
- * ForeignKeyModelクラスのフィールドに、このクラスのリストが内包されている。
- * ForeignKeyMapping#getConstraintColumn() で「参照元カラム」、
- * ForeignKeyMapping#getReferenceColumn()で「参照先カラム」を得ることができる。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ForeignKeyMapping extends AbstractModel {
-	
-	/** 制約を受けるカラム */
-	private ColumnModel constraintColumn;
-	
-	/** 参照先カラム */
-	private ColumnModel referenceColumn;
-	
-
-	/**
-	 * 制約を受けるカラムを取得する。
-	 * @return 制約を受けるカラム
-	 */
-	public ColumnModel getConstraintColumn() {
-		return constraintColumn;
-	}
-	
-	/**
-	 * 参照先カラムを取得する。
-	 * @return 参照先カラム
-	 */
-	public ColumnModel getReferenceColumn() {
-		return referenceColumn;
-	}
-	
-	/**
-	 * 制約を受けるカラムを設定する。
-	 * @param constraintColumn 制約を受けるカラム
-	 */
-	public void setConstraintColumn(ColumnModel constraintColumn) {
-		this.constraintColumn = constraintColumn;
-	}
-	
-	/**
-	 * 参照先カラムを設定する。
-	 * @param referenceColumn 参照先カラム
-	 */
-	public void setReferenceColumn(ColumnModel referenceColumn) {
-		this.referenceColumn = referenceColumn;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMapping.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyMappingImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,76 @@
+/*
+ * 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.connection;
+
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+
+/**
+ * 外部キーマッピングのモデル。
+ * 
+ * カラムとカラムの関係を表すモデルクラス。
+ * ForeignKeyModelクラスのフィールドに、このクラスのリストが内包されている。
+ * ForeignKeyMapping#getConstraintColumn() で「参照元カラム」、
+ * ForeignKeyMapping#getReferenceColumn()で「参照先カラム」を得ることができる。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class ForeignKeyMappingImpl extends AbstractModel implements ForeignKeyMapping {
+	
+	/** 制約を受けるカラム */
+	private ColumnModel constraintColumn;
+	
+	/** 参照先カラム */
+	private ColumnModel referenceColumn;
+	
+
+	/**
+	 * 制約を受けるカラムを取得する。
+	 * @return 制約を受けるカラム
+	 */
+	public ColumnModel getConstraintColumn() {
+		return constraintColumn;
+	}
+	
+	/**
+	 * 参照先カラムを取得する。
+	 * @return 参照先カラム
+	 */
+	public ColumnModel getReferenceColumn() {
+		return referenceColumn;
+	}
+	
+	/**
+	 * 制約を受けるカラムを設定する。
+	 * @param constraintColumn 制約を受けるカラム
+	 */
+	public void setConstraintColumn(ColumnModel constraintColumn) {
+		this.constraintColumn = constraintColumn;
+	}
+	
+	/**
+	 * 参照先カラムを設定する。
+	 * @param referenceColumn 参照先カラム
+	 */
+	public void setReferenceColumn(ColumnModel referenceColumn) {
+		this.referenceColumn = referenceColumn;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,332 +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.connection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.ForEachUtil;
-import org.jiemamy.core.utils.processor.SetDefaultColumnsProcessor;
-import org.jiemamy.core.utils.visitor.impl.PrimaryKeyVisitor;
-
-/**
- * 外部キーモデル。
- * 
- * テーブル同士の関係を表すモデルクラス。
- * ForeignKeyModel#getSource() で「参照元テーブル」、
- * ForeignKeyModel#getTarget() で「参照先テーブル」を得ることができる。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ForeignKeyModel extends AbstractRelationModel { // implements IPropertySource
-
-	/** 名前 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** マッピングのリスト */
-	private List<ForeignKeyMapping> mappings = ObservableList.decorate(new ArrayList<ForeignKeyMapping>());
-	
-	/** マッチ型 */
-	private MatchType matchType;
-	
-	/** 削除時アクション */
-	private ReferentialAction onDelete;
-	
-	/** 更新時アクション */
-	private ReferentialAction onUpdate;
-	
-	/**
-	 * 遅延評価可能性。
-	 * 
-	 * 遅延不可の制約は各コマンドの後すぐに検査される。
-	 * 遅延可能な制約の検査は、トランザクションの終了時まで遅延させることができる。
-	 */
-	private boolean deferrable;
-	
-	/**
-	 * 遅延評価の初期状態。
-	 * 
-	 * 制約が遅延可能な場合、この句は制約検査を行うデフォルトの時期を指定する。
-	 */
-	private InitiallyCheckTime initiallyCheckTime;
-	
-	/** 説明文 */
-	private String description;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ForeignKeyModel() {
-		super(null, null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param source 接続元（被制約）テーブル
-	 * @param target 接続先（参照）テーブル
-	 * @param createColumn 参照先カラムと同名のカラムを生成して、そのカラムにマッピングする場合は<tt>true</tt>
-	 * 		既存のカラムにマッピングする場合は<tt>false</tt>を渡す。
-	 * @category instance creation
-	 */
-	public ForeignKeyModel(AbstractEntityModel source, AbstractEntityModel target, boolean createColumn) {
-		super(source, target);
-		createMappings(createColumn);
-	}
-	
-	/**
-	 * targetを元に、マッピングを生成する。
-	 * 
-	 * @param createColumn 参照先カラムと同名のカラムを生成して、そのカラムにマッピングする場合は<tt>true</tt>
-	 * 		既存のカラムにマッピングする場合は<tt>false</tt>を渡す。
-	 * TODO extract to processor
-	 */
-	public void createMappings(boolean createColumn) {
-		mappings.clear();
-		
-		TableModel tableModel = (TableModel) getTarget();
-		List<ColumnModel> referencePkColumns = ForEachUtil.accept(tableModel.getColumns(), new PrimaryKeyVisitor());
-		for (ColumnModel referencePkColumn : referencePkColumns) {
-			ForeignKeyMapping mapping = new ForeignKeyMapping();
-			mapping.process(new SetDefaultColumnsProcessor((TableModel) getSource(), referencePkColumn, createColumn));
-			mappings.add(mapping);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void dispose() {
-		for (ForeignKeyMapping mapping : mappings) {
-			mapping.dispose();
-		}
-		super.dispose();
-	}
-	
-	/**
-	 * 説明文を取得する。
-	 * @return 説明文
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * 遅延評価の初期状態。を取得する。
-	 * @return 遅延評価の初期状態。
-	 */
-	public InitiallyCheckTime getInitiallyCheckTime() {
-		return initiallyCheckTime;
-	}
-	
-	/**
-	 * 論理名を取得する。
-	 * @return 論理名
-	 */
-	public String getLogicalName() {
-		return logicalName;
-	}
-	
-	/**
-	 * マッピングのリストを取得する。
-	 * @return マッピングのリスト
-	 */
-	public List<ForeignKeyMapping> getMappings() {
-		return mappings;
-	}
-	
-	/**
-	 * マッチ型を取得する。
-	 * @return マッチ型
-	 */
-	public MatchType getMatchType() {
-		return matchType;
-	}
-	
-	/**
-	 * 名前を取得する。
-	 * @return 名前
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * 削除時アクションを取得する。
-	 * @return 削除時アクション
-	 */
-	public ReferentialAction getOnDelete() {
-		return onDelete;
-	}
-	
-	/**
-	 * 更新時アクションを取得する。
-	 * @return 更新時アクション
-	 */
-	public ReferentialAction getOnUpdate() {
-		return onUpdate;
-	}
-	
-	/**
-	 * 遅延評価可能性。を取得する。
-	 * @return 遅延評価可能性。
-	 */
-	public boolean isDeferrable() {
-		return deferrable;
-	}
-	
-	/**
-	 * 遅延評価可能性。を設定する。
-	 * @param deferrable 遅延評価可能性。
-	 */
-	public void setDeferrable(boolean deferrable) {
-		this.deferrable = deferrable;
-	}
-	
-	/**
-	 * 説明文を設定する。
-	 * @param description 説明文
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * 遅延評価の初期状態。を設定する。
-	 * @param initiallyCheckTime 遅延評価の初期状態。
-	 */
-	public void setInitiallyCheckTime(InitiallyCheckTime initiallyCheckTime) {
-		this.initiallyCheckTime = initiallyCheckTime;
-	}
-	
-	/**
-	 * 論理名を設定する。
-	 * @param logicalName 論理名
-	 */
-	public void setLogicalName(String logicalName) {
-		this.logicalName = logicalName;
-	}
-	
-	/**
-	 * マッチ型を設定する。
-	 * @param matchType マッチ型
-	 */
-	public void setMatchType(MatchType matchType) {
-		this.matchType = matchType;
-	}
-	
-	/**
-	 * 名前を設定する。
-	 * @param name 名前
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * 削除時アクションを設定する。
-	 * @param onDelete 削除時アクション
-	 */
-	public void setOnDelete(ReferentialAction onDelete) {
-		this.onDelete = onDelete;
-	}
-	
-	/**
-	 * 更新時アクションを設定する。
-	 * @param onUpdate 更新時アクション
-	 */
-	public void setOnUpdate(ReferentialAction onUpdate) {
-		this.onUpdate = onUpdate;
-	}
-	
-	/**
-	 * マッピングのリストを設定する。
-	 * @param mappings マッピングのリスト
-	 */
-	void setMappings(List<ForeignKeyMapping> mappings) {
-		this.mappings = mappings;
-	}
-	
-
-	/**
-	 * 制約検査を行うデフォルトの時期。
-	 * 
-	 * @author daisuke
-	 */
-	public enum InitiallyCheckTime {
-		
-		/** 各文の実行後に検査 */
-		IMMEDIATE,
-
-		/** トランザクションの終了時にのみ検査 */
-		DEFERRED;
-		
-		// implements IPropertySource
-		
-	}
-	
-	/**
-	 * 参照列に挿入された値は、被参照テーブルと被参照列の値に対して、指定した照合型で照会される。
-	 * 照合型には3種類があり、デフォルトはSIMPLE照合型。
-	 * @author daisuke
-	 */
-	public enum MatchType {
-		
-		/** 外部キーの他の部分がNULLでない限り、外部キーの一部をNULLとなることを許可する。 */
-		SIMPLE,
-
-		/** 全ての外部キー列がNULLとなる場合を除き、複数列外部キーのある列がNULLとなることを許可しない。 */
-		FULL,
-
-		/** まだ実装されていない。 */
-		PARTIAL;
-	}
-	
-	/**
-	 * 連鎖参照整合性制約の設定。
-	 * 
-	 * @author daisuke
-	 */
-	public enum ReferentialAction {
-		/** 連鎖的に修正する */
-		CASCADE,
-
-		/** NULLを設定する */
-		SET_NULL,
-
-		/** デフォルト値を設定する */
-		SET_DEFAULT,
-
-		/** 削除/変更を許可しない */
-		RESTRICT,
-
-		/** 特に何も行わない */
-		NO_ACTION,
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/ForeignKeyModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,278 @@
+/*
+ * 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.connection;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jiemamy.core.event.collectionimpl.ObservableList;
+import org.jiemamy.core.utils.ForEachUtil;
+import org.jiemamy.core.utils.processor.SetDefaultColumnsProcessor;
+import org.jiemamy.core.utils.visitor.impl.PrimaryKeyVisitor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
+
+/**
+ * 外部キーモデル。
+ * 
+ * テーブル同士の関係を表すモデルクラス。
+ * ForeignKeyModel#getSource() で「参照元テーブル」、
+ * ForeignKeyModel#getTarget() で「参照先テーブル」を得ることができる。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class ForeignKeyModelImpl extends AbstractRelationModelImpl implements ForeignKeyModel { // implements IPropertySource
+
+	/** 名前 */
+	private String name;
+	
+	/** 論理名 */
+	private String logicalName;
+	
+	/** マッピングのリスト */
+	private List<ForeignKeyMapping> mappings = ObservableList.decorate(new ArrayList<ForeignKeyMapping>());
+	
+	/** マッチ型 */
+	private MatchType matchType;
+	
+	/** 削除時アクション */
+	private ReferentialAction onDelete;
+	
+	/** 更新時アクション */
+	private ReferentialAction onUpdate;
+	
+	/**
+	 * 遅延評価可能性。
+	 * 
+	 * 遅延不可の制約は各コマンドの後すぐに検査される。
+	 * 遅延可能な制約の検査は、トランザクションの終了時まで遅延させることができる。
+	 */
+	private boolean deferrable;
+	
+	/**
+	 * 遅延評価の初期状態。
+	 * 
+	 * 制約が遅延可能な場合、この句は制約検査を行うデフォルトの時期を指定する。
+	 */
+	private InitiallyCheckTime initiallyCheckTime;
+	
+	/** 説明文 */
+	private String description;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ForeignKeyModelImpl() {
+		super(null, null);
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param source 接続元（被制約）テーブル
+	 * @param target 接続先（参照）テーブル
+	 * @param createColumn 参照先カラムと同名のカラムを生成して、そのカラムにマッピングする場合は<tt>true</tt>
+	 * 		既存のカラムにマッピングする場合は<tt>false</tt>を渡す。
+	 * @category instance creation
+	 */
+	public ForeignKeyModelImpl(AbstractEntityModel source, AbstractEntityModel target, boolean createColumn) {
+		super(source, target);
+		createMappings(createColumn);
+	}
+	
+	/**
+	 * targetを元に、マッピングを生成する。
+	 * 
+	 * @param createColumn 参照先カラムと同名のカラムを生成して、そのカラムにマッピングする場合は<tt>true</tt>
+	 * 		既存のカラムにマッピングする場合は<tt>false</tt>を渡す。
+	 * TODO extract to processor
+	 */
+	public void createMappings(boolean createColumn) {
+		mappings.clear();
+		
+		TableModel tableModel = (TableModel) getTarget();
+		List<ColumnModel> referencePkColumns = ForEachUtil.accept(tableModel.getColumns(), new PrimaryKeyVisitor());
+		for (ColumnModel referencePkColumn : referencePkColumns) {
+			ForeignKeyMapping mapping = new ForeignKeyMappingImpl();
+			mapping.process(new SetDefaultColumnsProcessor((TableModel) getSource(), referencePkColumn, createColumn));
+			mappings.add(mapping);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		for (ForeignKeyMapping mapping : mappings) {
+			mapping.dispose();
+		}
+		super.dispose();
+	}
+	
+	/**
+	 * 説明文を取得する。
+	 * @return 説明文
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * 遅延評価の初期状態。を取得する。
+	 * @return 遅延評価の初期状態。
+	 */
+	public InitiallyCheckTime getInitiallyCheckTime() {
+		return initiallyCheckTime;
+	}
+	
+	/**
+	 * 論理名を取得する。
+	 * @return 論理名
+	 */
+	public String getLogicalName() {
+		return logicalName;
+	}
+	
+	/**
+	 * マッピングのリストを取得する。
+	 * @return マッピングのリスト
+	 */
+	public List<ForeignKeyMapping> getMappings() {
+		return mappings;
+	}
+	
+	/**
+	 * マッチ型を取得する。
+	 * @return マッチ型
+	 */
+	public MatchType getMatchType() {
+		return matchType;
+	}
+	
+	/**
+	 * 名前を取得する。
+	 * @return 名前
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * 削除時アクションを取得する。
+	 * @return 削除時アクション
+	 */
+	public ReferentialAction getOnDelete() {
+		return onDelete;
+	}
+	
+	/**
+	 * 更新時アクションを取得する。
+	 * @return 更新時アクション
+	 */
+	public ReferentialAction getOnUpdate() {
+		return onUpdate;
+	}
+	
+	/**
+	 * 遅延評価可能性。を取得する。
+	 * @return 遅延評価可能性。
+	 */
+	public boolean isDeferrable() {
+		return deferrable;
+	}
+	
+	/**
+	 * 遅延評価可能性。を設定する。
+	 * @param deferrable 遅延評価可能性。
+	 */
+	public void setDeferrable(boolean deferrable) {
+		this.deferrable = deferrable;
+	}
+	
+	/**
+	 * 説明文を設定する。
+	 * @param description 説明文
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * 遅延評価の初期状態。を設定する。
+	 * @param initiallyCheckTime 遅延評価の初期状態。
+	 */
+	public void setInitiallyCheckTime(InitiallyCheckTime initiallyCheckTime) {
+		this.initiallyCheckTime = initiallyCheckTime;
+	}
+	
+	/**
+	 * 論理名を設定する。
+	 * @param logicalName 論理名
+	 */
+	public void setLogicalName(String logicalName) {
+		this.logicalName = logicalName;
+	}
+	
+	/**
+	 * マッチ型を設定する。
+	 * @param matchType マッチ型
+	 */
+	public void setMatchType(MatchType matchType) {
+		this.matchType = matchType;
+	}
+	
+	/**
+	 * 名前を設定する。
+	 * @param name 名前
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 削除時アクションを設定する。
+	 * @param onDelete 削除時アクション
+	 */
+	public void setOnDelete(ReferentialAction onDelete) {
+		this.onDelete = onDelete;
+	}
+	
+	/**
+	 * 更新時アクションを設定する。
+	 * @param onUpdate 更新時アクション
+	 */
+	public void setOnUpdate(ReferentialAction onUpdate) {
+		this.onUpdate = onUpdate;
+	}
+	
+	/**
+	 * マッピングのリストを設定する。
+	 * @param mappings マッピングのリスト
+	 */
+	void setMappings(List<ForeignKeyMapping> mappings) {
+		mappings = mappings;
+	}
+	
+}


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

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/connection/InheritanceModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.core.model.connection;
 
-import org.jiemamy.core.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
 
 /**
  * 継承モデル。
@@ -26,7 +26,7 @@
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class InheritanceModel extends AbstractRelationModel {
+public class InheritanceModel extends AbstractRelationModelImpl {
 	
 	/**
 	 * コンストラクタ。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,75 +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.dataset;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-
-/**
- * INSERT文用データセット。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class InsertDataSetModel extends AbstractModel {
-	
-	/** データセット名 */
-	private String name;
-	
-	/** レコード情報 */
-	private Map<AbstractEntityModel, List<RecordModel>> records =
-			ObservableMap.decorate(new HashMap<AbstractEntityModel, List<RecordModel>>());
-	
-
-	/**
-	 * データセット名を取得する。
-	 * @return データセット名
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * レコード情報を取得する。
-	 * @return レコード情報
-	 */
-	public Map<AbstractEntityModel, List<RecordModel>> getRecords() {
-		return records;
-	}
-	
-	/**
-	 * データセット名を設定する。
-	 * @param name データセット名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * レコード情報を設定する。
-	 * @param records レコード情報
-	 */
-	void setRecords(Map<AbstractEntityModel, List<RecordModel>> records) {
-		this.records = records;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/InsertDataSetModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.model.dataset;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jiemamy.core.event.collectionimpl.ObservableMap;
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+
+/**
+ * INSERT文用データセット。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class InsertDataSetModelImpl extends AbstractModel implements InsertDataSetModel {
+	
+	/** データセット名 */
+	private String name;
+	
+	/** レコード情報 */
+	private Map<AbstractEntityModel, List<RecordModel>> records =
+			ObservableMap.decorate(new HashMap<AbstractEntityModel, List<RecordModel>>());
+	
+
+	/**
+	 * データセット名を取得する。
+	 * @return データセット名
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * レコード情報を取得する。
+	 * @return レコード情報
+	 */
+	public Map<AbstractEntityModel, List<RecordModel>> getRecords() {
+		return records;
+	}
+	
+	/**
+	 * データセット名を設定する。
+	 * @param name データセット名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * レコード情報を設定する。
+	 * @param records レコード情報
+	 */
+	void setRecords(Map<AbstractEntityModel, List<RecordModel>> records) {
+		this.records = records;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,65 +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.dataset;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-
-/**
- * レコード（INSERT文1つ分）モデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class RecordModel extends AbstractModel {
-	
-	/**
-	 * カラムに対応するデータ
-	 * 
-	 * データは「存在する場合」と「NULLである場合」と「出力されない場合」があり得る。
-	 * 「出力されない場合」とは、例えば "FOO" テーブルに BAR, BAZ, QUX カラムが存在する場合に、
-	 * INSERT INTO FOO (BAZ, QUX) VALUES('QUUX', 'COURGE');
-	 * というINSERT文が発行される場合である。
-	 * 
-	 * Mapは、この3種類のステートを保持可能である。nullが設定されたkeyも未設定のkeyも、
-	 * どちらもnullを返すが、containsKeyメソッドで、両者を判別可能である。
-	 * 詳しくは{@link Map#get(Object)}のjavadocを参照のこと。
-	 */
-	private Map<ColumnModel, String> values = ObservableMap.decorate(new HashMap<ColumnModel, String>());
-	
-
-	/**
-	 * カラムに対応するデータを取得する。
-	 * @return カラムに対応するデータ
-	 */
-	public Map<ColumnModel, String> getValues() {
-		return values;
-	}
-	
-	/**
-	 * カラムに対応するデータを設定する。
-	 * @param values カラムに対応するデータ
-	 */
-	void setValues(Map<ColumnModel, String> values) {
-		this.values = values;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/dataset/RecordModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,66 @@
+/*
+ * 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.dataset;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jiemamy.core.event.collectionimpl.ObservableMap;
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+
+/**
+ * レコード（INSERT文1つ分）モデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class RecordModelImpl extends AbstractModel implements RecordModel {
+	
+	/**
+	 * カラムに対応するデータ
+	 * 
+	 * データは「存在する場合」と「NULLである場合」と「出力されない場合」があり得る。
+	 * 「出力されない場合」とは、例えば "FOO" テーブルに BAR, BAZ, QUX カラムが存在する場合に、
+	 * INSERT INTO FOO (BAZ, QUX) VALUES('QUUX', 'COURGE');
+	 * というINSERT文が発行される場合である。
+	 * 
+	 * Mapは、この3種類のステートを保持可能である。nullが設定されたkeyも未設定のkeyも、
+	 * どちらもnullを返すが、containsKeyメソッドで、両者を判別可能である。
+	 * 詳しくは{@link Map#get(Object)}のjavadocを参照のこと。
+	 */
+	private Map<ColumnModel, String> values = ObservableMap.decorate(new HashMap<ColumnModel, String>());
+	
+
+	/**
+	 * カラムに対応するデータを取得する。
+	 * @return カラムに対応するデータ
+	 */
+	public Map<ColumnModel, String> getValues() {
+		return values;
+	}
+	
+	/**
+	 * カラムに対応するデータを設定する。
+	 * @param values カラムに対応するデータ
+	 */
+	void setValues(Map<ColumnModel, String> values) {
+		values = values;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,140 +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.node;
-
-/**
- * エンティティ（TableやView）のAbstractモデル。
- * 
- * @author daisuke
- */
-public abstract class AbstractEntityModel extends AbstractNodeModel { //implements IPropertySource
-
-	/** 名前 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** 開始スクリプト */
-	private String beginScript;
-	
-	/** 終了スクリプト */
-	private String endScript;
-	
-	/** 説明文 */
-	private String description;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public AbstractEntityModel() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name エンティティ名
-	 * @category instance creation
-	 */
-	public AbstractEntityModel(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * 開始スクリプトを取得する。
-	 * @return 開始スクリプト
-	 */
-	public String getBeginScript() {
-		return beginScript;
-	}
-	
-	/**
-	 * 説明文を取得する。
-	 * @return 説明文
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * 終了スクリプトを取得する。
-	 * @return 終了スクリプト
-	 */
-	public String getEndScript() {
-		return endScript;
-	}
-	
-	/**
-	 * 論理名を取得する。
-	 * @return 論理名
-	 */
-	public String getLogicalName() {
-		return logicalName;
-	}
-	
-	/**
-	 * 名前を取得する。
-	 * @return 名前
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * 開始スクリプトを設定する。
-	 * @param beginScript 開始スクリプト
-	 */
-	public void setBeginScript(String beginScript) {
-		this.beginScript = beginScript;
-	}
-	
-	/**
-	 * 説明文を設定する。
-	 * @param description 説明文
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * 終了スクリプトを設定する。
-	 * @param endScript 終了スクリプト
-	 */
-	public void setEndScript(String endScript) {
-		this.endScript = endScript;
-	}
-	
-	/**
-	 * 論理名を設定する。
-	 * @param logicalName 論理名
-	 */
-	public void setLogicalName(String logicalName) {
-		this.logicalName = logicalName;
-	}
-	
-	/**
-	 * 名前を設定する。
-	 * @param name 名前
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractEntityModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,142 @@
+/*
+ * 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.node;
+
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+
+/**
+ * エンティティ（TableやView）のAbstractモデル。
+ * 
+ * @author daisuke
+ */
+public abstract class AbstractEntityModelImpl extends AbstractNodeModelImpl implements AbstractEntityModel {
+	
+	/** 名前 */
+	private String name;
+	
+	/** 論理名 */
+	private String logicalName;
+	
+	/** 開始スクリプト */
+	private String beginScript;
+	
+	/** 終了スクリプト */
+	private String endScript;
+	
+	/** 説明文 */
+	private String description;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public AbstractEntityModelImpl() {
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name エンティティ名
+	 * @category instance creation
+	 */
+	public AbstractEntityModelImpl(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 開始スクリプトを取得する。
+	 * @return 開始スクリプト
+	 */
+	public String getBeginScript() {
+		return beginScript;
+	}
+	
+	/**
+	 * 説明文を取得する。
+	 * @return 説明文
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * 終了スクリプトを取得する。
+	 * @return 終了スクリプト
+	 */
+	public String getEndScript() {
+		return endScript;
+	}
+	
+	/**
+	 * 論理名を取得する。
+	 * @return 論理名
+	 */
+	public String getLogicalName() {
+		return logicalName;
+	}
+	
+	/**
+	 * 名前を取得する。
+	 * @return 名前
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * 開始スクリプトを設定する。
+	 * @param beginScript 開始スクリプト
+	 */
+	public void setBeginScript(String beginScript) {
+		this.beginScript = beginScript;
+	}
+	
+	/**
+	 * 説明文を設定する。
+	 * @param description 説明文
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * 終了スクリプトを設定する。
+	 * @param endScript 終了スクリプト
+	 */
+	public void setEndScript(String endScript) {
+		this.endScript = endScript;
+	}
+	
+	/**
+	 * 論理名を設定する。
+	 * @param logicalName 論理名
+	 */
+	public void setLogicalName(String logicalName) {
+		this.logicalName = logicalName;
+	}
+	
+	/**
+	 * 名前を設定する。
+	 * @param name 名前
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,90 +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.node;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-
-/**
- * ノード（Table, View等）のAbstractモデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class AbstractNodeModel extends AbstractModel {
-	
-	/** このモデルを接続元とするコネクションのリスト */
-	private List<AbstractConnectionModel> sourceConnections =
-			ObservableList.decorate(new ArrayList<AbstractConnectionModel>());
-	
-	/** このモデルを接続先とするコネクションのリスト */
-	private List<AbstractConnectionModel> targetConnections =
-			ObservableList.decorate(new ArrayList<AbstractConnectionModel>());
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void dispose() {
-		for (AbstractConnectionModel source : sourceConnections) {
-			source.dispose();
-		}
-		for (AbstractConnectionModel target : targetConnections) {
-			target.dispose();
-		}
-		super.dispose();
-	}
-	
-	/**
-	 * このモデルを接続元とするコネクションのリストを取得する。
-	 * @return このモデルを接続元とするコネクションのリスト
-	 */
-	public List<AbstractConnectionModel> getSourceConnections() {
-		return sourceConnections;
-	}
-	
-	/**
-	 * このモデルを接続先とするコネクションのリストを取得する。
-	 * @return このモデルを接続先とするコネクションのリスト
-	 */
-	public List<AbstractConnectionModel> getTargetConnections() {
-		return targetConnections;
-	}
-	
-	/**
-	 * このモデルを接続元とするコネクションのリストを設定する。
-	 * @param sourceConnections このモデルを接続元とするコネクションのリスト
-	 */
-	void setSourceConnections(List<AbstractConnectionModel> sourceConnections) {
-		this.sourceConnections = sourceConnections;
-	}
-	
-	/**
-	 * このモデルを接続先とするコネクションのリストを設定する。
-	 * @param targetConnections このモデルを接続先とするコネクションのリスト
-	 */
-	void setTargetConnections(List<AbstractConnectionModel> targetConnections) {
-		this.targetConnections = targetConnections;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/AbstractNodeModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,91 @@
+/*
+ * 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.node;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jiemamy.core.event.collectionimpl.ObservableList;
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+
+/**
+ * ノード（Table, View等）のAbstractモデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class AbstractNodeModelImpl extends AbstractModel implements AbstractNodeModel {
+	
+	/** このモデルを接続元とするコネクションのリスト */
+	private List<AbstractConnectionModel> sourceConnections =
+			ObservableList.decorate(new ArrayList<AbstractConnectionModel>());
+	
+	/** このモデルを接続先とするコネクションのリスト */
+	private List<AbstractConnectionModel> targetConnections =
+			ObservableList.decorate(new ArrayList<AbstractConnectionModel>());
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		for (AbstractConnectionModel source : sourceConnections) {
+			source.dispose();
+		}
+		for (AbstractConnectionModel target : targetConnections) {
+			target.dispose();
+		}
+		super.dispose();
+	}
+	
+	/**
+	 * このモデルを接続元とするコネクションのリストを取得する。
+	 * @return このモデルを接続元とするコネクションのリスト
+	 */
+	public List<AbstractConnectionModel> getSourceConnections() {
+		return sourceConnections;
+	}
+	
+	/**
+	 * このモデルを接続先とするコネクションのリストを取得する。
+	 * @return このモデルを接続先とするコネクションのリスト
+	 */
+	public List<AbstractConnectionModel> getTargetConnections() {
+		return targetConnections;
+	}
+	
+	/**
+	 * このモデルを接続元とするコネクションのリストを設定する。
+	 * @param sourceConnections このモデルを接続元とするコネクションのリスト
+	 */
+	void setSourceConnections(List<AbstractConnectionModel> sourceConnections) {
+		sourceConnections = sourceConnections;
+	}
+	
+	/**
+	 * このモデルを接続先とするコネクションのリストを設定する。
+	 * @param targetConnections このモデルを接続先とするコネクションのリスト
+	 */
+	void setTargetConnections(List<AbstractConnectionModel> targetConnections) {
+		targetConnections = targetConnections;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,49 +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.node;
-
-/**
- * 付箋モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class StickyModel extends AbstractNodeModel {
-	
-	/** 内容文 */
-	private String contents;
-	
-
-	/**
-	 * 内容文を取得する。
-	 * @return 内容文
-	 */
-	public String getContents() {
-		return contents;
-	}
-	
-	/**
-	* 内容文を設定する。
-	* @param contents 内容文
-	*/
-	public void setContents(String contents) {
-		this.contents = contents;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/StickyModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,51 @@
+/*
+ * 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.node;
+
+import org.jiemamy.spec.model.node.StickyModel;
+
+/**
+ * 付箋モデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class StickyModelImpl extends AbstractNodeModelImpl implements StickyModel {
+	
+	/** 内容文 */
+	private String contents;
+	
+
+	/**
+	 * 内容文を取得する。
+	 * @return 内容文
+	 */
+	public String getContents() {
+		return contents;
+	}
+	
+	/**
+	* 内容文を設定する。
+	* @param contents 内容文
+	*/
+	public void setContents(String contents) {
+		this.contents = contents;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,138 +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.node;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.event.model.node.TableModelChangeSupport;
-import org.jiemamy.core.model.node.index.IndexModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
-
-/**
- * テーブルモデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class TableModel extends AbstractEntityModel { // implements DialectOptionSupport {
-
-	/** カラムのリスト */
-	private List<ColumnModel> columns = ObservableList.decorate(new ArrayList<ColumnModel>());
-	
-	/** インデックスのリスト */
-	private List<IndexModel> indexes = ObservableList.decorate(new ArrayList<IndexModel>());
-	
-	/** テーブルCHECK制約のリスト */
-	private List<CheckConstraintModel> checks = ObservableList.decorate(new ArrayList<CheckConstraintModel>());
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public TableModel() {
-		this(null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name テーブル名
-	 * @category instance creation
-	 */
-	public TableModel(String name) {
-		super(name);
-		addAdapter(new TableModelChangeSupport(this));
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void dispose() {
-		for (ColumnModel column : columns) {
-			column.dispose();
-		}
-		for (IndexModel index : indexes) {
-			index.dispose();
-		}
-		for (CheckConstraintModel check : checks) {
-			check.dispose();
-		}
-		super.dispose();
-	}
-	
-	/**
-	 * テーブルCHECK制約のリストを取得する。
-	 * @return テーブルCHECK制約のリスト
-	 */
-	public List<CheckConstraintModel> getChecks() {
-		return checks;
-	}
-	
-	/**
-	 * カラムのリストを取得する。
-	 * @return カラムのリスト
-	 */
-	public List<ColumnModel> getColumns() {
-		return columns;
-	}
-	
-	/**
-	 * インデックスのリストを取得する。
-	 * @return インデックスのリスト
-	 */
-	public List<IndexModel> getIndexes() {
-		return indexes;
-	}
-	
-//	/**
-//	 * {@inheritDoc}
-//	 */
-//	@Override
-//	public String toString() {
-//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
-//	}
-	
-	/**
-	 * テーブルCHECK制約のリストを設定する。
-	 * @param checks テーブルCHECK制約のリスト
-	 */
-	void setChecks(List<CheckConstraintModel> checks) {
-		this.checks = checks;
-	}
-	
-	/**
-	 * カラムのリストを設定する。
-	 * @param columns カラムのリスト
-	 */
-	void setColumns(List<ColumnModel> columns) {
-		this.columns = columns;
-	}
-	
-	/**
-	 * インデックスのリストを設定する。
-	 * @param indexes インデックスのリスト
-	 */
-	void setIndexes(List<IndexModel> indexes) {
-		this.indexes = indexes;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java (from rev 1929, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/TableModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,139 @@
+/*
+ * 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.node;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jiemamy.core.event.collectionimpl.ObservableList;
+import org.jiemamy.core.event.model.node.TableModelChangeSupport;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.index.IndexModel;
+import org.jiemamy.spec.model.node.TableModel;
+
+/**
+ * テーブルモデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class TableModelImpl extends AbstractEntityModelImpl implements TableModel { // implements DialectOptionSupport {
+
+	/** カラムのリスト */
+	private List<ColumnModel> columns = ObservableList.decorate(new ArrayList<ColumnModel>());
+	
+	/** インデックスのリスト */
+	private List<IndexModel> indexes = ObservableList.decorate(new ArrayList<IndexModel>());
+	
+	/** テーブルCHECK制約のリスト */
+	private List<CheckConstraintModel> checks = ObservableList.decorate(new ArrayList<CheckConstraintModel>());
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public TableModelImpl() {
+		this(null);
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name テーブル名
+	 * @category instance creation
+	 */
+	public TableModelImpl(String name) {
+		super(name);
+		addAdapter(new TableModelChangeSupport(this));
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		for (ColumnModel column : columns) {
+			column.dispose();
+		}
+		for (IndexModel index : indexes) {
+			index.dispose();
+		}
+		for (CheckConstraintModel check : checks) {
+			check.dispose();
+		}
+		super.dispose();
+	}
+	
+	/**
+	 * テーブルCHECK制約のリストを取得する。
+	 * @return テーブルCHECK制約のリスト
+	 */
+	public List<CheckConstraintModel> getChecks() {
+		return checks;
+	}
+	
+	/**
+	 * カラムのリストを取得する。
+	 * @return カラムのリスト
+	 */
+	public List<ColumnModel> getColumns() {
+		return columns;
+	}
+	
+	/**
+	 * インデックスのリストを取得する。
+	 * @return インデックスのリスト
+	 */
+	public List<IndexModel> getIndexes() {
+		return indexes;
+	}
+	
+//	/**
+//	 * {@inheritDoc}
+//	 */
+//	@Override
+//	public String toString() {
+//		return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+//	}
+	
+	/**
+	 * テーブルCHECK制約のリストを設定する。
+	 * @param checks テーブルCHECK制約のリスト
+	 */
+	void setChecks(List<CheckConstraintModel> checks) {
+		this.checks = checks;
+	}
+	
+	/**
+	 * カラムのリストを設定する。
+	 * @param columns カラムのリスト
+	 */
+	void setColumns(List<ColumnModel> columns) {
+		this.columns = columns;
+	}
+	
+	/**
+	 * インデックスのリストを設定する。
+	 * @param indexes インデックスのリスト
+	 */
+	void setIndexes(List<IndexModel> indexes) {
+		indexes = indexes;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,68 +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.node;
-
-/**
- * ビューモデル
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ViewModel extends AbstractEntityModel {
-	
-	/** VIEW定義SELECT文 */
-	private String definition;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ViewModel() {
-		super(null);
-		definition = null;
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name ビュー名
-	 * @param definition VIEW定義SELECT文
-	 * @category instance creation
-	 */
-	public ViewModel(String name, String definition) {
-		super(name);
-		this.definition = definition;
-	}
-	
-	/**
-	 * VIEW定義SELECT文を取得する。
-	 * @return VIEW定義SELECT文
-	 */
-	public String getDefinition() {
-		return definition;
-	}
-	
-	/**
-	 * VIEW定義SELECT文を設定する。
-	 * @param definition VIEW定義SELECT文
-	 */
-	public void setDefinition(String definition) {
-		this.definition = definition;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/ViewModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,70 @@
+/*
+ * 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.node;
+
+import org.jiemamy.spec.model.node.ViewModel;
+
+/**
+ * ビューモデル
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class ViewModelImpl extends AbstractEntityModelImpl implements ViewModel {
+	
+	/** VIEW定義SELECT文 */
+	private String definition;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ViewModelImpl() {
+		super(null);
+		definition = null;
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name ビュー名
+	 * @param definition VIEW定義SELECT文
+	 * @category instance creation
+	 */
+	public ViewModelImpl(String name, String definition) {
+		super(name);
+		this.definition = definition;
+	}
+	
+	/**
+	 * VIEW定義SELECT文を取得する。
+	 * @return VIEW定義SELECT文
+	 */
+	public String getDefinition() {
+		return definition;
+	}
+	
+	/**
+	 * VIEW定義SELECT文を設定する。
+	 * @param definition VIEW定義SELECT文
+	 */
+	public void setDefinition(String definition) {
+		this.definition = definition;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,85 +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.node.index;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-
-/**
- * インデックスカラムのモデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class IndexColumnModel extends AbstractModel {
-	
-	/** インデックス対象カラム */
-	private ColumnModel column;
-	
-
-	/** カラムソート方式 */
-	private SortType sortType;
-	
-	/**
-	 * インデックス対象カラムを取得する。
-	 * @return インデックス対象カラム
-	 */
-	public ColumnModel getColumn() {
-	    return column;
-	}
-
-	/**
-	 * カラムソート方式を取得する。
-	 * @return カラムソート方式
-	 */
-	public SortType getSortType() {
-	    return sortType;
-	}
-
-	/**
-	 * インデックス対象カラムを設定する。
-	 * @param column インデックス対象カラム
-	 */
-	public void setColumn(ColumnModel column) {
-	    this.column = column;
-	}
-
-	/**
-	 * カラムソート方式を設定する。
-	 * @param sortType カラムソート方式
-	 */
-	public void setSortType(SortType sortType) {
-	    this.sortType = sortType;
-	}
-
-	/**
-	 * ソート方式。
-	 * @author daisuke
-	 */
-	public enum SortType {
-		/** ソートなし */
-		NONE,
-
-		/** 昇順ソート */
-		ASC,
-
-		/** 降順ソート */
-		DESC
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexColumnModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,71 @@
+/*
+ * 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.node.index;
+
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.index.IndexColumnModel;
+
+/**
+ * インデックスカラムのモデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class IndexColumnModelImpl extends AbstractModel implements IndexColumnModel {
+	
+	/** インデックス対象カラム */
+	private ColumnModel column;
+	
+	/** カラムソート方式 */
+	private SortType sortType;
+	
+
+	/**
+	 * インデックス対象カラムを取得する。
+	 * @return インデックス対象カラム
+	 */
+	public ColumnModel getColumn() {
+		return column;
+	}
+	
+	/**
+	 * カラムソート方式を取得する。
+	 * @return カラムソート方式
+	 */
+	public SortType getSortType() {
+		return sortType;
+	}
+	
+	/**
+	 * インデックス対象カラムを設定する。
+	 * @param column インデックス対象カラム
+	 */
+	public void setColumn(ColumnModel column) {
+		this.column = column;
+	}
+	
+	/**
+	 * カラムソート方式を設定する。
+	 * @param sortType カラムソート方式
+	 */
+	public void setSortType(SortType sortType) {
+		this.sortType = sortType;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,92 +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.node.index;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * インデックスモデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class IndexModel extends AbstractModel {
-	
-	/** インデックス名 */
-	private String name;
-	
-	/** ユニークインデックスか否か */
-	private boolean unique;
-	
-	/** インデックスカラムのリスト */
-	private List<IndexColumnModel> columns = ObservableList.decorate(new ArrayList<IndexColumnModel>());
-	
-
-	/**
-	 * インデックスカラムのリストを取得する。
-	 * @return インデックスカラムのリスト
-	 */
-	public List<IndexColumnModel> getColumns() {
-		return columns;
-	}
-	
-	/**
-	 * インデックス名を取得する。
-	 * @return インデックス名
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * ユニークインデックスか否かを取得する。
-	 * @return ユニークインデックスか否か
-	 */
-	public boolean isUnique() {
-		return unique;
-	}
-	
-	/**
-	 * インデックス名を設定する。
-	 * @param name インデックス名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * ユニークインデックスか否かを設定する。
-	 * @param unique ユニークインデックスか否か
-	 */
-	public void setUnique(boolean unique) {
-		this.unique = unique;
-	}
-	
-	/**
-	 * インデックスカラムのリストを設定する。
-	 * @param columns インデックスカラムのリスト
-	 */
-	void setColumns(List<IndexColumnModel> columns) {
-		this.columns = columns;
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/node/index/IndexModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,94 @@
+/*
+ * 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.node.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jiemamy.core.event.collectionimpl.ObservableList;
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.index.IndexColumnModel;
+import org.jiemamy.spec.model.index.IndexModel;
+
+/**
+ * インデックスモデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class IndexModelImpl extends AbstractModel implements IndexModel {
+	
+	/** インデックス名 */
+	private String name;
+	
+	/** ユニークインデックスか否か */
+	private boolean unique;
+	
+	/** インデックスカラムのリスト */
+	private List<IndexColumnModel> columns = ObservableList.decorate(new ArrayList<IndexColumnModel>());
+	
+
+	/**
+	 * インデックスカラムのリストを取得する。
+	 * @return インデックスカラムのリスト
+	 */
+	public List<IndexColumnModel> getColumns() {
+		return columns;
+	}
+	
+	/**
+	 * インデックス名を取得する。
+	 * @return インデックス名
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * ユニークインデックスか否かを取得する。
+	 * @return ユニークインデックスか否か
+	 */
+	public boolean isUnique() {
+		return unique;
+	}
+	
+	/**
+	 * インデックス名を設定する。
+	 * @param name インデックス名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * ユニークインデックスか否かを設定する。
+	 * @param unique ユニークインデックスか否か
+	 */
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+	
+	/**
+	 * インデックスカラムのリストを設定する。
+	 * @param columns インデックスカラムのリスト
+	 */
+	void setColumns(List<IndexColumnModel> columns) {
+		this.columns = columns;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,175 +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.presentation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.event.collectionimpl.ObservableSet;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-
-/**
- * ダイアグラム表現（レイアウト等）モデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class DiagramPresentationModel extends AbstractModel {
-	
-	/** プレゼンテーション名 */
-	private String name;
-	
-	/** 表示モード */
-	private Set<DisplayItem> displayTargetSet = ObservableSet.decorate(new HashSet<DisplayItem>());
-	
-	/**
-	 * ノードのレイアウト情報
-	 * 
-	 * 表示されるノードであれば矩形情報を持ち、非表示であればエントリを持たない。
-	 */
-	private Map<AbstractNodeModel, JmRectangle> nodeLayouts =
-			ObservableMap.decorate(new HashMap<AbstractNodeModel, JmRectangle>());
-	
-	/**
-	 * ノードの色情報
-	 * 
-	 * デフォルト色のノードであれば、エントリを持たない。
-	 * THINK JiemamyRectangleに持たせてしまうべき？ ColorとRectangleは分離しているべき？
-	 */
-	private Map<AbstractNodeModel, JmColor> nodeColors =
-			ObservableMap.decorate(new HashMap<AbstractNodeModel, JmColor>());
-	
-	/**
-	 * コネクションのベンドポイント情報
-	 * 
-	 * ベンドポイントがあれば座標のリストを持ち、なければエントリを持たない。
-	 */
-	private Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts =
-			ObservableMap.decorate(new HashMap<AbstractConnectionModel, List<JmPoint>>());
-	
-
-	/**
-	 * コネクションのベンドポイント情報を取得する。
-	 * @return コネクションのベンドポイント情報
-	 */
-	public Map<AbstractConnectionModel, List<JmPoint>> getConnectionLayouts() {
-		return connectionLayouts;
-	}
-	
-	/**
-	 * 表示モードを取得する。
-	 * @return 表示モード
-	 */
-	public Set<DisplayItem> getDisplayTargetSet() {
-		return displayTargetSet;
-	}
-	
-	/**
-	 * プレゼンテーション名を取得する。
-	 * @return プレゼンテーション名
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * ノードの色情報を取得する。
-	 * @return ノードの色情報
-	 */
-	public Map<AbstractNodeModel, JmColor> getNodeColors() {
-		return nodeColors;
-	}
-	
-	/**
-	 * ノードのレイアウト情報を取得する。
-	 * @return ノードのレイアウト情報
-	 */
-	public Map<AbstractNodeModel, JmRectangle> getNodeLayouts() {
-		return nodeLayouts;
-	}
-	
-	/**
-	 * 表示モードを設定する。
-	 * @param displayTargetSet 表示モード
-	 */
-	public void setDisplayTargetSet(Set<DisplayItem> displayTargetSet) {
-		this.displayTargetSet = displayTargetSet;
-	}
-	
-	/**
-	 * プレゼンテーション名を設定する。
-	 * @param name プレゼンテーション名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * コネクションのベンドポイント情報を設定する。
-	 * @param connectionLayouts コネクションのベンドポイント情報
-	 */
-	void setConnectionLayouts(Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts) {
-		this.connectionLayouts = connectionLayouts;
-	}
-	
-	/**
-	 * ノードの色情報を設定する。
-	 * @param nodeColors ノードの色情報
-	 */
-	void setNodeColors(Map<AbstractNodeModel, JmColor> nodeColors) {
-		this.nodeColors = nodeColors;
-	}
-	
-	/**
-	 * ノードのレイアウト情報を設定する。
-	 * @param nodeLayouts ノードのレイアウト情報
-	 */
-	void setNodeLayouts(ObservableMap<AbstractNodeModel, JmRectangle> nodeLayouts) {
-		this.nodeLayouts = nodeLayouts;
-	}
-	
-
-	/**
-	 * 表示対象の要素。
-	 * この型の組み合わせ（Set）で表示内容が決定する。
-	 * @author daisuke
-	 */
-	public enum DisplayItem {
-		
-		/** 物理名を表示することを示す。 */
-		PHYSICAL,
-
-		/** 論理名を表示することを示す。 */
-		LOGICAL,
-
-		/** 主キーカラム名を表示することを示す。 */
-		PRIMARY_KEY,
-
-		/** 主キー以外のカラム名を表示することを示す。 */
-		NON_KEY,
-
-		/** カラム型を表示することを示す。 */
-		TYPE
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/DiagramPresentationModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,155 @@
+/*
+ * 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.presentation;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jiemamy.core.event.collectionimpl.ObservableMap;
+import org.jiemamy.core.event.collectionimpl.ObservableSet;
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+
+/**
+ * ダイアグラム表現（レイアウト等）モデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class DiagramPresentationModelImpl extends AbstractModel implements DiagramPresentationModel {
+	
+	/** プレゼンテーション名 */
+	private String name;
+	
+	/** 表示モード */
+	private Set<DisplayItem> displayTargetSet = ObservableSet.decorate(new HashSet<DisplayItem>());
+	
+	/**
+	 * ノードのレイアウト情報
+	 * 
+	 * 表示されるノードであれば矩形情報を持ち、非表示であればエントリを持たない。
+	 */
+	private Map<AbstractNodeModel, JmRectangle> nodeLayouts =
+			ObservableMap.decorate(new HashMap<AbstractNodeModel, JmRectangle>());
+	
+	/**
+	 * ノードの色情報
+	 * 
+	 * デフォルト色のノードであれば、エントリを持たない。
+	 * THINK JiemamyRectangleに持たせてしまうべき？ ColorとRectangleは分離しているべき？
+	 */
+	private Map<AbstractNodeModel, JmColor> nodeColors =
+			ObservableMap.decorate(new HashMap<AbstractNodeModel, JmColor>());
+	
+	/**
+	 * コネクションのベンドポイント情報
+	 * 
+	 * ベンドポイントがあれば座標のリストを持ち、なければエントリを持たない。
+	 */
+	private Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts =
+			ObservableMap.decorate(new HashMap<AbstractConnectionModel, List<JmPoint>>());
+	
+
+	/**
+	 * コネクションのベンドポイント情報を取得する。
+	 * @return コネクションのベンドポイント情報
+	 */
+	public Map<AbstractConnectionModel, List<JmPoint>> getConnectionLayouts() {
+		return connectionLayouts;
+	}
+	
+	/**
+	 * 表示モードを取得する。
+	 * @return 表示モード
+	 */
+	public Set<DisplayItem> getDisplayTargetSet() {
+		return displayTargetSet;
+	}
+	
+	/**
+	 * プレゼンテーション名を取得する。
+	 * @return プレゼンテーション名
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * ノードの色情報を取得する。
+	 * @return ノードの色情報
+	 */
+	public Map<AbstractNodeModel, JmColor> getNodeColors() {
+		return nodeColors;
+	}
+	
+	/**
+	 * ノードのレイアウト情報を取得する。
+	 * @return ノードのレイアウト情報
+	 */
+	public Map<AbstractNodeModel, JmRectangle> getNodeLayouts() {
+		return nodeLayouts;
+	}
+	
+	/**
+	 * 表示モードを設定する。
+	 * @param displayTargetSet 表示モード
+	 */
+	public void setDisplayTargetSet(Set<DisplayItem> displayTargetSet) {
+		this.displayTargetSet = displayTargetSet;
+	}
+	
+	/**
+	 * プレゼンテーション名を設定する。
+	 * @param name プレゼンテーション名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * コネクションのベンドポイント情報を設定する。
+	 * @param connectionLayouts コネクションのベンドポイント情報
+	 */
+	void setConnectionLayouts(Map<AbstractConnectionModel, List<JmPoint>> connectionLayouts) {
+		this.connectionLayouts = connectionLayouts;
+	}
+	
+	/**
+	 * ノードの色情報を設定する。
+	 * @param nodeColors ノードの色情報
+	 */
+	void setNodeColors(Map<AbstractNodeModel, JmColor> nodeColors) {
+		this.nodeColors = nodeColors;
+	}
+	
+	/**
+	 * ノードのレイアウト情報を設定する。
+	 * @param nodeLayouts ノードのレイアウト情報
+	 */
+	void setNodeLayouts(ObservableMap<AbstractNodeModel, JmRectangle> nodeLayouts) {
+		this.nodeLayouts = nodeLayouts;
+	}
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmColor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmColor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmColor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,60 +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.presentation;
-
-import java.io.Serializable;
-
-/**
- * RGBによる色モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class JmColor implements Serializable {
-	
-	/** 赤 */
-	public int red;
-	
-	/** 緑 */
-	public int green;
-	
-	/** 青 */
-	public int blue;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public JmColor() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * 
-	 * @param red 赤（0-255）
-	 * @param green 緑（0-255）
-	 * @param blue 青（0-255）
-	 */
-	public JmColor(int red, int green, int blue) {
-		this.red = red;
-		this.green = green;
-		this.blue = blue;
-	}
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmPoint.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmPoint.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmPoint.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,55 +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.presentation;
-
-import java.io.Serializable;
-
-/**
- * 座標モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class JmPoint implements Serializable {
-	
-	/** X座標 */
-	public int x;
-	
-	/** Y座標 */
-	public int y;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public JmPoint() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * 
-	 * @param x X座標
-	 * @param y Y座標
-	 */
-	public JmPoint(int x, int y) {
-		this.x = x;
-		this.y = y;
-	}
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmRectangle.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmRectangle.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/presentation/JmRectangle.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.core.model.presentation;
-
-import java.io.Serializable;
-
-/**
- * 矩形モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class JmRectangle implements Serializable {
-	
-	/** X座標 */
-	public int x;
-	
-	/** Y座標 */
-	public int y;
-	
-	/** 幅 */
-	public int width;
-	
-	/** 高さ */
-	public int height;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public JmRectangle() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * widthとheightは、デフォルト(-1)が設定される。
-	 * @param x X座標
-	 * @param y Y座標
-	 * @category instance creation
-	 */
-	public JmRectangle(int x, int y) {
-		this(x, y, -1, -1);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param x X座標
-	 * @param y Y座標
-	 * @param width 幅
-	 * @param height 高さ
-	 * @category instance creation
-	 */
-	public JmRectangle(int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.constraint.Constraint;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModel;
-import org.jiemamy.core.model.typedef.constraint.ConstraintUtil;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-
-/**
- * カラム定義モデル
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ColumnModel extends AbstractModel {
-	
-	/** 物理名 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** 型 */
-	private DataType dataType;
-	
-	/** デフォルト値 */
-	private String defaultValue;
-	
-	/** 制約 */
-	private ConstraintSetModel constraints = new ConstraintSetModel();
-	
-	/** 単純インデックスの有無 */
-	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 ColumnModel() {
-		this(null, null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name
-	 * @param dataType
-	 * @category instance creation
-	 */
-	public ColumnModel(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;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/ColumnModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,290 @@
+/*
+ * 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;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,261 +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.adapter.Adaptable;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.typedef.constraint.Constraint;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-
-/**
- * ドメイン定義モデル
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class DomainModel extends AbstractModel implements DataType {
-	
-	/** ドメイン名 */
-	private String name;
-	
-	/** 論理名 */
-	private String logicalName;
-	
-	/** ドメインとして定義された型 */
-	private DataType dataType;
-	
-	/** デフォルト値 */
-	private String defaultValue;
-	
-	/** 制約 */
-	private ConstraintSetModel constraints = new ConstraintSetModel();
-	
-	/** 単純インデックスの有無 */
-	private boolean simpleIndex;
-	
-	/** 自由文字列 */
-	private String freeString;
-	
-	/** 説明文 */
-	private String description;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public DomainModel() {
-		this(null, null);
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name
-	 * @param dataType
-	 * @category instance creation
-	 */
-	public DomainModel(String name, DataType dataType) {
-		this.name = name;
-		this.dataType = dataType;
-	}
-	
-	/**
-	 * 制約を追加する。
-	 * @param constraint 制約
-	 */
-	public void addConstraint(Constraint constraint) {
-		constraints.add(constraint);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	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}
-	 */
-	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;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/DomainModelImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,265 @@
+/*
+ * 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;
+	}
+	
+}


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

Modified: 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/InheritanceColumnModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.core.model.typedef;
 
-import org.jiemamy.core.model.typedef.constraint.Constraint;
-import org.jiemamy.core.model.typedef.datatype.DataType;
+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 ColumnModel {
+public class InheritanceColumnModel extends ColumnModelImpl implements ColumnModel {
 	
 	/** 基底カラム */
 	private ColumnModel superColumn;
@@ -125,6 +126,6 @@
 	 * @param superColumn 基底カラム
 	 */
 	void setSuperColumn(ColumnModel superColumn) {
-		this.superColumn = superColumn;
+		superColumn = superColumn;
 	}
 }

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/AbstractConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/AbstractConstraintModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ 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)
@@ -19,6 +19,7 @@
 package org.jiemamy.core.model.typedef.constraint;
 
 import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.constraint.Constraint;
 
 /**
  * 抽象制約モデル。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,65 +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.constraint;
-
-/**
- * チェック制約モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class CheckConstraintModel extends AbstractConstraintModel {
-	
-	/** CHEKC制約定義式 */
-	private String expression;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public CheckConstraintModel() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name 制約名
-	 * @category instance creation
-	 */
-	public CheckConstraintModel(String name) {
-		super(name);
-	}
-	
-	/**
-	 * CHEKC制約定義式を取得する。
-	 * @return CHEKC制約定義式
-	 */
-	public String getExpression() {
-		return expression;
-	}
-	
-	/**
-	 * CHEKC制約定義式を設定する。
-	 * @param expression CHEKC制約定義式
-	 */
-	public void setExpression(String expression) {
-		this.expression = expression;
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/CheckConstraintModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,67 @@
+/*
+ * 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.constraint;
+
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+
+/**
+ * チェック制約モデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class CheckConstraintModelImpl extends AbstractConstraintModel implements CheckConstraintModel {
+	
+	/** CHEKC制約定義式 */
+	private String expression;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public CheckConstraintModelImpl() {
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name 制約名
+	 * @category instance creation
+	 */
+	public CheckConstraintModelImpl(String name) {
+		super(name);
+	}
+	
+	/**
+	 * CHEKC制約定義式を取得する。
+	 * @return CHEKC制約定義式
+	 */
+	public String getExpression() {
+		return expression;
+	}
+	
+	/**
+	 * CHEKC制約定義式を設定する。
+	 * @param expression CHEKC制約定義式
+	 */
+	public void setExpression(String expression) {
+		this.expression = expression;
+	}
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/Constraint.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/Constraint.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/Constraint.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,41 +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.constraint;
-
-import java.io.Serializable;
-
-/**
- * 制約モデル。
- * @author daisuke
- */
-public interface Constraint extends Serializable {
-	
-	/**
-	 * 制約名を取得する。
-	 * @return 制約名
-	 */
-	String getName();
-	
-	/**
-	 * 制約名を設定する。
-	 * @param name 制約名
-	 */
-	void setName(String name);
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,128 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/29
- *
- * 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.constraint;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.apache.commons.lang.ClassUtils;
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * チェック制約モデル。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class ConstraintSetModel extends AbstractModel {
-	
-	/** 制約のマップ */
-	private Map<Class<? extends Constraint>, Constraint> constraintMap = CollectionsUtil.newHashMap();
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public ConstraintSetModel() {
-		
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param constraints 制約
-	 * @category instance creation
-	 */
-	public ConstraintSetModel(Constraint... constraints) {
-		for (Constraint constraint : constraints) {
-			constraintMap.put(constraint.getClass(), constraint);
-		}
-	}
-	
-	/**
-	 * 制約を追加する。
-	 * @param constraint 追加する制約
-	 */
-	public void add(Constraint constraint) {
-		constraintMap.put(constraint.getClass(), constraint);
-	}
-	
-	/**
-	 * 制約のセットを取得する。
-	 * @return 制約のセット
-	 */
-	public Collection<Constraint> getConstraintMap() {
-		return constraintMap.values();
-	}
-	
-	/**
-	 * 制約のセットを取得する。
-	 * @return 制約のセット
-	 * @see #getConstraintMap()
-	 */
-	@Deprecated
-	public Collection<Constraint> getConstraints() {
-		return constraintMap.values();
-	}
-	
-	/**
-	 * 指定した制約があるかどうか調べる。
-	 * @param constraintClass 制約クラス
-	 * @return 制約があれば<tt>true</tt>
-	 */
-	public boolean has(Class<? extends Constraint> constraintClass) {
-		return constraintMap.containsKey(constraintClass);
-	}
-	
-	/**
-	 * 制約を取り除く。
-	 * @param constraintClass 取り除く制約クラス
-	 */
-	public void remove(Class<? extends Constraint> constraintClass) {
-		constraintMap.remove(constraintClass);
-	}
-	
-	/**
-	 * 制約を設定する。
-	 * @param constraintMap 制約のMap
-	 */
-	public void setConstraintMap(Map<Class<? extends Constraint>, Constraint> constraintMap) {
-		this.constraintMap = constraintMap;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(super.toString());
-		sb.append("[");
-		for (Constraint constraint : constraintMap.values()) {
-			sb.append(ClassUtils.getShortClassName(constraint.getClass()));
-			sb.append(":");
-			sb.append(constraint.getName());
-			sb.append(", ");
-		}
-		sb.append("]");
-		return sb.toString();
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintSetModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/29
+ *
+ * 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.constraint;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang.ClassUtils;
+import org.seasar.framework.util.tiger.CollectionsUtil;
+
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+
+/**
+ * チェック制約モデル。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class ConstraintSetModelImpl extends AbstractModel implements ConstraintSetModel {
+	
+	/** 制約のマップ */
+	private Map<Class<? extends Constraint>, Constraint> constraintMap = CollectionsUtil.newHashMap();
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ConstraintSetModelImpl() {
+		
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param constraints 制約
+	 * @category instance creation
+	 */
+	public ConstraintSetModelImpl(Constraint... constraints) {
+		for (Constraint constraint : constraints) {
+			constraintMap.put(constraint.getClass(), constraint);
+		}
+	}
+	
+	/**
+	 * 制約を追加する。
+	 * @param constraint 追加する制約
+	 */
+	public void add(Constraint constraint) {
+		constraintMap.put(constraint.getClass(), constraint);
+	}
+	
+	/**
+	 * 制約のセットを取得する。
+	 * @return 制約のセット
+	 */
+	public Collection<Constraint> getConstraintMap() {
+		return constraintMap.values();
+	}
+	
+	/**
+	 * 制約のセットを取得する。
+	 * @return 制約のセット
+	 * @see #getConstraintMap()
+	 */
+	@Deprecated
+	public Collection<Constraint> getConstraints() {
+		return constraintMap.values();
+	}
+	
+	/**
+	 * 指定した制約があるかどうか調べる。
+	 * @param constraintClass 制約クラス
+	 * @return 制約があれば<tt>true</tt>
+	 */
+	public boolean has(Class<? extends Constraint> constraintClass) {
+		return constraintMap.containsKey(constraintClass);
+	}
+	
+	/**
+	 * 制約を取り除く。
+	 * @param constraintClass 取り除く制約クラス
+	 */
+	public void remove(Class<? extends Constraint> constraintClass) {
+		constraintMap.remove(constraintClass);
+	}
+	
+	/**
+	 * 制約を設定する。
+	 * @param constraintMap 制約のMap
+	 */
+	public void setConstraintMap(Map<Class<? extends Constraint>, Constraint> constraintMap) {
+		constraintMap = constraintMap;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString());
+		sb.append("[");
+		for (Constraint constraint : constraintMap.values()) {
+			sb.append(ClassUtils.getShortClassName(constraint.getClass()));
+			sb.append(":");
+			sb.append(constraint.getName());
+			sb.append(", ");
+		}
+		sb.append("]");
+		return sb.toString();
+	}
+}


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

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ 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)
@@ -18,6 +18,9 @@
  */
 package org.jiemamy.core.model.typedef.constraint;
 
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+
 /**
  * 制約モデル用ユーティリティクラス。
  * @author daisuke
@@ -31,11 +34,11 @@
 	 * @return マージされた制約
 	 */
 	public static ConstraintSetModel marge(ConstraintSetModel a, ConstraintSetModel b) {
-		ConstraintSetModel constraints = new ConstraintSetModel();
-		for (Constraint constraint : a.getConstraints()) {
+		ConstraintSetModel constraints = new ConstraintSetModelImpl();
+		for (Constraint constraint : a.getConstraintMap()) {
 			constraints.add(constraint);
 		}
-		for (Constraint constraint : b.getConstraints()) {
+		for (Constraint constraint : b.getConstraintMap()) {
 			constraints.add(constraint);
 		}
 		return constraints;

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,28 +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.constraint;
-
-/**
- * NOT NULL制約モデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class NotNullConstraintModel extends AbstractConstraintModel {
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/NotNullConstraintModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,30 @@
+/*
+ * 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.constraint;
+
+import org.jiemamy.spec.model.constraint.NotNullConstraintModel;
+
+/**
+ * NOT NULL制約モデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class NotNullConstraintModelImpl extends AbstractConstraintModel implements NotNullConstraintModel {
+	
+}


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

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,43 +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.constraint;
-
-/**
- * PRIMARY KEY制約モデル。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class PrimaryKeyConstraintModel extends AbstractConstraintModel {
-	
-	/**
-	 * コンストラクタ。
-	 * @category instance creation
-	 */
-	public PrimaryKeyConstraintModel() {
-	}
-	
-	/**
-	 * コンストラクタ。
-	 * @param name 制約名
-	 * @category instance creation
-	 */
-	public PrimaryKeyConstraintModel(String name) {
-		super(name);
-	}
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModelImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModel.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/PrimaryKeyConstraintModelImpl.java	                        (rev 0)
+++ 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)
@@ -0,0 +1,45 @@
+/*
+ * 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.constraint;
+
+import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
+
+/**
+ * PRIMARY KEY制約モデル。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class PrimaryKeyConstraintModelImpl extends AbstractConstraintModel implements PrimaryKeyConstraintModel {
+	
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public PrimaryKeyConstraintModelImpl() {
+	}
+	
+	/**
+	 * コンストラクタ。
+	 * @param name 制約名
+	 * @category instance creation
+	 */
+	public PrimaryKeyConstraintModelImpl(String name) {
+		super(name);
+	}
+}


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

Modified: 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:51:13 UTC (rev 1933)
+++ 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)
@@ -22,6 +22,7 @@
 
 import org.jiemamy.core.model.AbstractModel;
 import org.jiemamy.core.model.typedef.datatype.adapter.DataTypeAdapter;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * データ型抽象クラス。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/DataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/DataType.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/DataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,38 +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.datatype;
-
-import org.jiemamy.core.adapter.Adaptable;
-import org.jiemamy.core.model.JiemamyModel;
-
-/**
- * データ型インターフェイス。
- * 
- * @author daisuke
- */
-public interface DataType extends JiemamyModel {
-	
-	/**
-	 * アダプタが適用されていた場合は、取り除く。
-	 * 適用されていなかった場合は何もせず、自分自身を返す。
-	 * @return アダプタが何も適用されていない状態のAdaptable
-	 */
-	Adaptable removeAdapter();
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataType.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,27 +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;
-
-/**
- * DBに依存しない、汎用的DataTypeクラス。
- * @author daisuke
- */
-public abstract class GeneralDataType extends AbstractDataType {
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/GeneralDataTypeImpl.java	                        (rev 0)
+++ 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)
@@ -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.typedef.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/typedef/datatype/GeneralDataTypeImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataType.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -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 SpecialDataType extends AbstractDataType {
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		MappingInfo annotation = this.getClass().getAnnotation(MappingInfo.class);
-		return annotation.typeName();
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java (from rev 1927, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/SpecialDataTypeImpl.java	                        (rev 0)
+++ 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)
@@ -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.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();
+	}
+	
+}


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

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model.typedef.datatype.adapter;
 
-import org.jiemamy.core.model.JiemamyModel;
 import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.JiemamyModel;
 
 /**
  * {@link AbstractDataType}用のアダプタ。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/DriverUtil.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -32,7 +32,7 @@
 import org.seasar.framework.util.ResourceTraversal;
 import org.seasar.framework.util.ResourceTraversal.ResourceHandler;
 
-import org.jiemamy.core.exception.DriverNotFoundException;
+import org.jiemamy.spec.exception.DriverNotFoundException;
 
 /**
  * JDBCドライバ関係のユーティリティクラス。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/EntityDependencyCalculator.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * エンティティの依存度を計算するクラス。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils;
 
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
 
 /**
  * 座標操作ユーティリティクラス。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/Processor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/Processor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/Processor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/01
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core.utils;
-
-/**
- * オブジェクトに対して実行する処理のインターフェイス。
- * 
- * cf. http://d.hatena.ne.jp/daisuke-m/20080801/1217594494
- * 
- * @see org.jiemamy.core.model.AbstractModel
- * @param <R> 結果の型
- * @param <T> 処理対象のオブジェクトの型
- * @param <E> 処理が投げる可能性のある例外の型（投げない場合は{@link RuntimeException}を指定）
- * @author daisuke
- */
-public interface Processor<T, R, E extends Exception> {
-	
-	/**
-	 * オブジェクトに対する処理を実行する。
-	 * @param target 対象オブジェクト
-	 * @return 結果
-	 * @throws E Process処理が正常に終了しなかった場合
-	 */
-	R process(T target) throws E;
-	
-}

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/IsSubColumnOfProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
 import org.jiemamy.core.model.typedef.InheritanceColumnModel;
-import org.jiemamy.core.utils.Processor;
+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/SetDefaultColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/SetDefaultColumnsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,14 +18,14 @@
  */
 package org.jiemamy.core.utils.processor;
 
-import org.jiemamy.core.exception.TooManyElementsException;
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
 import org.jiemamy.core.utils.processor.entity.table.CreateNewColumnProcessor;
 import org.jiemamy.core.utils.processor.entity.table.GetColumnProcessor;
+import org.jiemamy.spec.exception.TooManyElementsException;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+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/connection/AttachConnectionProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/AttachConnectionProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.utils.processor.connection;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * コネクションをアタッチする。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/DetachConnectionProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.connection;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * コネクションをデタッチする。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/IsCyclicProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.connection;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 自己参照コネクション（sourceとtargetが同一）かどうかを調べる。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GenerateForeignKeyNameProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import java.util.Date;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+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/connection/foreignkey/GetMappingProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/GetMappingProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,11 +18,11 @@
  */
 package org.jiemamy.core.utils.processor.connection.foreignkey;
 
-import org.jiemamy.core.exception.ElementNotFoundException;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.exception.ElementNotFoundException;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * TODO for daisuke

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/connection/foreignkey/UpdateMappingsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,14 +22,15 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jiemamy.core.exception.ElementNotFoundException;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.core.model.connection.ForeignKeyMappingImpl;
 import org.jiemamy.core.utils.processor.SetDefaultColumnsProcessor;
 import org.jiemamy.core.utils.processor.entity.table.GetPrimaryKeyColumnsProcessor;
+import org.jiemamy.spec.exception.ElementNotFoundException;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 外部キーに指定されたマッピングを更新するプロセッサ。
@@ -74,7 +75,7 @@
 			try {
 				fkModel.process(new GetMappingProcessor(referencePkColumn));
 			} catch (ElementNotFoundException e) {
-				ForeignKeyMapping mapping = new ForeignKeyMapping();
+				ForeignKeyMapping mapping = new ForeignKeyMappingImpl();
 				mapping.process(new SetDefaultColumnsProcessor(sourceTable, referencePkColumn, createColumnWithFk));
 				mappingsToAdd.add(mapping);
 			}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetForeignKeyParents.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 指定したエンティティの参照先親にあたるモデルのリストを取得する。
@@ -62,7 +62,7 @@
 		for (AbstractConnectionModel connection : entity.getSourceConnections()) {
 			if (connection instanceof ForeignKeyModel) {
 				ForeignKeyModel fkModel = (ForeignKeyModel) connection;
-				parents.add(fkModel.getTarget());
+				parents.add((AbstractEntityModel) fkModel.getTarget());
 			}
 		}
 		

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceChildren.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 指定したエンティティの継承先子にあたるモデルのリストを取得する。
@@ -63,7 +63,7 @@
 		for (AbstractConnectionModel relation : entity.getTargetConnections()) {
 			if (relation instanceof InheritanceModel) {
 				InheritanceModel inheritanceModel = (InheritanceModel) relation;
-				children.add(inheritanceModel.getSource());
+				children.add((AbstractEntityModel) inheritanceModel.getSource());
 			}
 		}
 		

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/GetInheritanceParents.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 指定したエンティティの継承親にあたるモデルのリストを取得する。
@@ -63,7 +63,7 @@
 		for (AbstractConnectionModel relation : entity.getSourceConnections()) {
 			if (relation instanceof InheritanceModel) {
 				InheritanceModel inheritanceModel = (InheritanceModel) relation;
-				parents.add(inheritanceModel.getTarget());
+				parents.add((AbstractEntityModel) inheritanceModel.getTarget());
 			}
 		}
 		

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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
 import org.jiemamy.core.model.typedef.InheritanceColumnModel;
-import org.jiemamy.core.utils.Processor;
+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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,10 +18,11 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.core.model.typedef.ColumnModelImpl;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.datatype.DataType;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 新しい{@link ColumnModel}を作成する。
@@ -39,7 +40,7 @@
 	 * @category instance creation
 	 */
 	public CreateNewColumnProcessor(String columnName, DataType dataType) {
-		columnModel = (new ColumnModel(columnName, dataType));
+		columnModel = (new ColumnModelImpl(columnName, dataType));
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetColumnProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,11 +22,11 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.ElementNotFoundException;
-import org.jiemamy.core.exception.TooManyElementsException;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.exception.ElementNotFoundException;
+import org.jiemamy.spec.exception.TooManyElementsException;
+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/GetPrimaryKeyColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetPrimaryKeyColumnsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/GetPrimaryKeyColumnsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * PKカラムのリストを取得する。
@@ -42,7 +42,7 @@
 	 */
 	public static GetPrimaryKeyColumnsProcessor getInstance() {
 		if (singleton == null) {
-			singleton = new GetPrimaryKeyColumnsProcessor();
+			singleton = (new GetPrimaryKeyColumnsProcessor());
 		}
 		return singleton;
 	}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/IsCompositeKeyTableProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/IsCompositeKeyTableProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/IsCompositeKeyTableProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.utils.Processor;
+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/RefreshInheritedColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RefreshInheritedColumnsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RefreshInheritedColumnsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.entity.table;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.utils.Processor;
+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/RemoveInheritedColumnsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/entity/table/RemoveInheritedColumnsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ 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)
@@ -21,11 +21,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
 import org.jiemamy.core.model.typedef.InheritanceColumnModel;
-import org.jiemamy.core.utils.Processor;
 import org.jiemamy.core.utils.processor.IsSubColumnOfProcessor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 指定した親モデルから継承されたカラムを削除する。
@@ -42,7 +42,7 @@
 	 * @category instance creation
 	 */
 	public RemoveInheritedColumnsProcessor(TableModel parentTable) {
-		this.parentTable = parentTable;
+		parentTable = parentTable;
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,11 +18,11 @@
  */
 package org.jiemamy.core.utils.processor.root;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 適切な初期エンティティ名称を生成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetEntityProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,12 +22,12 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.ElementNotFoundException;
-import org.jiemamy.core.exception.TooManyElementsException;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.exception.ElementNotFoundException;
+import org.jiemamy.spec.exception.TooManyElementsException;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * エンティティを取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetNodesProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 特定の種類のノードを取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/GetTableProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,12 +22,12 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.ElementNotFoundException;
-import org.jiemamy.core.exception.TooManyElementsException;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.exception.ElementNotFoundException;
+import org.jiemamy.spec.exception.TooManyElementsException;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * テーブルを取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/SetRecordProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.utils.processor.root;
 
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * カラムに対して値を設定する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/AbstractCreateModelProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/AbstractCreateModelProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/AbstractCreateModelProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,9 +21,9 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 新規モデル生成プロセッサの抽象クラス。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewDomainProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewDomainProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewDomainProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.typedef.DomainModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * 新しい{@link DomainModel}を作成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewForeignKeyProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewForeignKeyProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewForeignKeyProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.TableModel;
 import org.jiemamy.core.utils.processor.connection.AttachConnectionProcessor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * 新規外部キーモデルを生成するプロセッサ。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewInsertDataSetProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewInsertDataSetProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewInsertDataSetProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
 
 /**
  * 新しい{@link InsertDataSetModel}を作成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewPresentationProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewPresentationProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewPresentationProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
 
 /**
  * 新しい{@link DiagramPresentationModel}を作成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewStickyProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewStickyProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewStickyProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.StickyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.StickyModel;
 
 /**
  * 新しい{@link StickyModel}を作成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewTableProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewTableProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewTableProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * 新しい {@link TableModel} を作成する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewViewProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewViewProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/creation/CreateNewViewProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.utils.processor.root.creation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * 新しい{@link ViewModel}を作成する。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * エンティティに設定されたデータセットを取得する。
@@ -44,7 +44,7 @@
 	 */
 	public GetDataSetProcessor(int index, AbstractEntityModel entity) {
 		this.index = index;
-		this.entity = entity;
+		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:51:13 UTC (rev 1933)
+++ 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)
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * データセットを設定する。
@@ -47,8 +47,8 @@
 	 */
 	public SetDataSetProcessor(int index, AbstractEntityModel entity, List<RecordModel> records) {
 		this.index = index;
-		this.entity = entity;
-		this.records = records;
+		entity = entity;
+		records = records;
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetBendpointsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ベンドポイントのリストを取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetColorProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetColorProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetColorProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.root.presentation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ノードの背景色を取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetConstraintProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetConstraintProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/GetConstraintProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.root.presentation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 位置サイズ情報を取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/RemoveFromDiagramProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/RemoveFromDiagramProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/RemoveFromDiagramProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.core.utils.processor.root.presentation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ノードをダイアグラムから削除する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,12 +20,12 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.utils.Processor;
 import org.jiemamy.core.utils.processor.connection.IsCyclicProcessor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ベンドポイントを初期化する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetBendpointsProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ベンドポイントの座標を設定する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.root.presentation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * ノードの背景色を設定する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.core.utils.processor.root.presentation;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * 位置サイズ情報を取得する。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/impl/PrimaryKeyVisitor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/impl/PrimaryKeyVisitor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/visitor/impl/PrimaryKeyVisitor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,9 +22,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
 import org.jiemamy.core.utils.visitor.AbstractCollectionVisitor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
 
 /**
  * 主キーカラムのリスト取得するビジター。

Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core-aop.dicon	2008-09-17 19:52:14 UTC (rev 1934)
@@ -4,16 +4,16 @@
 <components>
 	<!-- ChangeEventを自動的に発火させるためのsetterInterceptor -->
 	<component name="setterInterceptor" class="org.jiemamy.core.event.SetterInterceptor"/>
-	<component class="org.jiemamy.core.model.node.TableModel" instance="prototype">
+	<component class="org.jiemamy.core.model.node.TableModelImpl" instance="prototype">
 		<aspect pointcut="set.*">setterInterceptor</aspect> 
 	</component>
-	<component class="org.jiemamy.core.model.typedef.ColumnModel" instance="prototype" autoBinding="none">
+	<component class="org.jiemamy.core.model.typedef.ColumnModelImpl" instance="prototype" autoBinding="none">
 		<aspect pointcut="set.*">setterInterceptor</aspect> 
 	</component>
-	<component class="org.jiemamy.core.model.node.index.IndexModel" instance="prototype">
+	<component class="org.jiemamy.core.model.node.index.IndexModelImpl" instance="prototype">
 		<aspect pointcut="set.*">setterInterceptor</aspect> 
 	</component>
-	<component class="org.jiemamy.core.model.typedef.constraint.CheckConstraintModel" instance="prototype">
+	<component class="org.jiemamy.core.model.typedef.constraint.CheckConstraintModelImpl" instance="prototype">
 		<aspect pointcut="set.*">setterInterceptor</aspect> 
 	</component>
 	
@@ -24,7 +24,7 @@
 		<property name="pointcut">"set.*"</property>
 		<initMethod name="addClassPattern">
 			<arg>"org.jiemamy.core.model"</arg>
-			<arg>".*Model"</arg>
+			<arg>".*ModelImpl"</arg>
 		</initMethod>
 		<initMethod name="addIgnoreClassPattern">
 			<arg>"org.jiemamy.core.model"</arg>

Modified: artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/main/resources/jiemamy-core.dicon	2008-09-17 19:52:14 UTC (rev 1934)
@@ -5,13 +5,13 @@
 	<include path="jiemamy-core-aop.dicon"/>
 	
 	<!-- Jiemamy Model -->
-	<component class="org.jiemamy.core.model.RootModel" instance="prototype"/>
-	<component class="org.jiemamy.core.model.node.ViewModel" instance="prototype"/>
-	<component class="org.jiemamy.core.model.node.StickyModel" instance="prototype"/>
-	<component class="org.jiemamy.core.model.connection.ForeignKeyModel" instance="prototype"/>
-	<component class="org.jiemamy.core.model.typedef.DomainModel" instance="prototype" autoBinding="none"/>
-	<component class="org.jiemamy.core.model.presentation.DiagramPresentationModel" instance="prototype"/>
-	<component class="org.jiemamy.core.model.dataset.InsertDataSetModel" instance="prototype"/>
+	<component class="org.jiemamy.core.model.RootModelImpl" instance="prototype"/>
+	<component class="org.jiemamy.core.model.node.ViewModelImpl" instance="prototype"/>
+	<component class="org.jiemamy.core.model.node.StickyModelImpl" instance="prototype"/>
+	<component class="org.jiemamy.core.model.connection.ForeignKeyModelImpl" instance="prototype"/>
+	<component class="org.jiemamy.core.model.typedef.DomainModelImpl" instance="prototype" autoBinding="none"/>
+	<component class="org.jiemamy.core.model.presentation.DiagramPresentationModelImpl" instance="prototype"/>
+	<component class="org.jiemamy.core.model.dataset.InsertDataSetModelImpl" instance="prototype"/>
 
 	<!-- Modelの自動登録 -->
 	<!--
@@ -21,7 +21,7 @@
 		</property>
 		<initMethod name="addClassPattern">
 			<arg>"org.jiemamy.core.model"</arg>
-			<arg>".*Model"</arg>
+			<arg>".*ModelImpl"</arg>
 		</initMethod>
 		<initMethod name="addIgnoreClassPattern">
 			<arg>"org.jiemamy.core.model"</arg>

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/SetterInterceptorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.After;
@@ -29,8 +28,12 @@
 import org.junit.Test;
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.factory.S2ContainerFactory;
+import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.node.TableModel;
+import org.jiemamy.core.model.node.TableModelImpl;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * {@link SetterInterceptor}のテストクラス。
@@ -65,7 +68,7 @@
 	@Before
 	public void setUp() {
 		tableModel = (TableModel) s2container.getComponent(TableModel.class);
-		listener = new ModelChangeListenerImpl();
+		listener = (new ModelChangeListenerImpl());
 		tableModel.addModelChangeListener(listener);
 	}
 	
@@ -94,7 +97,7 @@
 	 */
 	@Test
 	public void test_S2管理下ではないインスタンスには反応しない() {
-		TableModel tableModel2 = new TableModel();
+		TableModel tableModel2 = new TableModelImpl();
 		tableModel2.addModelChangeListener(listener);
 		tableModel2.setBeginScript("abc");
 		assertEquals(0, listener.eventHistory.size());
@@ -123,7 +126,7 @@
 	static class ModelChangeListenerImpl implements ModelChangeListener {
 		
 		/** 補足したEventの履歴を保持する。 */
-		List<ModelChangeEvent> eventHistory = new ArrayList<ModelChangeEvent>();
+		List<ModelChangeEvent> eventHistory = CollectionsUtil.newArrayList();
 		
 
 		/**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -36,12 +36,11 @@
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
-import org.jiemamy.core.event.collectionimpl.ObservableList;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
 import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * {@link ObservableList}のテストクラス。

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -36,12 +36,11 @@
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
-import org.jiemamy.core.event.collectionimpl.ObservableMap;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
 import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
 import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * {@link ObservableMap}のテストクラス。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,23 +23,9 @@
 
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
-import org.jiemamy.core.exception.TooManyElementsException;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel.InitiallyCheckTime;
-import org.jiemamy.core.model.connection.ForeignKeyModel.ReferentialAction;
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.dataset.RecordModel;
-import org.jiemamy.core.model.node.StickyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.DomainModel;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModel;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
+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;
@@ -55,6 +41,22 @@
 import org.jiemamy.core.utils.processor.root.creation.CreateNewStickyProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewViewProcessor;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.exception.TooManyElementsException;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel.InitiallyCheckTime;
+import org.jiemamy.spec.model.connection.ForeignKeyModel.ReferentialAction;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
 
 /**
  * アプリケーション用のモデルを生成するクラス。
@@ -77,7 +79,7 @@
 	public RootModel createModel() {
 		int offset = 50;
 		
-		RootModel rootModel = new RootModel();
+		RootModel rootModel = new RootModelImpl();
 		rootModel.setDialectClassName("org.jiemamy.dialect.mysql.MySqlDialect"); // MySQLDialect.class.getName()	
 		rootModel.setBeginScript("BEGIN;");
 		rootModel.setEndScript("COMMIT;");
@@ -85,7 +87,7 @@
 		rootModel.setSchemaName("FOO");
 		
 		DomainModel idDomain = rootModel.process(new CreateNewDomainProcessor("ID", new IntegerDataTypeMock()));
-		idDomain.addConstraint(new NotNullConstraintModel());
+		idDomain.addConstraint(new NotNullConstraintModelImpl());
 		idDomain.addConstraint(new UniqueConstraintModel("UNIQUE_CONSTTRAINT_ID"));
 		// TODO AUTO_INCREMENTの追加 [CORE-21]
 		
@@ -154,7 +156,7 @@
 		List<RecordModel> result = new ArrayList<RecordModel>();
 		
 		try {
-			RecordModel record = new RecordModel();
+			RecordModel record = new RecordModelImpl();
 			
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "1"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "10"));
@@ -163,21 +165,21 @@
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "NEW YORK"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "2"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "20"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "RESEARCH"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "DALLAS"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "3"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "30"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "SALES"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "CHICAGO"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "4"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "40"));
 			record
@@ -195,7 +197,7 @@
 		List<RecordModel> result = new ArrayList<RecordModel>();
 		
 		try {
-			RecordModel record = new RecordModel();
+			RecordModel record = new RecordModelImpl();
 			
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "1"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "10"));
@@ -203,21 +205,21 @@
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "広島"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "2"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "20"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "研究開発部"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "京都"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "3"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "30"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "営業部"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("LOC")), "東京"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("ID")), "4"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NO")), "40"));
 			record.process(new SetRecordProcessor(deptTable.process(new GetColumnProcessor("DEPT_NAME")), "経営本部"));
@@ -244,7 +246,7 @@
 		deptTable.setDescription("部署マスタです。");
 		
 		ColumnModel idColumn = deptTable.process(new CreateNewColumnProcessor("ID", idDomain));
-		idColumn.addConstraint(new PrimaryKeyConstraintModel());
+		idColumn.addConstraint(new PrimaryKeyConstraintModelImpl());
 		idColumn.setLogicalName("部署ID");
 		
 		ColumnModel noColumn = deptTable.process(new CreateNewColumnProcessor("DEPT_NO", new IntegerDataTypeMock()));
@@ -266,7 +268,7 @@
 		List<RecordModel> result = new ArrayList<RecordModel>();
 		
 		try {
-			RecordModel record = new RecordModel();
+			RecordModel record = new RecordModelImpl();
 			
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "1"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "10"));
@@ -277,7 +279,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "2"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "20"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "ALLEN"));
@@ -287,7 +289,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "3"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "30"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "WARD"));
@@ -297,7 +299,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "4"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "40"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "JONES"));
@@ -307,7 +309,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "5"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "50"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "MARTIN"));
@@ -317,7 +319,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "6"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "60"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "BLAKE"));
@@ -327,7 +329,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "7"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "70"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "CLARK"));
@@ -337,7 +339,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "1"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "8"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "80"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "SCOTT"));
@@ -357,7 +359,7 @@
 		List<RecordModel> result = new ArrayList<RecordModel>();
 		
 		try {
-			RecordModel record = new RecordModel();
+			RecordModel record = new RecordModelImpl();
 			
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "1"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "10"));
@@ -368,7 +370,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "2"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "20"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "内海"));
@@ -378,7 +380,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "3"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "30"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "村瀬"));
@@ -388,7 +390,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "4"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "4"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "40"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "近藤"));
@@ -398,7 +400,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "5"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "50"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "小峰"));
@@ -408,7 +410,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "3"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "6"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "60"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "三浦"));
@@ -418,7 +420,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "2"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "7"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "70"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "前島"));
@@ -428,7 +430,7 @@
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("DEPT_ID")), "1"));
 			result.add(record);
 			
-			record = new RecordModel();
+			record = new RecordModelImpl();
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("ID")), "8"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NO")), "80"));
 			record.process(new SetRecordProcessor(empTable.process(new GetColumnProcessor("EMP_NAME")), "島崎"));
@@ -459,15 +461,15 @@
 		empTable.setDescription("従業員マスタです。");
 		
 		ColumnModel idColumn = empTable.process(new CreateNewColumnProcessor("ID", idDomain));
-		idColumn.addConstraint(new PrimaryKeyConstraintModel());
+		idColumn.addConstraint(new PrimaryKeyConstraintModelImpl());
 		idColumn.setLogicalName("従業員ID");
 		
 		ColumnModel noColumn = empTable.process(new CreateNewColumnProcessor("EMP_NO", new IntegerDataTypeMock()));
-		noColumn.addConstraint(new NotNullConstraintModel());
+		noColumn.addConstraint(new NotNullConstraintModelImpl());
 		idColumn.setLogicalName("従業員番号");
 		
 		ColumnModel nameColumn = empTable.process(new CreateNewColumnProcessor("EMP_NAME", nameDomain));
-		nameColumn.addConstraint(new NotNullConstraintModel());
+		nameColumn.addConstraint(new NotNullConstraintModelImpl());
 		idColumn.setLogicalName("従業員名");
 		nameColumn.setDefaultValue("no name");
 		nameColumn.setSimpleIndex(true);
@@ -477,13 +479,13 @@
 		
 		ColumnModel hireColumn =
 				empTable.process(new CreateNewColumnProcessor("HIREDATE", new TimestampDataTypeMock()));
-		hireColumn.addConstraint(new NotNullConstraintModel());
+		hireColumn.addConstraint(new NotNullConstraintModelImpl());
 		
 		ColumnModel salColumn = empTable.process(new CreateNewColumnProcessor("SAL", new NumericDataTypeMock(7, 2)));
-		salColumn.addConstraint(new NotNullConstraintModel());
+		salColumn.addConstraint(new NotNullConstraintModelImpl());
 		
 		ColumnModel deptColumn = empTable.process(new CreateNewColumnProcessor("DEPT_ID", new IntegerDataTypeMock()));
-		deptColumn.addConstraint(new NotNullConstraintModel());
+		deptColumn.addConstraint(new NotNullConstraintModelImpl());
 		
 		return empTable;
 	}

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ModelIdManagerTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,7 +24,8 @@
 
 import org.junit.Test;
 
-import org.jiemamy.core.model.node.TableModel;
+import org.jiemamy.core.model.node.TableModelImpl;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * {@link ModelIdManager}のテストクラス。
@@ -37,7 +38,7 @@
 	 */
 	@Test
 	public void test_findModelが正しく動作するか確認する() {
-		TableModel tableModel = new TableModel();
+		TableModel tableModel = new TableModelImpl();
 		assertNotNull(tableModel);
 		ModelIdManager modelIdManager = ModelIdManager.getInstance();
 		assertNotNull(modelIdManager);
@@ -51,7 +52,7 @@
 	 */
 	@Test
 	public void test_newModelIdが正しく動作するか確認する() {
-		TableModel tableModel = new TableModel();
+		TableModel tableModel = new TableModelImpl();
 		assertNotNull(tableModel);
 		assertNotNull(tableModel.getId());
 	}
@@ -61,7 +62,7 @@
 	 */
 	@Test
 	public void test_removeModelIdが正しく動作するか確認する() {
-		TableModel tableModel = new TableModel();
+		TableModel tableModel = new TableModelImpl();
 		assertNotNull(tableModel);
 		ModelIdManager modelIdManager = ModelIdManager.getInstance();
 		assertNotNull(modelIdManager);

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/node/TableModelTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/node/TableModelTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/node/TableModelTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,20 +27,21 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.factory.S2ContainerFactory;
 
-import org.jiemamy.core.event.ModelChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.SetterInterceptor;
 import org.jiemamy.core.event.collectionimpl.ObservableListTest;
 import org.jiemamy.core.event.model.node.TableModelChangeListener;
 import org.jiemamy.core.event.model.node.TableModelChangeSupport;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.index.IndexModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
 import org.jiemamy.core.utils.debug.S2ContainerUtil;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.index.IndexModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
- * {@link TableModel}のテストクラス。
+ * {@link TableModelImpl}のテストクラス。
  * @author shin1ogawa
  */
 public class TableModelTest {

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:51:13 UTC (rev 1933)
+++ 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)
@@ -28,15 +28,19 @@
 import org.junit.Test;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
+import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
+
 /**
- * {@link ConstraintSetModel}のテストクラス。
+ * {@link ConstraintSetModelImpl}のテストクラス。
  * サンプルなので、とりあえず英語。
  * 
  * @author ykhr
  */
 public class ConstraintSetModelTest {
 	
-	private ConstraintSetModel model = new ConstraintSetModel();
+	private ConstraintSetModel model = new ConstraintSetModelImpl();
 	
 
 	/**
@@ -140,7 +144,7 @@
 	 * @author ykhr
 	 */
 	@SuppressWarnings("serial")
-	private static class MockConstraint implements Constraint {
+	private static class MockConstraint extends AbstractModel implements Constraint {
 		
 		/**
 		 * {@inheritDoc}

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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * IINTEGER型DataType。テスト用Mock。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericIntegerDataTypeMock extends GeneralDataType {
+public class GenericIntegerDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * NUMERIC型DataType。テスト用Mock。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericNumericDataTypeMock extends GeneralDataType {
+public class GenericNumericDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * TIEMSTAMP型DataType。テスト用Mock。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericTimestampDataTypeMock extends GeneralDataType {
+public class GenericTimestampDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.core.model.typedef.datatype.impl;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * VARCHAR型DataType。テスト用Mock。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericVarcharDataTypeMock extends GeneralDataType {
+public class GenericVarcharDataTypeMock extends AbstractDataType implements GeneralDataType {
 	
 	/** デフォルトのサイズ */
 	private static final int DEFAULT_SIZE = 1;

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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,7 +19,8 @@
 package org.jiemamy.core.model.typedef.datatype.impl;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * IINTEGER型DataType。テスト用Mock。
@@ -27,6 +28,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataTypeMock.class, typeName = "INT", alias = "INTEGER")
-public class IntegerDataTypeMock extends SpecialDataType {
+public class IntegerDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.core.model.typedef.datatype.impl;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * NUMERIC型DataType。テスト用Mock。
@@ -28,7 +29,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericNumericDataTypeMock.class, typeName = "NUMERIC", alias = "DECIMAL")
-public class NumericDataTypeMock extends SpecialDataType {
+public class NumericDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.core.model.typedef.datatype.impl;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * TIEMSTAMP型DataType。テスト用Mock。
@@ -28,7 +29,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericTimestampDataTypeMock.class, typeName = "TIMESTAMP")
-public class TimestampDataTypeMock extends SpecialDataType {
+public class TimestampDataTypeMock extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.core.model.typedef.datatype.impl;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * VARCHAR型DataType。テスト用Mock。
@@ -28,7 +29,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericVarcharDataTypeMock.class, typeName = "VARCHAR")
-public class VarcharDataTypeMock extends SpecialDataType {
+public class VarcharDataTypeMock extends AbstractDataType implements SpecialDataType {
 	
 	/** デフォルトのサイズ */
 	private static final int DEFAULT_SIZE = 1;

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/base/ForeignKeyTestBase.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,14 +23,15 @@
 import org.junit.After;
 import org.junit.Before;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewForeignKeyProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewPresentationProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
 
 /**
  * 外部キー関係のデスと基底クラス。
@@ -55,7 +56,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		rootModel = new RootModel();
+		rootModel = new RootModelImpl();
 		DiagramPresentationModel prsentation = rootModel.process(new CreateNewPresentationProcessor("テスト"));
 		
 		empTableModel = rootModel.process(new CreateNewTableProcessor("T_EMP"));

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,11 +27,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * {@link AddInheritedColumnsProcessor}のテストクラス。
@@ -51,7 +52,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		RootModel rootModel = new RootModel();
+		RootModel rootModel = new RootModelImpl();
 		superTable = rootModel.process(new CreateNewTableProcessor("T_SUPER"));
 		superTable.process(new CreateNewColumnProcessor("col4", new IntegerDataTypeMock()));
 		superTable.process(new CreateNewColumnProcessor("col5", new IntegerDataTypeMock()));

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GenerateEntityNameProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,11 +27,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewViewProcessor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * {@link GenerateEntityNameProcessor}のテストクラス。
@@ -49,7 +50,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		rootModel = (new RootModel());
+		rootModel = (new RootModelImpl());
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/GetNodesProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,11 +27,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewViewProcessor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * {@link GetNodesProcessor}のテストクラス。
@@ -49,7 +50,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		rootModel = new RootModel();
+		rootModel = new RootModelImpl();
 	}
 	
 	/**

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/ResetBendpointProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -26,8 +26,8 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.jiemamy.core.model.presentation.JmPoint;
 import org.jiemamy.core.utils.processor.base.ForeignKeyTestBase;
+import org.jiemamy.spec.geometory.JmPoint;
 
 /**
  * {@link ResetBendpointProcessor}のテストクラス。

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetColorProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,11 +28,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.presentation.JmColor;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewPresentationProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * {@link SetColorProcessor}のテストクラス。
@@ -52,7 +53,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		rootModel = new RootModel();
+		rootModel = new RootModelImpl();
 		rootModel.process(new CreateNewPresentationProcessor("テスト"));
 		rootModel.process(new CreateNewTableProcessor("T_TEST"));
 	}

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/root/presentation/SetConstraintProcessorTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,11 +28,12 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.presentation.JmRectangle;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewPresentationProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * {@link SetConstraintProcessor}のテストクラス。
@@ -52,7 +53,7 @@
 	 */
 	@Before
 	public void setUp() throws Exception {
-		rootModel = new RootModel();
+		rootModel = new RootModelImpl();
 		rootModel.process(new CreateNewPresentationProcessor("テスト"));
 		rootModel.process(new CreateNewTableProcessor("T_TEST"));
 	}

Modified: artemis/trunk/org.jiemamy.dialect/.project
===================================================================
--- artemis/trunk/org.jiemamy.dialect/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -6,7 +6,8 @@
 Bundle-ClassPath: .,
  lib/geronimo-jta_1.1_spec-1.0.jar
 Bundle-Vendor: Jiemamy Project
-Require-Bundle: org.jiemamy.core
+Require-Bundle: org.jiemamy.core,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core
 Export-Package: javax.transaction,

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,27 +27,12 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.exception.DataTypeNotFoundException;
-import org.jiemamy.core.exception.IllegalDataTypeMappingException;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.dialect.advisor.ConnectionAdvisor;
 import org.jiemamy.core.extension.dialect.advisor.DefaultConnectionAdvisor;
-import org.jiemamy.core.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.core.extension.dialect.mapping.SpecialDataTypeMapping;
 import org.jiemamy.core.extension.dialect.parser.DefaultModelParser;
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
-import org.jiemamy.core.extension.dialect.quoter.Quoter;
 import org.jiemamy.core.extension.dialect.validator.DefaultIdentifierValidator;
-import org.jiemamy.core.extension.dialect.validator.IdentifierValidator;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.constraint.NotNullConstraintModel;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+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.utils.ForEachUtil;
 import org.jiemamy.core.utils.JmIOUtil;
@@ -55,6 +40,20 @@
 import org.jiemamy.core.utils.processor.root.creation.CreateNewTableProcessor;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewViewProcessor;
 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.model.ColumnModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * SQL方言実装クラスの標準的な実装クラス。
@@ -146,7 +145,7 @@
 	 * @param advisor {@link ConnectionAdvisor}
 	 */
 	protected void setAdvisor(ConnectionAdvisor advisor) {
-		this.advisor = advisor;
+		advisor = advisor;
 	}
 	
 	/**
@@ -162,7 +161,7 @@
 	 * @param parser {@link ModelParser}
 	 */
 	protected void setParser(ModelParser parser) {
-		this.parser = parser;
+		parser = parser;
 	}
 	
 	/**
@@ -170,7 +169,7 @@
 	 * @param quoter {@link Quoter}
 	 */
 	protected void setQuoter(Quoter quoter) {
-		this.quoter = quoter;
+		quoter = quoter;
 	}
 	
 	/**
@@ -178,7 +177,7 @@
 	 * @param validator {@link IdentifierValidator}
 	 */
 	protected void setValidator(IdentifierValidator validator) {
-		this.validator = validator;
+		validator = validator;
 	}
 	
 	/**
@@ -207,7 +206,7 @@
 				 * {@inheritDoc}
 				 */
 				public List<ColumnModel> visit(ResultSet element) throws SQLException {
-					AbstractDataType dataType;
+					SpecialDataType dataType;
 					try {
 						dataType = getDataTypeMapping().resolveSpecialDataType(element.getString("TYPE_NAME"));
 						
@@ -228,7 +227,7 @@
 						column.setDefaultValue(element.getString("COLUMN_DEF"));
 						
 						if ("NO".equals(element.getString("IS_NULLABLE")) == false) {
-							column.addConstraint(new NotNullConstraintModel());
+							column.addConstraint(new NotNullConstraintModelImpl());
 						}
 						
 						finalResult.add(column);
@@ -256,7 +255,7 @@
 						String columnName = element.getString("COLUMN_NAME");
 						for (ColumnModel column : columns) {
 							if (column.getName().equals(columnName)) {
-								column.addConstraint(new PrimaryKeyConstraintModel());
+								column.addConstraint(new PrimaryKeyConstraintModelImpl());
 							}
 						}
 					} catch (SQLException ignore) {

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,8 @@
  */
 package org.jiemamy.dialect;
 
-import org.jiemamy.core.extension.dialect.quoter.Quoter;
+import org.jiemamy.spec.extension.Quoter;
+import org.jiemamy.spec.extension.Quoter.QuoteKind;
 
 /**
  * {@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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBigIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * BIGINTEGER型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericBigIntegerDataType extends GeneralDataType {
+public class GenericBigIntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericBlobDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * BLOB型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericBlobDataType extends GeneralDataType {
+public class GenericBlobDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * CHARACTER型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericCharacterDataType extends GeneralDataType {
+public class GenericCharacterDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericClobDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * CLOB型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericClobDataType extends GeneralDataType {
+public class GenericClobDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericIntegerDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * INTEGER型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericIntegerDataType extends GeneralDataType {
+public class GenericIntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * NUMERIC型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericNumericDataType extends GeneralDataType {
+public class GenericNumericDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericRealDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * REAL型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericRealDataType extends GeneralDataType {
+public class GenericRealDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * TIMESTAMP型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericTimestampDataType extends GeneralDataType {
+public class GenericTimestampDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,15 +18,16 @@
  */
 package org.jiemamy.dialect.datatype.generic;
 
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
 
 /**
  * VARCHAR型の汎用DataTypeクラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class GenericVarcharDataType extends GeneralDataType {
+public class GenericVarcharDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,17 +21,9 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.dialect.advisor.ConnectionAdvisor;
 import org.jiemamy.core.extension.dialect.advisor.DefaultConnectionAdvisor;
-import org.jiemamy.core.extension.dialect.mapping.DataTypeMapping;
 import org.jiemamy.core.extension.dialect.mapping.GeneralDataTypeMapping;
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
-import org.jiemamy.core.extension.dialect.quoter.Quoter;
-import org.jiemamy.core.extension.dialect.validator.IdentifierValidator;
 import org.jiemamy.core.extension.dialect.validator.ReservedWordsProvider;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBlobDataType;
 import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;
@@ -41,6 +33,14 @@
 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.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
 
 /**
  * 全てのSQL方言に対応し得る、最大公約数的なSQL方言実装クラス。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,8 +28,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.DataType;
 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;
@@ -42,6 +40,7 @@
 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.model.datatype.DataType;
 
 /**
  * {@link GeneralDialect}のテストクラス。
@@ -76,8 +75,7 @@
 	 */
 	@Test
 	public void test01_Generic型は9種類ある() throws Exception {
-		List<Class<? extends AbstractDataType>> allModelingDataTypes =
-				dialect.getDataTypeMapping().getAllModelingDataTypes();
+		List<Class<? extends DataType>> allModelingDataTypes = dialect.getDataTypeMapping().getAllModelingDataTypes();
 		assertThat(allModelingDataTypes.size(), is(9));
 		
 		assertThat(allModelingDataTypes.contains(GenericIntegerDataType.class), is(true));
@@ -97,11 +95,10 @@
 	 */
 	@Test
 	public void test02_DataTypeは全てデフォルトコンストラクタを持つ() throws Exception {
-		List<Class<? extends AbstractDataType>> allModelingDataTypes =
-				dialect.getDataTypeMapping().getAllModelingDataTypes();
+		List<Class<? extends DataType>> allModelingDataTypes = dialect.getDataTypeMapping().getAllModelingDataTypes();
 		
-		for (Class<? extends AbstractDataType> typeClass : allModelingDataTypes) {
-			AbstractDataType type = typeClass.newInstance();
+		for (Class<? extends DataType> typeClass : allModelingDataTypes) {
+			DataType type = typeClass.newInstance();
 			assertNotNull(type);
 		}
 	}

Modified: artemis/trunk/org.jiemamy.dialect.mysql/.project
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.dialect.mysql/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -10,6 +10,8 @@
  lib/junit-4.4.jar
 Bundle-Vendor: Jiemamy Project
 Export-Package: org.jiemamy.dialect.mysql,org.jiemamy.dialect.mysql.parser,org.jiemamy.dialect.mysql.parser.expression
-Require-Bundle: org.jiemamy.core,org.jiemamy.dialect
+Require-Bundle: org.jiemamy.core,
+ org.jiemamy.dialect,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core,org.jiemamy.dialect

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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.mysql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * MySQLのINTEGERデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "INTEGER", alias = "INT")
-public class IntegerDataType extends SpecialDataType {
+public class IntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,9 @@
 package org.jiemamy.dialect.mysql.parser;
 
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.dialect.mysql.parser.expression.MySqlRootModelExpression;
+import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlColumnModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlColumnModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlColumnModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,7 @@
 
 import org.jiemamy.core.extension.dialect.parser.Expression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.model.typedef.ColumnModel;
+import org.jiemamy.spec.model.ColumnModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlDomainModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlDomainModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlDomainModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,7 @@
 
 import org.jiemamy.core.extension.dialect.parser.CompositeExpression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.model.typedef.DomainModel;
+import org.jiemamy.spec.model.DomainModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlNodeModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlNodeModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlNodeModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import org.jiemamy.core.extension.dialect.parser.CompositeExpression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlRootModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlRootModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlRootModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,8 +21,8 @@
 import org.jiemamy.core.extension.dialect.parser.CompositeExpression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
 import org.jiemamy.core.extension.dialect.parser.expression.ScriptExpression;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.typedef.DomainModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlTableModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlTableModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlTableModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import org.jiemamy.core.extension.dialect.parser.CompositeExpression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
 import org.jiemamy.core.utils.IndentStringBuilder;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlViewModelExpression.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlViewModelExpression.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/parser/expression/MySqlViewModelExpression.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,7 @@
 
 import org.jiemamy.core.extension.dialect.parser.CompositeExpression;
 import org.jiemamy.core.extension.dialect.parser.ExpressionContext;
-import org.jiemamy.core.model.node.ViewModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * TODO j5ik2o

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:51:13 UTC (rev 1933)
+++ 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)
@@ -23,7 +23,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.core.model.ApplicationModelCreator;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link MySqlModelParser}のテストクラス。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/.project
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -10,6 +10,8 @@
  lib/junit-4.4.jar
 Bundle-Vendor: Jiemamy Project
 Export-Package: org.jiemamy.dialect.postgresql
-Require-Bundle: org.jiemamy.core,org.jiemamy.dialect
+Require-Bundle: org.jiemamy.core,
+ org.jiemamy.dialect,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core,org.jiemamy.dialect

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -14,7 +14,6 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
 import org.jiemamy.dialect.AbstractDialect;
 import org.jiemamy.dialect.postgresql.datatype.BigIntegerDataType;
 import org.jiemamy.dialect.postgresql.datatype.BigSerialDataType;
@@ -38,6 +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;
 
 /**
  * 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.core.extension.dialect.quoter.Quoter;
+import org.jiemamy.spec.extension.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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのBIGINTデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericBigIntegerDataType.class, typeName = "BIGINT", alias = "INT8")
-public class BigIntegerDataType extends SpecialDataType {
+public class BigIntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのBIGSERIALデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericBigIntegerDataType.class, typeName = "BIGSERIAL", alias = "SERIAL8")
-public class BigSerialDataType extends SpecialDataType {
+public class BigSerialDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのBITデータ型クラス。
@@ -29,7 +30,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "BIT")
-public class BitDataType extends SpecialDataType {
+public class BitDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericBlobDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なBLOBデータ型クラス。
@@ -28,5 +29,5 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericBlobDataType.class, typeName = "BYTEA")
-public class BlobDataType extends SpecialDataType {
+public class BlobDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのBOOLEANデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "BOOLEAN", alias = "BOOL")
-public class BooleanDataType extends SpecialDataType {
+public class BooleanDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なCHARデータ型クラス。
@@ -32,7 +33,7 @@
 	"CHARACTER",
 	"BPCHAR"
 })
-public class CharacterDataType extends SpecialDataType {
+public class CharacterDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なDATEデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericTimestampDataType.class, typeName = "DATE")
-public class DateDataType extends SpecialDataType {
+public class DateDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのDECIMALデータ型クラス。
@@ -30,7 +31,7 @@
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericNumericDataType.class, typeName = "DECIMAL")
 // THINK DECは？
-public class DecimalDataType extends SpecialDataType {
+public class DecimalDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なDOUBLEデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericRealDataType.class, typeName = "DOUBLE PRECISION", alias = "FLOAT8")
-public class DoubleDataType extends SpecialDataType {
+public class DoubleDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なFLOATデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericRealDataType.class, typeName = "FLOAT")
-public class FloatDataType extends SpecialDataType {
+public class FloatDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのINTEGERデータ型クラス。
@@ -31,6 +32,6 @@
 	"INT",
 	"INT4"
 })
-public class IntegerDataType extends SpecialDataType {
+public class IntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なINTERVALデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "INTERVAL")
-public class IntervalDataType extends SpecialDataType {
+public class IntervalDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのMONEYデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "MONEY")
-public class MoneyDataType extends SpecialDataType {
+public class MoneyDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのNUMERICデータ型クラス。
@@ -29,7 +30,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericNumericDataType.class, typeName = "NUMERIC")
-public class NumericDataType extends SpecialDataType {
+public class NumericDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericRealDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なREALデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericRealDataType.class, typeName = "REAL", alias = "FLOAT4")
-public class RealDataType extends SpecialDataType {
+public class RealDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのSERIALデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "SERIAL", alias = "SERIAL4")
-public class SerialDataType extends SpecialDataType {
+public class SerialDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのSMALLINTデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "SMALLINT", alias = "INT2")
-public class SmallIntegerDataType extends SpecialDataType {
+public class SmallIntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,8 +19,9 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.dialect.datatype.generic.GenericClobDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのTEXTデータ型クラス。
@@ -28,6 +29,6 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericClobDataType.class, typeName = "TEXT")
-public class TextDataType extends SpecialDataType {
+public class TextDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なTIMEデータ型クラス。
@@ -33,7 +34,7 @@
 	"TIME WITH TIME ZONE",
 	"TIME WITHOUT TIME ZONE"
 })
-public class TimeDataType extends SpecialDataType {
+public class TimeDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なTIMESTAMPデータ型クラス。
@@ -33,7 +34,7 @@
 	"TIMESTAMP WITHOUT TIME ZONE",
 	"TIMESTAMP TIME WITH TIME ZONE"
 })
-public class TimestampDataType extends SpecialDataType {
+public class TimestampDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * PostgreSQLのBIT VARYINGデータ型クラス。
@@ -29,7 +30,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericIntegerDataType.class, typeName = "VARBIT", alias = "BIT VARYING")
-public class VarbitDataType extends SpecialDataType {
+public class VarbitDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -19,9 +19,10 @@
 package org.jiemamy.dialect.postgresql.datatype;
 
 import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
 import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
 import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 一般的なVARCHARデータ型クラス。
@@ -29,7 +30,7 @@
  */
 @SuppressWarnings("serial")
 @MappingInfo(generic = GenericVarcharDataType.class, typeName = "VARCHAR", alias = "CHARACTER VARYING")
-public class VarcharDataType extends SpecialDataType {
+public class VarcharDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -30,13 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.core.exception.DataTypeNotFoundException;
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.dialect.mapping.DataTypeMapping;
-import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
 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;
@@ -44,6 +37,12 @@
 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.model.datatype.DataType;
+import org.jiemamy.spec.model.datatype.GeneralDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * {@link PostgresqlDialect}のテストクラス。
@@ -78,8 +77,7 @@
 	 */
 	@Test
 	public void test01_Concrete型は9種類ある() throws Exception {
-		List<Class<? extends AbstractDataType>> allModelingDataTypes =
-				dialect.getDataTypeMapping().getAllModelingDataTypes();
+		List<Class<? extends DataType>> allModelingDataTypes = dialect.getDataTypeMapping().getAllModelingDataTypes();
 		assertThat(allModelingDataTypes.size(), is(22));
 		
 		assertThat(allModelingDataTypes.contains(IntegerDataType.class), is(true));
@@ -91,11 +89,10 @@
 	 */
 	@Test
 	public void test02_DataTypeは全てデフォルトコンストラクタを持つ() throws Exception {
-		List<Class<? extends AbstractDataType>> allModelingDataTypes =
-				dialect.getDataTypeMapping().getAllModelingDataTypes();
+		List<Class<? extends DataType>> allModelingDataTypes = dialect.getDataTypeMapping().getAllModelingDataTypes();
 		
-		for (Class<? extends AbstractDataType> typeClass : allModelingDataTypes) {
-			AbstractDataType type = typeClass.newInstance();
+		for (Class<? extends DataType> typeClass : allModelingDataTypes) {
+			DataType type = typeClass.newInstance();
 			assertNotNull(type);
 		}
 	}

Modified: artemis/trunk/org.jiemamy.dialect.sql99/.project
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.sql99/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.dialect.sql99/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.sql99/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -10,6 +10,8 @@
  lib/junit-4.4.jar
 Bundle-Vendor: Jiemamy Project
 Export-Package: org.jiemamy.dialect.sql99,org.jiemamy.dialect.sql99.parser
-Require-Bundle: org.jiemamy.core,org.jiemamy.dialect
+Require-Bundle: org.jiemamy.core,
+ org.jiemamy.dialect,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core,org.jiemamy.dialect

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.dialect.sql99;
 
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
 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;
 
 /**
  * 標準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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,13 +18,14 @@
  */
 package org.jiemamy.dialect.sql99.datatype;
 
-import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
+import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.datatype.SpecialDataType;
 
 /**
  * 標準SQL99のINTEGERデータ型クラス。
  * @author daisuke
  */
 @SuppressWarnings("serial")
-public class IntegerDataType extends SpecialDataType {
+public class IntegerDataType extends AbstractDataType implements 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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.dialect.sql99.parser;
 
-import org.jiemamy.core.extension.dialect.parser.ModelParser;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.extension.ModelParser;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * TODO j5ik2o

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/resources/jiemamy-dialect-sql99.dicon
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/resources/jiemamy-dialect-sql99.dicon	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/resources/jiemamy-dialect-sql99.dicon	2008-09-17 19:52:14 UTC (rev 1934)
@@ -4,9 +4,4 @@
 <components>
 	<include path="jiemamy-core.dicon"/>
 	<include path="jiemamy-dialect.dicon"/>
-	<component class="org.jiemamy.dialect.sql99.Sql99Dialect">
-		<property name="parser">
-			<component class="org.jiemamy.dialect.sql99.parser.Sql99ModelParser"/>
-		</property>
-	</component>
 </components>

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/test/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParserTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/test/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParserTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/test/java/org/jiemamy/dialect/sql99/parser/Sql99ModelParserTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,7 +23,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.core.model.ApplicationModelCreator;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link Sql99ModelParser}のテストクラス。
@@ -33,7 +33,7 @@
 public class Sql99ModelParserTest {
 	
 	/**
-	 * {@link org.jiemamy.dialect.sql99.parser.Sql99ModelParser#parse(org.jiemamy.core.model.RootModel)} のためのテスト・メソッド。
+	 * {@link org.jiemamy.dialect.sql99.parser.Sql99ModelParser#parse(RootModel)} のためのテスト・メソッド。
 	 */
 	@Test
 	public void testParser() {

Modified: artemis/trunk/org.jiemamy.eclipse/.project
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -26,7 +26,8 @@
  org.eclipse.debug.core,
  org.jiemamy.core,
  org.jiemamy.serializer,
- org.jiemamy.dialect
+ org.jiemamy.dialect,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core,
  org.jiemamy.serializer,

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -33,13 +33,13 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
-import org.jiemamy.core.extension.dialect.Dialect;
-import org.jiemamy.core.extension.exporter.Exporter;
-import org.jiemamy.core.extension.importer.Importer;
 import org.jiemamy.eclipse.extension.ExtensionResolver;
 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;
 
 /**
  * Jiemamy Eclipse Pluginクラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -36,11 +36,6 @@
 import org.eclipse.gef.commands.CompoundCommand;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.core.utils.processor.connection.IsCyclicProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetBendpointsProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetConstraintProcessor;
@@ -48,6 +43,11 @@
 import org.jiemamy.core.utils.processor.root.presentation.SetBendpointsProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.SetConstraintProcessor;
 import org.jiemamy.eclipse.editor.editpart.diagram.AbstractNodeEditPart;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * 自動レイアウトアクション。
@@ -187,8 +187,8 @@
 		 * @category instance creation
 		 */
 		public LayoutCommand(RootModel rootModel, AbstractNodeModel target, int x, int y) {
-			this.rootModel = rootModel;
-			this.target = target;
+			rootModel = rootModel;
+			target = target;
 			this.x = x;
 			this.y = y;
 			oldX = rootModel.process(new GetConstraintProcessor(MustBeMulti.ZERO, target)).x;

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,11 +28,11 @@
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.ColorDialog;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.editor.command.ChangeNodeColorCommand;
 import org.jiemamy.eclipse.editor.editpart.diagram.AbstractNodeEditPart;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノード背景色変更アクション。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -31,13 +31,13 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IFileEditorInput;
 
-import org.jiemamy.core.exception.ExportException;
-import org.jiemamy.core.extension.exporter.ExportContext;
-import org.jiemamy.core.extension.exporter.Exporter;
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.RootModel;
 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.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * UI付きPortアクション(import/export)クラス

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,12 +23,12 @@
 import org.eclipse.gef.commands.CommandStack;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.core.utils.processor.root.presentation.GetConstraintProcessor;
 import org.jiemamy.eclipse.editor.command.ChangeNodeConstraintCommand;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノードのサイズをフィット（デフォルトサイズに変更）させるアクション。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -31,13 +31,13 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IFileEditorInput;
 
-import org.jiemamy.core.exception.ImportException;
-import org.jiemamy.core.extension.importer.ImportContext;
-import org.jiemamy.core.extension.importer.Importer;
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.RootModel;
 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.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * UI付きPortアクション(import/export)クラス

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -55,11 +55,11 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IFileEditorInput;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.eclipse.editor.DiagramEditor;
 import org.jiemamy.eclipse.ui.FolderSelectWizardPage;
 import org.jiemamy.eclipse.utils.EditorUtil;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * ダイアグラム画像保存機能アクション。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -87,7 +87,6 @@
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.seasar.framework.container.S2Container;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewPresentationProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpart.DiagramEditPartFactory;
@@ -95,6 +94,7 @@
 import org.jiemamy.eclipse.editor.editpart.OutlineTreeEditPartFactory;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * ERダイアグラムエディタ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor2.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor2.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor2.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -76,10 +76,10 @@
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.eclipse.editor.editpart.DiagramEditPartFactory;
 import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
 import org.jiemamy.eclipse.editor.editpart.OutlineTreeEditPartFactory;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * ERダイアグラムエディタ。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -31,8 +31,6 @@
 import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.actions.ActionFactory;
 
-import org.jiemamy.core.extension.exporter.Exporter;
-import org.jiemamy.core.extension.importer.Importer;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.action.AutoLayoutAction;
 import org.jiemamy.eclipse.action.ChangeNodeBackgroundColorAction;
@@ -41,6 +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;
 
 /**
  * コンテキストメニュープロバイダ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -33,14 +33,14 @@
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.StickyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.preference.PreferenceKey;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * エディタパレットのファクトリー

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -54,10 +54,10 @@
 import org.osgi.framework.Bundle;
 import org.seasar.eclipse.common.util.LogUtil;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.utils.EditorUtil;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * エディタのコントリビュータ

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,7 +23,7 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
 import org.jiemamy.core.event.AbstractObservable;
-import org.jiemamy.core.model.AbstractModel;
+import org.jiemamy.spec.model.JiemamyModel;
 
 /**
  * 分類コンテナ。アウトラインツリー用。
@@ -37,7 +37,7 @@
 	private String name;
 	
 	/** コンテナが持つ子モデル */
-	private List<AbstractModel> children = CollectionsUtil.newArrayList();
+	private List<JiemamyModel> children = CollectionsUtil.newArrayList();
 	
 
 	/**
@@ -52,7 +52,7 @@
 	 * childrenを取得する。
 	 * @return children
 	 */
-	public List<AbstractModel> getChildren() {
+	public List<JiemamyModel> getChildren() {
 		return children;
 	}
 	
@@ -68,7 +68,7 @@
 	 * コンテナが持つ子モデルを設定する。
 	 * @param children コンテナが持つ子モデル
 	 */
-	public void setChildren(List<AbstractModel> children) {
+	public void setChildren(List<JiemamyModel> children) {
 		this.children = children;
 	}
 }

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -43,12 +43,12 @@
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
 import org.jiemamy.core.utils.processor.root.creation.CreateNewPresentationProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
 
 /**
  * マルチページ構成のダイアグラムエディタクラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,11 +21,11 @@
 import org.eclipse.gef.commands.Command;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmColor;
 import org.jiemamy.core.utils.processor.root.presentation.GetColorProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.SetColorProcessor;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノードの背景色変更コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -27,16 +27,17 @@
 
 import org.jiemamy.core.MustBeMulti;
 import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.core.utils.JmPointUtil;
 import org.jiemamy.core.utils.processor.root.presentation.GetBendpointsProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetConstraintProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.SetConstraintProcessor;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノードの位置・サイズ変更コマンド
@@ -129,7 +130,7 @@
 		JmPoint delta = JmPointUtil.delta(oldConstraint, constraint);
 		
 		// 選択されたモデルのリストを得る
-		List<AbstractModel> selectedModels = new ArrayList<AbstractModel>();
+		List<JiemamyModel> selectedModels = new ArrayList<JiemamyModel>();
 		for (Object obj : viewer.getSelectedEditParts()) {
 			EditPart ep = (EditPart) obj;
 			selectedModels.add((AbstractModel) ep.getModel());

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,11 +21,11 @@
 import org.eclipse.draw2d.geometry.Point;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
 import org.jiemamy.core.utils.processor.root.presentation.GetBendpointsProcessor;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * ベンドポイント追加コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,15 +25,7 @@
 import org.seasar.eclipse.common.util.LogUtil;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.StickyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
 import org.jiemamy.core.utils.processor.connection.DetachConnectionProcessor;
 import org.jiemamy.core.utils.processor.connection.IsCyclicProcessor;
 import org.jiemamy.core.utils.processor.connection.foreignkey.GenerateForeignKeyNameProcessor;
@@ -45,6 +37,14 @@
 import org.jiemamy.core.utils.processor.root.presentation.ResetBendpointProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * コネクション作成コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,11 +22,11 @@
 import org.eclipse.gef.commands.Command;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.core.utils.processor.root.presentation.RemoveFromDiagramProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.SetConstraintProcessor;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノード作成コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,10 +22,10 @@
 import org.eclipse.gef.commands.Command;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * ベンドポイント削除コマンド。
@@ -59,7 +59,6 @@
 	 */
 	@Override
 	public void execute() {
-		
 		JmPoint oldLocation =
 				rootModel.getDiagramPresentations().get(MustBeMulti.ZERO).getConnectionLayouts().get(relation).get(
 						index);

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,15 +25,15 @@
 import org.eclipse.gef.commands.Command;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.TableModel;
 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;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * ノード削除コマンド

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,12 +20,12 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.model.connection.AbstractRelationModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.TableModel;
 import org.jiemamy.core.utils.processor.connection.DetachConnectionProcessor;
 import org.jiemamy.core.utils.processor.entity.table.AddInheritedColumnsProcessor;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * コネクション削除コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,11 +20,11 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.StickyModel;
 import org.jiemamy.eclipse.editor.DisplayMode;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.StickyModel;
 
 /**
  * ノードのダイレクト編集コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.eclipse.editor.dialog.Memento;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * モデル編集コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.eclipse.editor.dialog.Memento;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
 
 /**
  * モデル編集コマンド

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.model.node.TableModel;
 import org.jiemamy.eclipse.editor.dialog.Memento;
+import org.jiemamy.spec.model.node.TableModel;
 
 /**
  * モデル編集コマンド
@@ -48,7 +48,6 @@
 	 * @param afterEditMemento 編集後のmemento
 	 */
 	public EditTableModelCommand(TableModel targetModel, Memento beforeEditMemento, Memento afterEditMemento) {
-		
 		super();
 		this.targetModel = targetModel;
 		this.beforeEditMemento = beforeEditMemento;

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import org.eclipse.gef.commands.Command;
 
-import org.jiemamy.core.model.node.ViewModel;
 import org.jiemamy.eclipse.editor.dialog.Memento;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * モデル編集コマンド
@@ -48,7 +48,6 @@
 	 * @param afterEditMemento 編集後のmemento
 	 */
 	public EditViewModelCommand(ViewModel targetModel, Memento beforeEditMemento, Memento afterEditMemento) {
-		
 		super();
 		this.targetModel = targetModel;
 		this.beforeEditMemento = beforeEditMemento;

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import org.eclipse.draw2d.geometry.Point;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * ベンドポイント移動コマンド。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,14 +24,14 @@
 import org.eclipse.gef.commands.Command;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.eclipse.editor.MultiDiagramEditor;
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * ノードを移動させるコマンドの抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,13 +22,7 @@
 import org.eclipse.gef.EditPartFactory;
 import org.seasar.framework.container.S2Container;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.StickyModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpart.diagram.ForeignKeyEditPart;
 import org.jiemamy.eclipse.editor.editpart.diagram.InheritanceEditPart;
@@ -36,6 +30,12 @@
 import org.jiemamy.eclipse.editor.editpart.diagram.StickyEditPart;
 import org.jiemamy.eclipse.editor.editpart.diagram.TableEditPart;
 import org.jiemamy.eclipse.editor.editpart.diagram.ViewEditPart;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * ダイアグラム用EditPartファクトリ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,13 +22,6 @@
 import org.eclipse.gef.EditPartFactory;
 import org.seasar.framework.container.S2Container;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.model.typedef.DomainModel;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.ModelContainer;
 import org.jiemamy.eclipse.editor.editpart.outlinetree.ModelContainerEditPart;
@@ -37,6 +30,13 @@
 import org.jiemamy.eclipse.editor.editpart.outlinetree.TableTreeEditPart;
 import org.jiemamy.eclipse.editor.editpart.outlinetree.TypeDefTreeEditPart;
 import org.jiemamy.eclipse.editor.editpart.outlinetree.ViewTreeEditPart;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * アウトラインツリー用EditPartファクトリ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import org.eclipse.gef.tools.DirectEditManager;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.node.AbstractEntityModel;
 import org.jiemamy.core.utils.processor.entity.GetInheritanceParents;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link AbstractEntityModel}に対するDiagram用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -36,21 +36,21 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmComponentEditPolicy;
 import org.jiemamy.eclipse.editor.editpolicy.JmDirectEditPolicy;
 import org.jiemamy.eclipse.editor.editpolicy.JmGraphicalNodeEditPolicy;
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * {@link AbstractNode}に対するDiagram用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRelationEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,14 +28,14 @@
 import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.presentation.JmPoint;
 import org.jiemamy.core.utils.processor.root.presentation.GetBendpointsProcessor;
 import org.jiemamy.eclipse.editor.editpolicy.JmBendpointEditPolicy;
 import org.jiemamy.eclipse.editor.editpolicy.JmRelationEditPolicy;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * Relationに対するDiagram用EditPart（コントローラ）。の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,11 +25,11 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeListener;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * {@link RootModel}に対するDiagram用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -29,16 +29,16 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.utils.processor.connection.foreignkey.UpdateMappingsProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * 外部キーモデルに対するDiagram用EditPart（コントローラ）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -36,17 +36,17 @@
 import org.seasar.framework.util.tiger.CollectionsUtil;
 import org.seasar.framework.util.tiger.ReflectionUtil;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent;
 import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmXYLayoutEditPolicy;
 import org.jiemamy.eclipse.preference.ConnectionRouters;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * {@link RootModel}に対するDiagram用EditPart。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,16 +28,16 @@
 import org.seasar.framework.container.S2Container;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.StickyModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.core.utils.processor.root.presentation.GetColorProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetConstraintProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.figure.StickyFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.StickyModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * ビューモデルに対するDiagram用EditPart（コントローラ）。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -31,16 +31,7 @@
 import org.seasar.framework.container.S2Container;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel.DisplayItem;
-import org.jiemamy.core.model.typedef.ColumnModel;
 import org.jiemamy.core.model.typedef.InheritanceColumnModel;
-import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
 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;
@@ -53,6 +44,15 @@
 import org.jiemamy.eclipse.editor.figure.ColumnFigure;
 import org.jiemamy.eclipse.editor.figure.TableFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.constraint.PrimaryKeyConstraintModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel.DisplayItem;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * テーブルモデルに対するDiagram用EditPart（コントローラ）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,12 +28,6 @@
 import org.seasar.framework.container.S2Container;
 
 import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.model.presentation.JmRectangle;
 import org.jiemamy.core.utils.processor.root.presentation.GetColorProcessor;
 import org.jiemamy.core.utils.processor.root.presentation.GetConstraintProcessor;
 import org.jiemamy.eclipse.JiemamyPlugin;
@@ -42,6 +36,12 @@
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
 import org.jiemamy.eclipse.editor.figure.ViewFigure;
 import org.jiemamy.eclipse.utils.ConvertUtil;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link ViewModel}に対するDiagram用EditPart（コントローラ）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,10 +18,10 @@
  */
 package org.jiemamy.eclipse.editor.editpart.outlinetree;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
 import org.jiemamy.core.utils.processor.entity.GetInheritanceParents;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link AbstractEntityModel}に対するTree用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,10 +21,10 @@
 import org.eclipse.gef.editparts.AbstractTreeEditPart;
 
 import org.jiemamy.core.event.AbstractObservable;
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.event.ModelChangeListener;
 import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
+import org.jiemamy.spec.util.ModelChangeListener;
 
 /**
  * {@link AbstractModel}に対するTree用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractRelationTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.eclipse.editor.editpart.outlinetree;
 
-import org.jiemamy.core.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * {@link AbstractRelationModel}に対するTree用EditPart（コントローラ）の抽象クラス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,10 +22,10 @@
 
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.model.AbstractModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.ModelContainer;
+import org.jiemamy.spec.model.JiemamyModel;
 
 /**
  * {@link ModelContainer}に対するTree用EditPart（コントローラ）。
@@ -37,7 +37,7 @@
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected List<AbstractModel> getModelChildren() {
+	protected List<JiemamyModel> getModelChildren() {
 		// ここで返された子モデルがツリーの子アイテムになる
 		return ((ModelContainer) getModel()).getChildren();
 	}

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RelationTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,14 +20,15 @@
 
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
 import org.jiemamy.core.utils.processor.connection.IsCyclicProcessor;
 import org.jiemamy.core.utils.processor.entity.table.IsCompositeKeyTableProcessor;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link ForeignKeyModel}に対するTree用EditPart（コントローラ）。
@@ -65,8 +66,8 @@
 			if (fkModel.getTarget().process(IsCompositeKeyTableProcessor.getInstance())
 					|| fkModel.getMappings().size() == 0) {
 				// 複合キー時 or マッピング未定義時
-				sb.append(fkModel.getName()).append(" (").append(fkModel.getSource().getName()).append(" => ").append(
-						fkModel.getTarget().getName()).append(")");
+				sb.append(fkModel.getName()).append(" (").append(((AbstractEntityModel) fkModel.getSource()).getName())
+					.append(" => ").append(((AbstractEntityModel) fkModel.getTarget()).getName()).append(")");
 			} else if (fkModel.process(IsCyclicProcessor.getInstance())) {
 				sb.append(fkModel.getName()).append(" (").append(
 						fkModel.getMappings().get(0).getConstraintColumn().getName()).append(" => ").append(
@@ -75,11 +76,12 @@
 				sb.append(fkModel.getName()).append(" (").append(
 						fkModel.getMappings().get(0).getConstraintColumn().getName()).append(" => ").append(
 						fkModel.getMappings().get(0).getReferenceColumn().getName()).append("@").append(
-						fkModel.getTarget().getName()).append(")");
+						((AbstractEntityModel) fkModel.getTarget()).getName()).append(")");
 			}
 			setWidgetImage(ir.get(Images.BUTTON_FK));
 		} else if (model instanceof InheritanceModel) {
-			sb.append(model.getSource().getName()).append(" INHERITS ").append(model.getTarget().getName());
+			sb.append(((AbstractEntityModel) model.getSource()).getName()).append(" INHERITS ").append(
+					((AbstractEntityModel) model.getTarget()).getName());
 			setWidgetImage(ir.get(Images.BUTTON_INH));
 		}
 		setWidgetText(sb.toString());

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,13 +21,13 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.typedef.DomainModel;
 import org.jiemamy.eclipse.editor.ModelContainer;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * RootModelに対するTree用EditPart

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,10 +24,6 @@
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.AbstractModel;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.TableModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.DisplayPlace;
@@ -36,6 +32,10 @@
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * {@link TableModel}に対するTree用EditPart（コントローラ）。
@@ -102,9 +102,9 @@
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected List<AbstractModel> getModelChildren() {
+	protected List<JiemamyModel> getModelChildren() {
 		// ここで返された子モデルがツリーの子アイテムになる
-		List<AbstractModel> children = new ArrayList<AbstractModel>();
+		List<JiemamyModel> children = new ArrayList<JiemamyModel>();
 		children.addAll(((TableModel) getModel()).getColumns());
 		children.addAll(((TableModel) getModel()).getSourceConnections());
 		

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TypeDefTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,11 +21,11 @@
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * DefinitionModelに対するTree用EditPart

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,9 +21,6 @@
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.jface.resource.ImageRegistry;
 
-import org.jiemamy.core.event.ModelChangeEvent;
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.ViewModel;
 import org.jiemamy.eclipse.Images;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.editor.DisplayPlace;
@@ -32,6 +29,9 @@
 import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
 import org.jiemamy.eclipse.editor.editpolicy.JmTreeComponentEditPolicy;
 import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.ModelChangeEvent;
 
 /**
  * ViewModelに対するTree用EditPart

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,11 +23,11 @@
 import org.eclipse.gef.editpolicies.BendpointEditPolicy;
 import org.eclipse.gef.requests.BendpointRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractRelationModel;
 import org.jiemamy.eclipse.editor.command.CreateBendpointCommand;
 import org.jiemamy.eclipse.editor.command.DeleteBendpointCommand;
 import org.jiemamy.eclipse.editor.command.MoveBendpointCommand;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * BendpointのEditPolicy。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,9 +22,9 @@
 import org.eclipse.gef.editpolicies.ComponentEditPolicy;
 import org.eclipse.gef.requests.GroupRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.editor.command.DeleteNodeCommand;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * エンティティののEditPolicy

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,9 +22,9 @@
 import org.eclipse.gef.editpolicies.DirectEditPolicy;
 import org.eclipse.gef.requests.DirectEditRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.editor.command.DirectEditNodeCommand;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * エンティティ名のダイレクト編集ポリシー。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,10 +23,10 @@
 import org.eclipse.gef.requests.CreateConnectionRequest;
 import org.eclipse.gef.requests.ReconnectRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.editor.command.CreateConnectionCommand;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * GraphicalNodeののEditPolicy

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,8 +22,8 @@
 import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
 import org.eclipse.gef.requests.GroupRequest;
 
-import org.jiemamy.core.model.connection.AbstractRelationModel;
 import org.jiemamy.eclipse.editor.command.DeleteRelationCommand;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * {@link AbstractRelationModel}のEditPolicy。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,12 +22,12 @@
 import org.eclipse.gef.editpolicies.ComponentEditPolicy;
 import org.eclipse.gef.requests.GroupRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
 import org.jiemamy.eclipse.editor.DiagramEditor;
 import org.jiemamy.eclipse.editor.command.DeleteNodeCommand;
 import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * アウトラインツリー用のEditPolicy

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,13 +25,13 @@
 import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
-import org.jiemamy.core.model.node.AbstractNodeModel;
-import org.jiemamy.core.model.node.StickyModel;
 import org.jiemamy.core.utils.processor.root.GenerateEntityNameProcessor;
 import org.jiemamy.eclipse.editor.command.ChangeNodeConstraintCommand;
 import org.jiemamy.eclipse.editor.command.CreateNodeCommand;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.StickyModel;
 
 /**
  * グラフィックXYレイアウトのEditPolicy

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/IsDisplayedProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/IsDisplayedProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/IsDisplayedProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,9 +18,9 @@
  */
 package org.jiemamy.eclipse.editor.extraprocessor;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel.DisplayItem;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel.DisplayItem;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * {@link #index} で表されるダイアグラムが、{@link #target} を表示する設定になっているかどうかを調べるプロセッサ。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/LabelStringProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/LabelStringProcessor.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/extraprocessor/LabelStringProcessor.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,14 +20,14 @@
 
 import java.util.List;
 
-import org.jiemamy.core.model.RootModel;
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.typedef.ColumnModel;
-import org.jiemamy.core.utils.Processor;
 import org.jiemamy.eclipse.editor.DisplayPlace;
 import org.jiemamy.eclipse.editor.DisplayTarget;
+import org.jiemamy.spec.model.ColumnModel;
+import org.jiemamy.spec.model.RootModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * UIに表示する文字列を生成する。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,7 +23,7 @@
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.geometry.Rectangle;
 
-import org.jiemamy.core.model.typedef.ColumnModel;
+import org.jiemamy.spec.model.ColumnModel;
 
 /**
  * {@link ColumnModel}用Figure（ビュー）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,8 +24,8 @@
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.swt.graphics.Color;
 
-import org.jiemamy.core.model.node.AbstractEntityModel;
 import org.jiemamy.eclipse.utils.SwtColorUtil;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
 
 /**
  * {@link AbstractEntityModel}のFigure（ビュー）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -29,8 +29,8 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 
-import org.jiemamy.core.model.node.StickyModel;
 import org.jiemamy.eclipse.utils.SwtColorUtil;
+import org.jiemamy.spec.model.node.StickyModel;
 
 /**
  * {@link StickyModel}用Figure（ビュー）。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,7 @@
 
 import org.eclipse.core.resources.IResource;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * 検証ロジックインターフェイス。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.eclipse.preference;
 
-import org.jiemamy.core.exception.JiemamyRuntimeException;
+import org.jiemamy.spec.exception.JiemamyRuntimeException;
 
 /**
  * コネクションルータの種類。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,9 +23,9 @@
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
 
 /**
  * JiemamyモデルのインスタンスとSWT/Draw2Dのインスタンスを相互変換する。

Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -31,10 +31,11 @@
 import org.eclipse.ui.ide.IDE;
 import org.seasar.framework.container.S2Container;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.core.model.RootModelImpl;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * 新規ダイアグラムファイル作成ウィザード
@@ -141,7 +142,7 @@
 		 */
 		@Override
 		protected InputStream getInitialContents() {
-			RootModel rootModel = new RootModel();
+			RootModel rootModel = new RootModelImpl();
 			
 			try {
 				return serializer.serialize(rootModel);

Added: artemis/trunk/org.jiemamy.irenka/src/main/java/org/jiemamy/irenka/hack/specific/FieldHacker.java
===================================================================
--- artemis/trunk/org.jiemamy.irenka/src/main/java/org/jiemamy/irenka/hack/specific/FieldHacker.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.irenka/src/main/java/org/jiemamy/irenka/hack/specific/FieldHacker.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -0,0 +1,72 @@
+package org.jiemamy.irenka.hack.specific;
+
+import org.ashikunep.irenka.dom.CtClass;
+import org.ashikunep.irenka.dom.CtEnum;
+import org.ashikunep.irenka.dom.CtEnumConstant;
+import org.ashikunep.irenka.dom.CtField;
+import org.ashikunep.irenka.dom.CtJavadoc;
+import org.ashikunep.irenka.dom.CtMember;
+import org.ashikunep.irenka.dom.ElementKind;
+import org.ashikunep.irenka.dom.ModifierKind;
+import org.ashikunep.irenka.dom.doc.CtDocBlock;
+import org.ashikunep.irenka.toolkit.DeclarationFactory;
+import org.ashikunep.irenka.toolkit.DocFactory;
+import org.ashikunep.irenka.toolkit.ElementFactory;
+import org.ashikunep.irenka.toolkit.Messager;
+
+/**
+ * フィールドのEnumを生成するIrenka Hack。
+ * @author daisuke
+ */
+public class FieldHacker {
+	
+	/**
+	 * @param me 
+	 * @param klass 
+	 * @param decFactory 
+	 * @param elemFactory 
+	 * @param docFactory 
+	 * @when klass.simpleName =~ "^.*ModelX$"
+	 */
+	public void foundModel(Messager me, CtClass<?> klass, DeclarationFactory decFactory, ElementFactory elemFactory,
+			DocFactory docFactory) {
+		System.out.println(klass.getSimpleName());
+		
+		final String enumName = "Field";
+		CtEnum<?> fieldEnum = null;
+		
+		for (CtMember member : klass.getMembers()) {
+			if (member.getElementKind() == ElementKind.ENUM && ((CtEnum<?>) member).getSimpleName().equals(enumName)) {
+				fieldEnum = (CtEnum<?>) member;
+				break;
+			}
+		}
+		
+		CtEnum<?> newEnum = decFactory.newEnum(enumName);
+		newEnum.getModifiersAndAnnotations().add(elemFactory.newModifier(ModifierKind.PUBLIC));
+		if (fieldEnum == null) {
+			me.info("not found");
+			klass.getMembers().add(newEnum);
+			
+		} else {
+			me.info("found");
+			fieldEnum.substitute(newEnum);
+		}
+		
+		for (CtField<?> field : klass.getDeclaredFields()) {
+			CtEnumConstant<?> newEnumConstant =
+					decFactory.newEnumConstant(newEnum, field.getSimpleName().replaceAll("([A-Z])", "_$1")
+						.toUpperCase());
+			newEnum.getMembers().add(newEnumConstant);
+			
+			String fieldDescription = klass.getSimpleName() + "#" + field.getSimpleName();
+			CtDocBlock javadoc = docFactory.newDocBlock("@see " + fieldDescription);
+			newEnumConstant.getJavadoc().getBlocks().clear();
+			newEnumConstant.getJavadoc().getBlocks().add(javadoc);
+		}
+		
+		CtJavadoc javadoc = docFactory.parseJavadoc("/** Auto generated by Irenka */");
+		newEnum.getJavadoc().substitute(javadoc);
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.irenka/src/main/java/org/jiemamy/irenka/hack/specific/FieldHacker.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: artemis/trunk/org.jiemamy.project/pom.xml
===================================================================
--- artemis/trunk/org.jiemamy.project/pom.xml	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.project/pom.xml	2008-09-17 19:52:14 UTC (rev 1934)
@@ -77,6 +77,7 @@
     <url>http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi/artemis/trunk/org.jiemamy.project/?root=jiemamy</url>
   </scm>
   <modules>
+    <module>../org.jiemamy.spec</module>
     <module>../org.jiemamy.core</module>
     <module>../org.jiemamy.serializer</module>
     <module>../org.jiemamy.dialect</module>

Modified: artemis/trunk/org.jiemamy.serializer/.project
===================================================================
--- artemis/trunk/org.jiemamy.serializer/.project	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/.project	2008-09-17 19:52:14 UTC (rev 1934)
@@ -56,14 +56,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>findbugs.xml</name>
+			<name>.fbprefs</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
 		</link>
 		<link>
-			<name>.fbprefs</name>
+			<name>findbugs.xml</name>
 			<type>1</type>
-			<locationURI>DOCUMENTS/org.jiemamy.project/.fbprefs</locationURI>
+			<locationURI>DOCUMENTS/org.jiemamy.project/findbugs.xml</locationURI>
 		</link>
 		<link>
 			<name>.checkstyle</name>

Modified: artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,6 +21,7 @@
  org.jiemamy.serializer.model.presentation,
  org.jiemamy.serializer.model.typedef,
  org.jiemamy.serializer.model.typedef.constraint
-Require-Bundle: org.jiemamy.core
+Require-Bundle: org.jiemamy.core,
+ org.jiemamy.spec
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: org.jiemamy.core

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model;
 
-import org.jiemamy.core.model.typedef.DomainModel;
 import org.jiemamy.serializer.model.typedef.SerializeDomainModel;
+import org.jiemamy.spec.model.DomainModel;
 
 /**
  * {@llink DomainModel}と{@link SerializeDomainModel}を相互変換するコンバータ。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,8 +18,8 @@
  */
 package org.jiemamy.core.model;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.serializer.model.connection.SerializeForeignKeyModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
 
 /**
  * TODO junichi

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -19,6 +19,7 @@
 package org.jiemamy.core.model;
 
 import org.jiemamy.serializer.model.SerializeRootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link RootModel}用のDxoインターフェイス。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializer.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializer.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializer.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,7 +22,7 @@
 
 import org.apache.commons.lang.SerializationException;
 
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * シリアライザインターフェイス。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractNodeModelConverter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractNodeModelConverter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractNodeModelConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,7 +24,7 @@
 import org.seasar.extension.dxo.converter.impl.AbstractConverter;
 
 import org.jiemamy.core.model.ModelIdManager;
-import org.jiemamy.core.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * AbstractNodeModel用のコンバータ。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractSerializeConnectionModelConverter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractSerializeConnectionModelConverter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/AbstractSerializeConnectionModelConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -21,11 +21,11 @@
 import org.seasar.extension.dxo.converter.ConversionContext;
 import org.seasar.framework.exception.InstantiationRuntimeException;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
 import org.jiemamy.serializer.model.connection.AbstractSerializeConnectionModel;
 import org.jiemamy.serializer.model.connection.SerializeForeignKeyModel;
 import org.jiemamy.serializer.model.connection.SerializeInheritanceModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
 
 /**
  * {@link AbstractSerializeConnectionModel}用のコンバータ。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/CustomBeanConverter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/CustomBeanConverter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/CustomBeanConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -82,16 +82,16 @@
 import org.seasar.framework.util.TimeConversionUtil;
 import org.seasar.framework.util.TimestampConversionUtil;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
 import org.jiemamy.core.model.connection.InheritanceModel;
-import org.jiemamy.core.model.node.TableModel;
-import org.jiemamy.core.model.node.ViewModel;
-import org.jiemamy.core.model.typedef.DomainModel;
 import org.jiemamy.serializer.model.connection.SerializeForeignKeyModel;
 import org.jiemamy.serializer.model.connection.SerializeInheritanceModel;
 import org.jiemamy.serializer.model.node.SerializeTableModel;
 import org.jiemamy.serializer.model.node.SerializeViewModel;
 import org.jiemamy.serializer.model.typedef.SerializeDomainModel;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.node.TableModel;
+import org.jiemamy.spec.model.node.ViewModel;
 
 /**
  * package privateのプロパティに対応したBeanConverter。

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:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/DataTypeConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import org.seasar.extension.dxo.converter.ConversionContext;
 
-import org.jiemamy.core.model.typedef.DomainModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
 import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
+import org.jiemamy.spec.model.DomainModel;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * TODO junichi

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/UUIDConverter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/UUIDConverter.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/UUIDConverter.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -23,7 +23,7 @@
 import org.seasar.extension.dxo.converter.ConversionContext;
 import org.seasar.extension.dxo.converter.impl.AbstractConverter;
 
-import org.jiemamy.core.model.node.AbstractNodeModel;
+import org.jiemamy.spec.model.node.AbstractNodeModel;
 
 /**
  * UUID用のコンバータ。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerImpl.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerImpl.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -28,7 +28,6 @@
 import org.apache.commons.lang.CharEncoding;
 import org.apache.commons.lang.SerializationException;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.core.model.RootModelDxo;
 import org.jiemamy.serializer.JiemamySerializer;
 import org.jiemamy.serializer.model.SerializeRootModel;
@@ -52,6 +51,7 @@
 import org.jiemamy.serializer.model.typedef.constraint.SerializeNotNullConstraintModel;
 import org.jiemamy.serializer.model.typedef.constraint.SerializePrimaryKeyConstraintModel;
 import org.jiemamy.serializer.model.typedef.constraint.SerializeUniqueConstraintModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link JiemamySerializer}の実装クラス。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerStab.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerStab.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/JiemamySerializerStab.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -31,8 +31,8 @@
 import org.dom4j.DocumentFactory;
 import org.dom4j.io.OutputFormat;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * 正式なシリアライザが完成するまでの、仮のシリアライザ。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,12 +24,12 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.RootModel;
 import org.jiemamy.serializer.model.connection.AbstractSerializeConnectionModel;
 import org.jiemamy.serializer.model.dataset.SerializeInsertDataSetModel;
 import org.jiemamy.serializer.model.node.AbstractSerializeNodeModel;
 import org.jiemamy.serializer.model.presentation.SerializeDiagramPresentationModel;
 import org.jiemamy.serializer.model.typedef.SerializeDomainModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link RootModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeConnectionModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeConnectionModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeConnectionModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import org.seasar.framework.util.UUID;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
 
 /**
  * {@link AbstractConnectionModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeRelationModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeRelationModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/AbstractSerializeRelationModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.serializer.model.connection;
 
-import org.jiemamy.core.model.connection.AbstractRelationModel;
+import org.jiemamy.spec.model.connection.AbstractRelationModel;
 
 /**
  * {@link AbstractRelationModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyMapping.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyMapping.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.model.connection.ForeignKeyMapping;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.serializer.model.typedef.SerializeColumnModel;
+import org.jiemamy.spec.model.connection.ForeignKeyMapping;
 
 /**
  * {@link ForeignKeyMapping}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/SerializeForeignKeyModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,9 +25,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.connection.ForeignKeyModel;
-import org.jiemamy.core.model.connection.ForeignKeyModel.InitiallyCheckTime;
-import org.jiemamy.core.model.connection.ForeignKeyModel.MatchType;
+import org.jiemamy.spec.model.connection.ForeignKeyModel;
+import org.jiemamy.spec.model.connection.ForeignKeyModel.InitiallyCheckTime;
+import org.jiemamy.spec.model.connection.ForeignKeyModel.MatchType;
 
 /**
  * {@link ForeignKeyModel}に対応するシリアライズ用のモデルです．

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeInsertDataSetModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeInsertDataSetModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeInsertDataSetModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -7,9 +7,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.dataset.InsertDataSetModel;
-import org.jiemamy.core.model.node.AbstractEntityModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.dataset.InsertDataSetModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
 
 /**
  * {@link InsertDataSetModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeRecordModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeRecordModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/SerializeRecordModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -6,9 +6,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.dataset.RecordModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.serializer.model.typedef.SerializeColumnModel;
+import org.jiemamy.spec.model.dataset.RecordModel;
 
 /**
  * {@link RecordModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.serializer.model.node;
 
-import org.jiemamy.core.model.node.AbstractEntityModel;
+import org.jiemamy.spec.model.node.AbstractEntityModel;
 
 /**
  * {@link AbstractEntityModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -22,8 +22,8 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.connection.AbstractConnectionModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.connection.AbstractConnectionModel;
 
 /**
  * AbstractNodeModelに対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,8 +20,8 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.model.node.index.IndexModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.index.IndexModel;
 
 /**
  * {@link IndexModel}に対応するシリアライズ用のモデル。

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

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

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexColumnModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexColumnModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.model.node.index.IndexColumnModel.SortType;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.serializer.model.typedef.SerializeColumnModel;
+import org.jiemamy.spec.model.index.IndexColumnModel.SortType;
 
 /**
  * IndexColumnModelに対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/SerializeIndexModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,9 +24,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.node.index.IndexColumnModel;
-import org.jiemamy.core.model.node.index.IndexModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.index.IndexColumnModel;
+import org.jiemamy.spec.model.index.IndexModel;
 
 /**
  * {@link IndexModel}に対応するシリアライズ用のモデル。

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/presentation/SerializeDiagramPresentationModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/presentation/SerializeDiagramPresentationModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/presentation/SerializeDiagramPresentationModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -6,13 +6,13 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.presentation.DiagramPresentationModel;
-import org.jiemamy.core.model.presentation.JmColor;
-import org.jiemamy.core.model.presentation.JmPoint;
-import org.jiemamy.core.model.presentation.JmRectangle;
-import org.jiemamy.core.model.presentation.DiagramPresentationModel.DisplayItem;
 import org.jiemamy.serializer.model.connection.AbstractSerializeConnectionModel;
 import org.jiemamy.serializer.model.node.AbstractSerializeNodeModel;
+import org.jiemamy.spec.geometory.JmColor;
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel;
+import org.jiemamy.spec.model.presentation.DiagramPresentationModel.DisplayItem;
 
 /**
  * {@link DiagramPresentationModel}に対応するシリアライズ用のモデル。

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

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -19,13 +19,14 @@
 package org.jiemamy.serializer.model.typedef;
 
 import java.lang.reflect.Field;
+import java.util.List;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.event.ModelChangeListener;
-import org.jiemamy.core.model.JiemamyModel;
-import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.utils.Processor;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.datatype.DataType;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * DomainModelに対応するシリアライズ用のモデル。
@@ -71,6 +72,14 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	public List<Object> getAdapters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
 	public boolean hasAdapter(Class<?> adapter) {
 		// TODO Auto-generated method stub
 		return false;

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,9 +20,9 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 
-import org.jiemamy.core.model.typedef.datatype.DataType;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
 import org.jiemamy.serializer.model.typedef.constraint.SerializeConstraintSetModel;
+import org.jiemamy.spec.model.datatype.DataType;
 
 /**
  * TypeDefModelに対応するシリアライズ用のモデル。

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:51:13 UTC (rev 1933)
+++ 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)
@@ -18,9 +18,15 @@
  */
 package org.jiemamy.serializer.model.typedef.constraint;
 
+import java.lang.reflect.Field;
+import java.util.List;
+
 import org.jiemamy.core.model.typedef.constraint.AbstractConstraintModel;
-import org.jiemamy.core.model.typedef.constraint.Constraint;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.JiemamyModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.util.ModelChangeListener;
+import org.jiemamy.spec.util.Processor;
 
 /**
  * {@link AbstractConstraintModel}に対応するシリアライズ用のモデル。
@@ -35,6 +41,46 @@
 	
 
 	/**
+	 * {@inheritDoc}
+	 */
+	public void addModelChangeListener(ModelChangeListener listener) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void fireModelChange(Field field) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public <T>T getAdapter(Class<T> adapter) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<Object> getAdapters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	/**
 	 * 制約名を取得する。
 	 * @return 制約名
 	 */
@@ -43,6 +89,30 @@
 	}
 	
 	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasAdapter(Class<?> adapter) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public <R, T extends JiemamyModel, E extends Exception>R process(Processor<T, R, E> processor) throws E {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void removeModelChangeListener(ModelChangeListener listener) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	/**
 	 * 制約名を設定する。
 	 * @param name 制約名
 	 */

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeCheckConstraintModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeCheckConstraintModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeCheckConstraintModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -20,7 +20,7 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
-import org.jiemamy.core.model.typedef.constraint.CheckConstraintModel;
+import org.jiemamy.spec.model.constraint.CheckConstraintModel;
 
 /**
  * {@link CheckConstraintModel}に対応するシリアライズ用のモデルです．
@@ -50,5 +50,4 @@
 	public void setExpression(String expression) {
 		this.expression = expression;
 	}
-	
 }

Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeConstraintSetModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeConstraintSetModel.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/SerializeConstraintSetModel.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -24,9 +24,9 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.core.model.typedef.constraint.Constraint;
-import org.jiemamy.core.model.typedef.constraint.ConstraintSetModel;
 import org.jiemamy.serializer.model.AbstractSerializeModel;
+import org.jiemamy.spec.model.constraint.Constraint;
+import org.jiemamy.spec.model.constraint.ConstraintSetModel;
 
 /**
  * {@link ConstraintSetModel}に対応するシリアライズ用のモデル。

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

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

Modified: artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/core/model/RootModelDxoTest.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/core/model/RootModelDxoTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/core/model/RootModelDxoTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -25,6 +25,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.serializer.model.SerializeRootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * {@link RootModelDxo}のテストクラス。

Modified: artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/SerializationTest.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/SerializationTest.java	2008-09-17 19:51:13 UTC (rev 1933)
+++ artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/SerializationTest.java	2008-09-17 19:52:14 UTC (rev 1934)
@@ -32,7 +32,7 @@
 import org.seasar.framework.unit.Seasar2;
 
 import org.jiemamy.core.model.ApplicationModelCreator;
-import org.jiemamy.core.model.RootModel;
+import org.jiemamy.spec.model.RootModel;
 
 /**
  * モデルのシリアライズ全体のテスト。

• 前の記事 [Jiemamy-notify] commit [1933] Share project "org.jiemamy.spec" into "svn+ssh://svn. sourceforge.jp/svnroot/jiemamy"
• 次の記事 [Jiemamy-notify] commit [1935] [GEN-59] パッケージ整理。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]