svnno****@sourc*****
svnno****@sourc*****
2009年 2月 23日 (月) 03:25:43 JST
Revision: 2713
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2713
Author: daisuke_m
Date: 2009-02-23 03:25:43 +0900 (Mon, 23 Feb 2009)
Log Message:
-----------
{@inheritDoc}としか書かれていないjavadoc廃止。 /
LogMarkerをちょっとだけ導入。 /
refactor
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/sandbox/daisuke/Daisuke.java
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/JiemamyDomSerializerTest.java
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/SerializationTest.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReader.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReadingContext.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java
artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
artemis/trunk/jiemamy-core/src/main/java/javanet/staxutils/IndentingXMLEventWriter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisExtender.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisJiemamyFactory.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/AttributeIterator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/AbstractDialect.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultDataTypeResolver.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/AbstractProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetColumnProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDataSetProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDependentEntitiesProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetEntityProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetMappingProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetNodesProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetReferenceEntitiesProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideAttributeNameProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/SetRecordProcessor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/AbstractJiemamyElement.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/ElementReferenceImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/RootModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/AbstractAttributeModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/RepresentationAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractConstraintModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractKeyConstraintModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractValueConstraintModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/UniqueKeyModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/DataSetModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/RecordModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataTypeImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/PrecisionedDataTypeAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SerialDataTypeAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SizedDataTypeAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/TimezonedDataTypeAdapter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/AbstractEntityModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/TableModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/ViewModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexColumnModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Identifier.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Operator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Separator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/SqlStatementImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AbstractContext.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ArrayEssentialStack.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AttributeComparator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DateUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DisablableImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DriverUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EntityDependencyCalculator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialQueue.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialStack.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ForEachUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IterableNodeList.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/JmStringUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LinkedEssentialQueue.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Processor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ProcessorUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Resolvable.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResolvableQueue.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResourceTraversal.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/StaxUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ModelBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DataTypeUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EntityUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/ForeignKeyUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/KeyConstraintUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/TableUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/ReferenceQueueMonitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/Swapper.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractCollectionVisitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractMapVisitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractResultSetVisitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/EntityNamesVisitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/SizeVisitor.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/CompositeValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/ArtemisJiemamyFactoryTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerImplTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/ResolvableQueueTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/CompositeValidatorTest.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java
artemis/trunk/jiemamy-dialect-postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ArtemisView.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancePointcut.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancePointcut.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetConnectionsProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/IsCyclicProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/ResetBendpointProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/NodeAdapterImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModel.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModelImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/utils/JmPointUtil.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/Images.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/PropertyAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayPlace.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayStatus.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayTarget.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDataSetTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogCheckTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogLocalKeyTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogRecordTab.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DoubleClickSupport.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/EditDialogSupport.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/EntityDirectEditManager.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AttributeTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/DomainTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/CompartmentFigureBorder.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure2.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/TableFigure.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ViewFigure.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/MultiLineTextCellEditor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/NodeCellEditorLocator.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/ExtensionResolver.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreference.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceImpl.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceInitializer.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferencePage.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/helper/TextSelectionAdapter.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/EditorUtil.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/SwtColorUtil.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/ReferenceResolver.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportContext.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportContext.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Importer.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/Quoter.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/DriverNotFoundException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ElementNotFoundException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/GenericModelingModeException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalImplementationException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyRuntimeException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ModelConsistenceException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/TooManyElementsException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/UnexpectedConditionError.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/JiemamyElement.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/AttributeModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/ColumnModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/CheckConstraintModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ConstraintModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/Deferrability.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/KeyConstraintModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/DataSetModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/RecordModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataType.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataTypeAdapter.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/LiteralType.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/TableModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/ViewModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexColumnModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/serializer/SerializationException.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Context.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Disablable.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedTableBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureTableBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreNamespace.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreQName.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/JiemamyNamespace.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentations.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/Level.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/NodeProfile.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapter.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmPoint.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmRectangle.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/node/NodeAdapter.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/xml/ViewQName.java
Added Paths:
-----------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LogMarker.java
Removed Paths:
-------------
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/ControlArea.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -125,16 +125,10 @@
this.target = target;
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
commandList.add(command);
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
return target;
}
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/artemis/test/ModelConsistenceTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -95,6 +95,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -139,6 +140,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
@@ -162,6 +164,7 @@
/**
* dummy
+ *
* @throws Exception
*/
@Test
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/sandbox/daisuke/Daisuke.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/sandbox/daisuke/Daisuke.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/sandbox/daisuke/Daisuke.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* 個人的な実験場。
+ *
* @author daisuke
*/
public class Daisuke {
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/JiemamyDomSerializerTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/JiemamyDomSerializerTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/JiemamyDomSerializerTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,6 +34,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -44,6 +45,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/SerializationTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/SerializationTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/serializer/SerializationTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -79,6 +79,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -87,6 +88,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
@@ -94,7 +96,8 @@
}
/**
- * test
+ * とりあえずXMLに書き込んでみる。
+ *
* @throws Exception
*/
@Test
@@ -121,7 +124,8 @@
}
/**
- * test
+ * とりあえずXMLから読み込んでみる。
+ *
* @throws Exception
*/
@Test
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,9 +43,6 @@
public static final String DIALECT = "dialect";
- /**
- * {@inheritDoc}
- */
public boolean exportModel(RootModel rootModel, ExportContext ctx) throws ExportException {
Validate.notNull(rootModel);
Validate.notNull(ctx);
@@ -73,16 +70,10 @@
return true;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return "HTML Exporter";
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,9 +54,6 @@
public static final String OUTPUT_FILE = "outputFile";
- /**
- * {@inheritDoc}
- */
public boolean exportModel(RootModel rootModel, ExportContext ctx) throws ExportException {
Validate.notNull(rootModel);
Validate.notNull(ctx);
@@ -98,16 +95,10 @@
return true;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return "SQL Exporter";
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -95,16 +95,10 @@
private Dialect dialect;
- /**
- * {@inheritDoc}
- */
public String getName() {
return "Database Importer";
}
- /**
- * {@inheritDoc}
- */
public boolean importModel(RootModel rootModel, ImportContext ctx) throws ImportException {
Validate.notNull(rootModel);
Validate.notNull(ctx);
@@ -149,9 +143,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
@@ -160,7 +151,9 @@
/**
* {@link RootModel}にEntityをインポートする、{@link ResultSet}に対するビジター。
- * {@link DatabaseReader}に対するストラテジとも言える。
+ *
+ * <p>{@link DatabaseReader}に対するストラテジとも言える。</p>
+ *
* @author daisuke
*/
class EntityImportVisitor extends AbstractResultSetVisitor<Void, RuntimeException> {
@@ -188,6 +181,7 @@
/**
* インスタンスを生成する。
+ *
* @param meta DBメタデータ
* @param rootModel 書き込み先モデル
* @param ctx インポートに関するコンテキスト情報
@@ -207,9 +201,6 @@
selectedEntities = selectedEntitiesValue == null ? null : Arrays.asList(selectedEntitiesValue);
}
- /**
- * {@inheritDoc}
- */
public Void visit(ResultSet entity) throws SQLException {
if ((entityTypes.contains(entity.getString("TABLE_TYPE")))
&& (selectedEntities == null || selectedEntities.contains(entity.getString("TABLE_NAME")))) {
@@ -226,6 +217,7 @@
/**
* {@link RootModel}にRelationをインポートする、{@link ResultSet}に対するビジター。
+ *
* {@link DatabaseReader}に対するストラテジとも言える。
* @author daisuke
*/
@@ -240,6 +232,7 @@
/**
* インスタンスを生成する。
+ *
* @param meta DBメタデータ
* @param rootModel 書き込み先モデル
* @param ctx
@@ -248,9 +241,6 @@
this.rootModel = rootModel;
}
- /**
- * {@inheritDoc}
- */
public Void visit(ResultSet keys) throws SQLException {
String fkName = keys.getString("FK_NAME");
String fkTableName = keys.getString("FKTABLE_NAME");
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReader.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReader.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReader.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -36,10 +36,10 @@
/**
* データベースを読み込む。
*
- * model, dialect, reader, database の関係を人間のメタファで説明しようとすると、
+ * <p>model, dialect, reader, database の関係を人間のメタファで説明しようとすると、
* 方言というのは、リソース(読み出し対象)の性質である為、読み手が知っていれば読めるもの。
* 方言を知っている読み手に対して、リソースを与えると、方言に応じて様々な情報を読み取る。
- * readerはこの「読み手」であり、databaseは「リソース」、modelは「様々な情報」である。
+ * readerはこの「読み手」であり、databaseは「リソース」、modelは「様々な情報」である。</p>
*
* @author daisuke
*/
@@ -58,6 +58,7 @@
/**
* インスタンスを生成する。
+ *
* @param dialect SQL方言
* @param ctx コンテキスト情報
* @param meta DBメタデータ
@@ -73,6 +74,7 @@
/**
* DB接続からエンティティを読み込む。
+ *
* @param <T> 読み込んだ結果、戻り値型
* @param visitor 各エンティティに情報に対するビジター。
* @return ビジターに依存した、実行結果
@@ -95,6 +97,7 @@
/**
* DB接続からリレーションを読み込む。
+ *
* @param <T> 読み込んだ結果、戻り値型
* @param visitor 各エンティティに情報に対するビジター。
* @return ビジターに依存した、実行結果
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReadingContext.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReadingContext.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseReadingContext.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* データベースからモデルにインポートを行う際のコンテキスト情報。
+ *
* @author daisuke
*/
class DatabaseReadingContext extends AbstractContext {
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,6 +23,7 @@
/**
* インポートに関するコンテキスト情報。
+ *
* @author daisuke
*/
public class ImportContextImpl extends AbstractContext implements ImportContext {
Modified: artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -60,6 +60,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -70,6 +71,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
@@ -79,6 +81,7 @@
/**
* モデルからSQLファイルがエクスポートできることを確認する。
+ *
* @throws Exception
*/
@Test
Modified: artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -91,6 +91,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -105,6 +106,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
@@ -116,6 +118,7 @@
/**
* DBからのインポートテスト。
+ *
* @throws Exception
*/
@Test
@@ -192,6 +195,7 @@
/**
* インポートコンテキスト情報を生成する。
+ *
* @return インポートコンテキスト情報
* @throws MalformedURLException
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/javanet/staxutils/IndentingXMLEventWriter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/javanet/staxutils/IndentingXMLEventWriter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/javanet/staxutils/IndentingXMLEventWriter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -183,9 +183,6 @@
}
}
- /**
- * {@inheritDoc}
- */
public void add(XMLEvent event) throws XMLStreamException {
switch (event.getEventType()) {
case XMLStreamConstants.CHARACTERS:
@@ -259,9 +256,6 @@
prevEventType = event.getEventType();
}
- /**
- * {@inheritDoc}
- */
public void add(XMLEventReader reader) throws XMLStreamException {
// we can't just delegate to the core
// because we need to do indentation.
@@ -273,16 +267,10 @@
}
}
- /**
- * {@inheritDoc}
- */
public void close() throws XMLStreamException {
core.close();
}
- /**
- * {@inheritDoc}
- */
public void flush() throws XMLStreamException {
core.flush();
}
@@ -295,9 +283,6 @@
return indent;
}
- /**
- * {@inheritDoc}
- */
public NamespaceContext getNamespaceContext() {
return core.getNamespaceContext();
}
@@ -310,16 +295,10 @@
return newLine;
}
- /**
- * {@inheritDoc}
- */
public String getPrefix(String uri) throws XMLStreamException {
return core.getPrefix(uri);
}
- /**
- * {@inheritDoc}
- */
public void setDefaultNamespace(String uri) throws XMLStreamException {
core.setDefaultNamespace(uri);
}
@@ -340,9 +319,6 @@
this.indent = indent;
}
- /**
- * {@inheritDoc}
- */
public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
core.setNamespaceContext(context);
}
@@ -363,9 +339,6 @@
this.newLine = newLine;
}
- /**
- * {@inheritDoc}
- */
public void setPrefix(String prefix, String uri) throws XMLStreamException {
core.setPrefix(prefix, uri);
}
@@ -387,95 +360,56 @@
*/
private abstract static class CharactersImpl implements Characters {
- /**
- * {@inheritDoc}
- */
public Characters asCharacters() {
return this;
}
- /**
- * {@inheritDoc}
- */
public EndElement asEndElement() {
return null;
}
- /**
- * {@inheritDoc}
- */
public StartElement asStartElement() {
return null;
}
- /**
- * {@inheritDoc}
- */
public int getEventType() {
// it's not clear if we are supposed to return SPACES
return XMLStreamConstants.CHARACTERS;
}
- /**
- * {@inheritDoc}
- */
public Location getLocation() {
// spec isn't clear if we can return null, but it doesn't say we can't.
return null;
}
- /**
- * {@inheritDoc}
- */
public QName getSchemaType() {
return null;
}
- /**
- * {@inheritDoc}
- */
public boolean isAttribute() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isCData() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isCharacters() {
return true;
}
- /**
- * {@inheritDoc}
- */
public boolean isEndDocument() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isEndElement() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isEntityReference() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isIgnorableWhiteSpace() {
// this is hard call. On one hand, we want the indentation to
// get through whatever pipeline, so we are tempted to return false.
@@ -486,44 +420,26 @@
return true;
}
- /**
- * {@inheritDoc}
- */
public boolean isNamespace() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isProcessingInstruction() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isStartDocument() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isStartElement() {
return false;
}
- /**
- * {@inheritDoc}
- */
public boolean isWhiteSpace() {
return true;
}
- /**
- * {@inheritDoc}
- */
public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException {
try {
// technically we need to do escaping, for we allow
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -100,17 +100,11 @@
assert enhancedFactoryClass != null;
}
- /**
- * {@inheritDoc}
- */
public EventBroker getEventBroker() {
assert eventBroker != null;
return eventBroker;
}
- /**
- * {@inheritDoc}
- */
public JiemamyFactory getFactory(Jiemamy jiemamy) {
Validate.notNull(jiemamy);
JiemamyFactory factory = factoryCache.get(jiemamy);
@@ -129,24 +123,15 @@
return factory;
}
- /**
- * {@inheritDoc}
- */
public ReferenceResolver getReferenceResolver() {
assert resolver != null;
return resolver;
}
- /**
- * {@inheritDoc}
- */
public JiemamySerializer getSerializer(Jiemamy jiemamy) {
return getFactory(jiemamy).getSerializer();
}
- /**
- * {@inheritDoc}
- */
public Set<OptionalSpec> getSupportedSpecs() {
Set<OptionalSpec> supportedSpecs = CollectionsUtil.newHashSet();
for (ArtemisExtender enhance : extensions) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisExtender.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisExtender.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisExtender.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,12 +31,14 @@
/**
* この拡張による{@link JiemamyFactory}への{@link Enhance}のリストを取得する。
+ *
* @return この拡張による{@link JiemamyFactory}への{@link Enhance}のリスト
*/
List<Enhance> getEnhances();
/**
* この拡張が実装する「追加仕様」の{@link Set}を取得する。
+ *
* @return この拡張が実装する「追加仕様」の{@link Set}
*/
Set<? extends OptionalSpec> getSpecs();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisJiemamyFactory.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisJiemamyFactory.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ArtemisJiemamyFactory.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -45,6 +45,7 @@
/**
* {@link JiemamyFactory}のArtemis用実装。
+ *
* @author daisuke
*/
public class ArtemisJiemamyFactory implements JiemamyFactory {
@@ -59,17 +60,11 @@
private RootModel rootModel;
- /**
- * {@inheritDoc}
- */
public JiemamyImplementation getImplementation() {
checkInitialized();
return implementation;
}
- /**
- * {@inheritDoc}
- */
public synchronized RootModel getRootModel() {
if (hasRootModel() == false) {
rootModel = newRootModel();
@@ -77,9 +72,6 @@
return rootModel;
}
- /**
- * {@inheritDoc}
- */
public synchronized RootModel getRootModel(UUID id) {
if (hasRootModel()) {
if (getRootModel().getId().equals(id) == false) {
@@ -92,9 +84,6 @@
return rootModel;
}
- /**
- * {@inheritDoc}
- */
public JiemamySerializer getSerializer() {
checkInitialized();
return new JiemamyDomSerializer(jiemamy);
@@ -102,6 +91,7 @@
/**
* 追加仕様のサポート状態を取得する。
+ *
* @return サポートされている追加仕様の{@link Set}
*/
public Set<OptionalSpec> getSupportedSpecs() {
@@ -109,16 +99,10 @@
return implementation.getSupportedSpecs();
}
- /**
- * {@inheritDoc}
- */
public synchronized boolean hasRootModel() {
return rootModel != null;
}
- /**
- * {@inheritDoc}
- */
public <M, T extends PrematureBuilder<M>>T newBuilder(Class<T> clazz) {
checkInitialized();
T builder = new FactoryExtension<T>().newInstance(clazz, jiemamy);
@@ -128,9 +112,6 @@
return builder;
}
- /**
- * {@inheritDoc}
- */
public BuiltinDataType newBuiltinDataType(BuiltinDataTypeMold mold) {
BuiltinDataTypeImpl dataType = new BuiltinDataTypeImpl(mold.getCategory(), mold.getTypeName());
dataType.registerAdapter(new SizedDataTypeAdapter());
@@ -140,9 +121,6 @@
return dataType;
}
- /**
- * {@inheritDoc}
- */
public synchronized <T extends JiemamyElement>T newModel(Class<T> clazz) {
checkInitialized();
if (hasRootModel() == true && clazz == RootModel.class) {
@@ -159,9 +137,6 @@
return model;
}
- /**
- * {@inheritDoc}
- */
public synchronized <T extends JiemamyElement>T newModel(Class<T> clazz, UUID id) {
checkInitialized();
if (hasRootModel() == true && clazz == RootModel.class) {
@@ -179,23 +154,14 @@
return model;
}
- /**
- * {@inheritDoc}
- */
public ColumnRef newReference(ColumnModel column) {
return new FactoryExtension<ColumnRef>().newReference(column);
}
- /**
- * {@inheritDoc}
- */
public DomainRef newReference(DomainModel domain) {
return new FactoryExtension<DomainRef>().newReference(domain);
}
- /**
- * {@inheritDoc}
- */
public TableRef newReference(TableModel table) {
return new FactoryExtension<TableRef>().newReference(table);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
import org.jiemamy.editcommand.CommandProcessorImpl;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.utils.CollectionsUtil;
+import org.jiemamy.utils.LogMarker;
/**
* コマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
@@ -53,30 +54,31 @@
public void addListener(CommandListener listener) {
listeners.add(listener);
- logger.info("CommandListener is registered: " + listener.toString());
+ logger.info(LogMarker.LIFECYCLE, "CommandListener is registered: " + listener.toString());
}
public void fireCommandProcess(Command command) {
- logger.info("EventBroker is kicked enter: " + command.toString());
- logger.info("target : " + command.getTarget());
+ logger.info(LogMarker.LIFECYCLE, "EventBroker is kicked enter: " + command.toString());
+ logger.info(LogMarker.LIFECYCLE, "target : " + command.getTarget());
// java.util.ConcurrentModificationExceptionへの対策。
List<CommandListener> ls = new ArrayList<CommandListener>(listeners);
for (CommandListener l : ls) {
if (strategy.needToDispatch(l, command)) {
l.commandExecuted(command);
- logger.debug("Listener is kicked: " + l.toString());
+ logger.debug(LogMarker.LIFECYCLE, "Listener is kicked: " + l.toString());
}
}
- logger.info("EventBroker is kicked exit: " + command.toString());
+ logger.info(LogMarker.LIFECYCLE, "EventBroker is kicked exit: " + command.toString());
}
public void removeListener(CommandListener listener) {
listeners.remove(listener);
- logger.info("CommandListener is unregistered: " + listener.toString());
+ logger.info(LogMarker.LIFECYCLE, "CommandListener is unregistered: " + listener.toString());
}
/**
* TODO for daisuke
+ *
* @param strategy the strategy to set
*/
public void setStrategy(DispatchStrategy strategy) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -195,6 +195,7 @@
/**
* モデルインスタンス生成戦略。
+ *
* @author daisuke
*/
@SuppressWarnings("unchecked")
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -53,6 +53,11 @@
processor = new CommandProcessorImpl(jiemamy.getEventBroker());
}
+ /**
+ * TODO for daisuke
+ *
+ * @param entity
+ */
public void addEntity(EntityModel entity) {
AddEntityToRootCommand command = new AddEntityToRootCommand(getRootModel(), entity);
command.execute(processor, undoStack);
@@ -60,6 +65,7 @@
/**
* TODO for daisuke
+ *
* @return the jiemamy
*/
public Jiemamy getJiemamy() {
@@ -75,6 +81,9 @@
return jiemamy.getFactory().getRootModel();
}
+ /**
+ * TODO for daisuke
+ */
public void redo() {
if (redoStack.isEmpty()) {
return;
@@ -83,6 +92,9 @@
command.execute(processor, undoStack);
}
+ /**
+ * TODO for daisuke
+ */
public void undo() {
if (undoStack.isEmpty()) {
return;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,6 +33,7 @@
import org.jiemamy.model.ElementReference;
import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.utils.LogMarker;
/**
* モデルの参照オブジェクトからモデルの実体を解決するリゾルバ。
@@ -61,7 +62,7 @@
public static boolean isDescendFromElement(JiemamyElement element, UUID uuid) {
boolean traceEnabled = logger.isTraceEnabled();
if (traceEnabled) {
- logger.trace("isDescend() uuid=" + uuid + ", " + element);
+ logger.trace(LogMarker.LIFECYCLE, "isDescendFromElement() uuid=" + uuid + ", " + element);
}
if (element == null) {
return false;
@@ -156,9 +157,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
public void add(JiemamyElement model) {
assert map != null;
Validate.notNull(model);
@@ -166,9 +164,6 @@
map.put(id, model);
}
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
public <T extends JiemamyElement>T resolve(ElementReference<T> reference) {
assert map != null;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/AttributeIterator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/AttributeIterator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/AttributeIterator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* XML属性のイテレータ実装。
+ *
* @author daisuke
*/
class AttributeIterator implements Iterator<Attribute> {
@@ -37,30 +38,22 @@
/**
* インスタンスを生成する。
+ *
* @param map
*/
AttributeIterator(Map<QName, String> map) {
mapIter = map.entrySet().iterator();
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
return mapIter.hasNext();
}
- /**
- * {@inheritDoc}
- */
public Attribute next() {
Entry<QName, String> entry = mapIter.next();
return StaxCommandDestination.EVENT_FACTORY.createAttribute(entry.getKey(), entry.getValue());
}
- /**
- * {@inheritDoc}
- */
public void remove() {
throw new UnsupportedOperationException();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,9 +31,6 @@
private EssentialStack<JiemamyCommand> commandStack = new ArrayEssentialStack<JiemamyCommand>();
- /**
- * {@inheritDoc}
- */
public void begin(OpenCommand command) throws JiemamyCommandException {
if (isOpen()) {
throw new JiemamyCommandException();
@@ -42,9 +39,6 @@
assert isOpen();
}
- /**
- * {@inheritDoc}
- */
public void begin(StartElementCommand command) throws JiemamyCommandException {
if (isOpen() == false) {
throw new JiemamyCommandException();
@@ -53,9 +47,6 @@
assert isOpen();
}
- /**
- * {@inheritDoc}
- */
public void end(CloseCommand command) throws JiemamyCommandException {
if (isOpen() == false) {
throw new JiemamyCommandException();
@@ -68,9 +59,6 @@
assert isOpen() == false;
}
- /**
- * {@inheritDoc}
- */
public StartElementCommand end(EndElementCommand command) throws JiemamyCommandException {
if (isOpen() == false) {
throw new JiemamyCommandException();
@@ -89,16 +77,10 @@
return start;
}
- /**
- * {@inheritDoc}
- */
public boolean isOpen() {
return commandStack.isEmpty() == false;
}
- /**
- * {@inheritDoc}
- */
public DataCommand popData() throws JiemamyCommandException {
if (isOpen() == false) {
throw new JiemamyCommandException();
@@ -117,9 +99,6 @@
return dataCommand;
}
- /**
- * {@inheritDoc}
- */
public void pushData(DataCommand command) throws JiemamyCommandException {
if (isOpen() == false) {
throw new JiemamyCommandException();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,15 +30,13 @@
/**
* インスタンスを生成する。
+ *
* @param data
*/
public DataCommandImpl(String data) {
this.data = data;
}
- /**
- * {@inheritDoc}
- */
public String getData() {
return data;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,15 +44,13 @@
/**
* インスタンスを生成する。
+ *
* @param qName
*/
public EndElementCommandImpl(QName qName) {
this.qName = qName;
}
- /**
- * {@inheritDoc}
- */
public QName getQName() {
return qName;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* RootModelに対して情報出力を行う{@link CommandDestination}実装クラス。
+ *
* @author daisuke
*/
public class ObjectCommandDestination implements CommandDestination {
@@ -41,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
*/
public ObjectCommandDestination(Jiemamy jiemamy) {
@@ -49,6 +51,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
*/
public ObjectCommandDestination(RootModel rootModel) {
@@ -56,9 +59,6 @@
this.rootModel = rootModel;
}
- /**
- * {@inheritDoc}
- */
public void apply(JiemamyCommand command) throws JiemamyCommandException {
if (command instanceof OpenCommand) {
OpenCommand openCommand = (OpenCommand) command;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -84,16 +84,10 @@
this.attributes = attributes;
}
- /**
- * {@inheritDoc}
- */
public Map<QName, String> getAttributes() {
return attributes;
}
- /**
- * {@inheritDoc}
- */
public QName getQName() {
return qName;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* StAXによりXMLとして情報出力を行う{@link CommandDestination}実装クラス。
+ *
* @author daisuke
*/
public class StaxCommandDestination implements CommandDestination {
@@ -44,6 +45,7 @@
/**
* インスタンスを生成する。
+ *
* @param xmlWriter
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -52,9 +54,6 @@
this.xmlWriter = xmlWriter;
}
- /**
- * {@inheritDoc}
- */
public void apply(JiemamyCommand command) throws JiemamyCommandException {
if (command instanceof OpenCommand) {
try {
@@ -99,6 +98,7 @@
/**
* 出力用StAX {@link XMLEventWriter}を取得する。
+ *
* @return 出力用StAX {@link XMLEventWriter}
*/
public XMLEventWriter getXmlWriter() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,6 +35,7 @@
/**
* コマンドを生成するファクトリクラス。
+ *
* @author daisuke
*/
public final class StaxCommandSource implements CommandSource {
@@ -46,15 +47,13 @@
/**
* インスタンスを生成する。
+ *
* @param xmlEvent
*/
public StaxCommandSource(XMLEvent xmlEvent) {
this.xmlEvent = xmlEvent;
}
- /**
- * {@inheritDoc}
- */
public JiemamyCommand getCommand() {
logger.info("Type: " + StaxUtil.toEventTypeEnum(xmlEvent.getEventType()).toString());
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/AbstractDialect.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,6 +48,7 @@
/**
* SQL方言実装クラスの標準的な実装クラス。
+ *
* @author daisuke
*/
public abstract class AbstractDialect implements Dialect {
@@ -66,9 +67,6 @@
private SqlEmitter emitter = new DefaultSqlEmitter(dataTypeResolver);
- /**
- * {@inheritDoc}
- */
public EntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) throws SQLException {
String type = entity.getString("TABLE_TYPE");
String name = entity.getString("TABLE_NAME");
@@ -84,9 +82,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
public List<SqlStatement> emitStatements(RootModel rootModel, EmitConfig config) {
return emitter.emit(rootModel, config);
}
@@ -105,9 +100,6 @@
return quoter;
}
- /**
- * {@inheritDoc}
- */
public Validator getValidator() {
return new AllValidator();
}
@@ -116,9 +108,6 @@
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return this.getClass().getName();
@@ -126,6 +115,7 @@
/**
* {@link ConnectionAdvisor}を設定する。
+ *
* @param advisor {@link ConnectionAdvisor}
*/
protected void setAdvisor(ConnectionAdvisor advisor) {
@@ -134,6 +124,7 @@
/**
* {@link DataTypeResolver}を設定する。
+ *
* @param dataTypeResolver {@link DataTypeResolver}
*/
protected void setDataTypeResolver(DataTypeResolver dataTypeResolver) {
@@ -142,6 +133,7 @@
/**
* {@link Quoter}を設定する。
+ *
* @param quoter {@link Quoter}
*/
protected void setQuoter(Quoter quoter) {
@@ -170,9 +162,6 @@
columnsResult = meta.getColumns("", null/* FIXME schema */, tableName, "%");
ForEachUtil.accept(columnsResult, new AbstractResultSetVisitor<List<ColumnModel>, RuntimeException>() {
- /**
- * {@inheritDoc}
- */
public List<ColumnModel> visit(ResultSet element) throws SQLException {
int sqlType = element.getInt("DATA_TYPE");
String name = element.getString("COLUMN_NAME");
@@ -206,9 +195,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void init() {
finalResult = CollectionsUtil.newArrayList();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -51,6 +51,7 @@
/**
* インスタンスを生成する。
+ *
* @param category
* @param typeName
* @param adapters
@@ -61,23 +62,14 @@
this.adapters = adapters;
}
- /**
- * {@inheritDoc}
- */
public DataTypeCategory getCategory() {
return category;
}
- /**
- * {@inheritDoc}
- */
public Collection<Class<?>> getSupportedAdapterClasses() {
return Arrays.asList(adapters);
}
- /**
- * {@inheritDoc}
- */
public String getTypeName() {
return typeName;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,20 +22,15 @@
/**
* {@link ConnectionAdvisor}のデフォルト実装。
+ *
* @author daisuke
*/
public class DefaultConnectionAdvisor implements ConnectionAdvisor {
- /**
- * {@inheritDoc}
- */
public void setUpRead(Connection connection) {
// nothing to do
}
- /**
- * {@inheritDoc}
- */
public void tearDownRead(Connection connection) {
// nothing to do
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultDataTypeResolver.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultDataTypeResolver.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultDataTypeResolver.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -45,6 +45,7 @@
/**
* SQL方言において、{@link DataType}と型名(String)間の解決を行うクラス。
+ *
* @author daisuke
*/
public class DefaultDataTypeResolver implements DataTypeResolver {
@@ -61,9 +62,6 @@
DataTypeCategory.VARCHAR, DataTypeCategory.CLOB, DataTypeCategory.VARBIT);
}
- /**
- * {@inheritDoc}
- */
public List<Token> resolveDataType(DataType dataType, ReferenceResolver resolver) {
List<Token> tokens = CollectionsUtil.newArrayList();
BuiltinDataType builtinDataType = DataTypeUtil.toBuiltinDataType(dataType, resolver);
@@ -108,9 +106,6 @@
return tokens;
}
- /**
- * {@inheritDoc}
- */
public BuiltinDataType resolveDataType(JiemamyFactory factory, int sqlType, String typeName) {
Validate.notNull(factory);
@@ -126,9 +121,6 @@
return factory.newBuiltinDataType(mold);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultQuoter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultQuoter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,13 +22,11 @@
/**
* {@link Quoter}のデフォルト実装。
+ *
* @author daisuke
*/
public class DefaultQuoter implements Quoter {
- /**
- * {@inheritDoc}
- */
public String quote(String input, QuoteKind kind) {
Validate.notNull(input);
if (kind == QuoteKind.DATA) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -76,9 +76,6 @@
this.dataTypeResolver = dataTypeResolver;
}
- /**
- * {@inheritDoc}
- */
public List<SqlStatement> emit(RootModel rootModel, EmitConfig config) {
List<SqlStatement> result = CollectionsUtil.newArrayList();
referenceResolver = rootModel.getJiemamy().getReferenceResolver();
@@ -145,6 +142,7 @@
* @author daisuke
*/
private enum AttributeEmitStrategy {
+
/** カラムの出力戦略 */
COLUMN(ColumnModel.class) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -82,62 +82,38 @@
}
- /**
- * {@inheritDoc}
- */
public EntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public List<SqlStatement> emitStatements(RootModel rootModel, EmitConfig config) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public ConnectionAdvisor getAdvisor() {
assert advisor != null;
return advisor;
}
- /**
- * {@inheritDoc}
- */
public List<BuiltinDataTypeMold> getAllDataTypes() {
// FIXME 適当
return allDataTypes;
}
- /**
- * {@inheritDoc}
- */
public DataTypeResolver getDataTypeResolver() {
assert dataTypeResolver != null;
return dataTypeResolver;
}
- /**
- * {@inheritDoc}
- */
public Quoter getQuoter() {
assert quoter != null;
return quoter;
}
- /**
- * {@inheritDoc}
- */
public Validator getValidator() {
return new AllValidator();
}
- /**
- * {@inheritDoc}
- */
public RootModel parseStatements(List<SqlStatement> statements) {
throw new UnsupportedOperationException();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -1081,9 +1081,6 @@
};
- /**
- * {@inheritDoc}
- */
public boolean isReserved(String name) {
return ArrayUtils.contains(RESERVED_WORDS, name);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,13 +22,13 @@
/**
* 一般Dialectに対する識別子バリデータ。
+ *
* @author daisuke
*/
public class GenericValidator extends AbstractIdentifierValidator {
/**
* インスタンスを生成する。
- *
*/
public GenericValidator() {
super("^[A-Z][0-9A-Z]+$", new GenericReservedWords());
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* 予約語プロバイダ。
+ *
* @author daisuke
*/
public interface ReservedWordsProvider {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -57,6 +57,7 @@
/**
* コマンドを実行するクラス。
+ *
* <p>全部のprocessメソッドにて{@link EventBrokerImpl#fireCommandProcess(Command)}を実行する。
* ここでイベントブローカーへの発火を行うのが本当に正しいかはワカラナイ！</p>
*
@@ -71,6 +72,7 @@
/**
* インスタンスを生成する。
+ *
* @param eventBroker
*/
public CommandProcessorImpl(EventBroker eventBroker) {
@@ -163,9 +165,6 @@
eventBroker.fireCommandProcess(newPrimaryKeyCommand);
}
- /**
- * {@inheritDoc}
- */
public void process(Command command) {
// 実行時に無理矢理ディスパッチする…。
Method method;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -52,8 +52,6 @@
this.element = element;
}
- abstract AbstractDeleteFromRootCommand<T> createDeleteFromRootCommand(RootModel root, T element);
-
public Command execute(CommandProcessor processor) {
processor.process(this);
return createDeleteFromRootCommand(root, element);
@@ -61,6 +59,7 @@
/**
* return the element.
+ *
* @return the element
*/
public T getElement() {
@@ -69,6 +68,7 @@
/**
* retuen the root.
+ *
* @return the root
*/
public RootModel getRoot() {
@@ -83,4 +83,6 @@
* @return {@link RootModel}が保持する、{@link JiemamyElement}のリスト
*/
public abstract Collection<? super T> getTargetList();
+
+ abstract AbstractDeleteFromRootCommand<T> createDeleteFromRootCommand(RootModel root, T element);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -52,8 +52,6 @@
this.element = element;
}
- abstract AbstractAddToRootCommand<T> createAddToRootCommand(RootModel root, T element);
-
public Command execute(CommandProcessor processor) {
processor.process(this);
return createAddToRootCommand(root, element);
@@ -61,6 +59,7 @@
/**
* return the element.
+ *
* @return the element
*/
public T getElement() {
@@ -69,6 +68,7 @@
/**
* retuen the root.
+ *
* @return the root
*/
public RootModel getRoot() {
@@ -83,4 +83,6 @@
* @return {@link RootModel}が保持する、{@link JiemamyElement}のリスト
*/
public abstract Collection<? super T> getTargetList();
+
+ abstract AbstractAddToRootCommand<T> createAddToRootCommand(RootModel root, T element);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,6 @@
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new DeleteColumnCommand(table, column);
@@ -58,6 +55,7 @@
/**
* column
+ *
* @return column
*/
public ColumnModel getColumn() {
@@ -71,9 +69,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -73,9 +73,6 @@
this.index = index;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new DeleteColumnFromColumnRefListCommand(target, columnRefList, column, index);
@@ -83,6 +80,7 @@
/**
* column
+ *
* @return column
*/
public ColumnModel getColumn() {
@@ -91,6 +89,7 @@
/**
* columnRefList
+ *
* @return columnRefList
*/
public List<ColumnRef> getColumnRefList() {
@@ -99,6 +98,7 @@
/**
* index
+ *
* @return index
*/
public int getIndex() {
@@ -107,6 +107,7 @@
/**
* target
+ *
* @return target
*/
public JiemamyElement getTarget() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -41,17 +41,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super DataSetModel> getTargetList() {
return getRoot().getDataSets();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractDeleteFromRootCommand<DataSetModel> createDeleteFromRootCommand(RootModel root, DataSetModel element) {
return new DeleteDataSetFromRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -41,17 +41,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super DomainModel> getTargetList() {
return getRoot().getDomains();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractDeleteFromRootCommand<DomainModel> createDeleteFromRootCommand(RootModel root, DomainModel element) {
return new DeleteDomainFromRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -42,17 +42,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super EntityModel> getTargetList() {
return getRoot().getEntities();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractDeleteFromRootCommand<EntityModel> createDeleteFromRootCommand(RootModel root, EntityModel element) {
return new DeleteEntityFromRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* インスタンスを生成する。
+ *
* @param table
* @param fk
*/
@@ -46,9 +47,6 @@
this.fk = fk;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new DeleteForeignKeyCommand(table, fk);
@@ -56,6 +54,7 @@
/**
* fk
+ *
* @return fk
*/
public ForeignKeyModel getFk() {
@@ -69,9 +68,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -47,9 +47,6 @@
this.primaryKey = primaryKey;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new DeletePrimaryKeyCommand(table, primaryKey);
@@ -57,6 +54,7 @@
/**
* primaryKey
+ *
* @return primaryKey
*/
public PrimaryKeyModel getPrimaryKey() {
@@ -70,9 +68,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,6 @@
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new AddColumnCommand(table, column);
@@ -71,9 +68,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -86,9 +86,6 @@
this.index = index;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new AddColumnToColumnRefListCommand(target, columnRefList, column, index);
@@ -96,6 +93,7 @@
/**
* column
+ *
* @return column
*/
public ColumnModel getColumn() {
@@ -104,6 +102,7 @@
/**
* columnRefList
+ *
* @return columnRefList
*/
public List<ColumnRef> getColumnRefList() {
@@ -112,6 +111,7 @@
/**
* index
+ *
* @return index
*/
public int getIndex() {
@@ -120,6 +120,7 @@
/**
* target
+ *
* @return target
*/
public JiemamyElement getTarget() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -41,17 +41,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super DataSetModel> getTargetList() {
return getRoot().getDataSets();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractAddToRootCommand<DataSetModel> createAddToRootCommand(RootModel root, DataSetModel element) {
return new AddDataSetToRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -41,17 +41,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super DomainModel> getTargetList() {
return getRoot().getDomains();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractAddToRootCommand<DomainModel> createAddToRootCommand(RootModel root, DomainModel element) {
return new AddDomainToRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -42,17 +42,11 @@
super(root, element);
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<? super EntityModel> getTargetList() {
return getRoot().getEntities();
}
- /**
- * {@inheritDoc}
- */
@Override
AbstractAddToRootCommand<EntityModel> createAddToRootCommand(RootModel root, EntityModel element) {
return new AddEntityToRootCommand(root, element);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -47,9 +47,6 @@
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new AddForeignKeyCommand(table, fk);
@@ -57,6 +54,7 @@
/**
* fk
+ *
* @return fk
*/
public ForeignKeyModel getFk() {
@@ -70,9 +68,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -47,9 +47,6 @@
this.primaryKey = primaryKey;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
processor.process(this);
return new AddPrimaryKeyCommand(table, primaryKey);
@@ -57,6 +54,7 @@
/**
* primaryKey
+ *
* @return primaryKey
*/
public PrimaryKeyModel getPrimaryKey() {
@@ -70,9 +68,6 @@
return table;
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTarget() {
return getTable();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -57,9 +57,6 @@
this.newValue = newValue;
}
- /**
- * {@inheritDoc}
- */
public Command execute(CommandProcessor processor) {
try {
Object oldValue = BeanUtils.getProperty(target, propertyName);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* {@link Resolvable}な状態のDialectを表すコマンド。
+ *
* @author daisuke
*/
public class DialectCommand implements Resolvable<JiemamyCommand> {
@@ -38,15 +39,13 @@
/**
* インスタンスを生成する。
+ *
* @param dialectId
*/
public DialectCommand(String dialectId) {
this.dialectId = dialectId;
}
- /**
- * {@inheritDoc}
- */
public EssentialQueue<JiemamyCommand> resolve() {
EssentialQueue<JiemamyCommand> queue = new ResolvableQueue<JiemamyCommand>();
queue.enqueue(new StartElementCommandImpl(CoreQName.DIALECT));
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -36,6 +36,7 @@
/**
* {@link Resolvable}な状態の {@link RootModel}を表すコマンド。
+ *
* @author daisuke
*/
public class RootModelCommand implements Resolvable<JiemamyCommand> {
@@ -45,6 +46,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -53,9 +55,6 @@
this.rootModel = rootModel;
}
- /**
- * {@inheritDoc}
- */
public EssentialQueue<JiemamyCommand> resolve() {
Map<QName, String> attributes = new HashMap<QName, String>();
attributes.put(CoreQName.ID.getQName(), rootModel.getId().toString());
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/AbstractProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/AbstractProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/AbstractProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,16 +25,14 @@
/**
* {@link Processor}の骨格実装クラス。
- * @author daisuke
+ *
* @param <T>
* @param <R>
* @param <X>
+ * @author daisuke
*/
public abstract class AbstractProcessor<T, R, X extends Exception> implements Processor<T, R, X> {
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetColumnProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetColumnProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetColumnProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* 指定した名称を持つカラムを取得するプロセッサ。
+ *
* @author daisuke
*/
public class GetColumnProcessor extends AbstractProcessor<TableModel, ColumnModel, RuntimeException> {
@@ -40,6 +41,7 @@
/**
* インスタンスを生成する。
+ *
* @param columnName カラム名
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDataSetProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDataSetProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDataSetProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,6 +28,7 @@
/**
* エンティティに設定されたデータセットを取得する。
+ *
* @author daisuke
*/
public class GetDataSetProcessor extends AbstractProcessor<RootModel, List<RecordModel>, RuntimeException> {
@@ -41,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param index データセットのインデックス番号
* @param entity 対象エンティティ
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -51,9 +53,6 @@
this.entity = entity;
}
- /**
- * {@inheritDoc}
- */
public List<RecordModel> process(RootModel rootModel) {
Validate.notNull(rootModel);
return rootModel.getDataSets().get(index).getRecords().get(entity);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDependentEntitiesProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDependentEntitiesProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetDependentEntitiesProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* 指定したエンティティに依存するエンティティの集合を取得する。
+ *
* @author daisuke
*/
public class GetDependentEntitiesProcessor extends
@@ -49,15 +50,13 @@
/**
* インスタンスを生成する。
+ *
* @param recursive 依存を再帰的に辿るかどうか
*/
public GetDependentEntitiesProcessor(boolean recursive) {
this.recursive = recursive;
}
- /**
- * {@inheritDoc}
- */
public Collection<EntityModel> process(EntityModel standardEntity) {
Validate.notNull(standardEntity);
return recursive ? processRecursive(standardEntity) : processNonRecursive(standardEntity);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetEntityProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetEntityProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetEntityProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* エンティティを取得する。
+ *
* @param <T> エンティティの種類を表すクラス
* @author daisuke
*/
@@ -45,6 +46,7 @@
/**
* インスタンスを生成する。
+ *
* @param <U>
* @param clazz エンティティの種類を表すクラス
* @param entityName エンティティ名
@@ -58,6 +60,7 @@
/**
* インスタンスを生成する。
+ *
* @param entityName エンティティ名
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetMappingProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetMappingProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetMappingProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* 指定した主キーに対するマッピング情報を取得するプロセッサ。
+ *
* @author daisuke
*/
public class GetMappingProcessor extends AbstractProcessor<ForeignKeyModel, ColumnModel, RuntimeException> {
@@ -35,6 +36,7 @@
/**
* インスタンスを生成する。
+ *
* @param referenceColumn
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -43,9 +45,6 @@
this.referenceColumn = referenceColumn;
}
- /**
- * {@inheritDoc}
- */
public ColumnModel process(ForeignKeyModel fkModel) {
int index = fkModel.getReferenceColumns().indexOf(referenceColumn);
ReferenceResolver resolver = referenceColumn.getJiemamy().getReferenceResolver();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetNodesProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetNodesProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetNodesProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* 特定の種類のノードを取得する。
+ *
* @param <T> ノードの種類を表すクラス
* @author daisuke
*/
@@ -35,6 +36,7 @@
/**
* インスタンスを生成する。
+ *
* @param clazz ノードの種類を表すクラス
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -43,9 +45,6 @@
this.clazz = clazz;
}
- /**
- * {@inheritDoc}
- */
public List<T> process(RootModel rootModel) {
Validate.notNull(rootModel);
List<T> nodes = CollectionsUtil.newArrayList();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetReferenceEntitiesProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetReferenceEntitiesProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/GetReferenceEntitiesProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,6 +32,7 @@
/**
* 指定したエンティティが依存するエンティティの集合を取得する。
+ *
* @author daisuke
*/
public class GetReferenceEntitiesProcessor extends
@@ -43,15 +44,13 @@
/**
* インスタンスを生成する。
+ *
* @param recursive 依存先を再帰的に辿るかどうか
*/
public GetReferenceEntitiesProcessor(boolean recursive) {
this.recursive = recursive;
}
- /**
- * {@inheritDoc}
- */
public Collection<EntityModel> process(EntityModel entity) {
Validate.notNull(entity);
return recursive ? processRecursive(entity) : processNonRecursive(entity);
@@ -59,6 +58,7 @@
/**
* 参照先親モデルを返す。
+ *
* @param entity 対象エンティティ
* @return 親モデルのSet
*/
@@ -80,6 +80,7 @@
/**
* 全ての参照先 祖先モデルを返す。
+ *
* @param entity 対象エンティティ
* @return 祖先モデルのSet
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideAttributeNameProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideAttributeNameProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideAttributeNameProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,6 +33,7 @@
/**
* 適切な初期外部キー名称を生成する。
+ *
* @author daisuke
*/
public class ProvideAttributeNameProcessor extends AbstractProcessor<RootModel, String, RuntimeException> {
@@ -43,6 +44,7 @@
/**
* インスタンスを生成する。
+ *
* @param attributeModel
* @throws IllegalArgumentException foreignKeyModelとして{@code null}を与えた場合
*/
@@ -51,9 +53,6 @@
this.attributeModel = attributeModel;
}
- /**
- * {@inheritDoc}
- */
public String process(RootModel rootModel) {
Validate.notNull(rootModel);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* 適切な初期エンティティ名称を生成する。
+ *
* @author daisuke
*/
public class ProvideEntityNameProcessor extends AbstractProcessor<RootModel, String, RuntimeException> {
@@ -41,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param entityModel
* @throws IllegalArgumentException 引数entityModelに{@code null}を与えた場合
*/
@@ -49,9 +51,6 @@
this.entityModel = entityModel;
}
- /**
- * {@inheritDoc}
- */
public String process(RootModel rootModel) {
Validate.notNull(rootModel);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/SetRecordProcessor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/SetRecordProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/processor/SetRecordProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* カラムに対して値を設定する。
+ *
* @author daisuke
*/
class SetRecordProcessor extends AbstractProcessor<RecordModel, Void, RuntimeException> {
@@ -38,6 +39,7 @@
/**
* インスタンスを生成する。
+ *
* @param column カラム
* @param value 値
* @throws IllegalArgumentException 引数columnに{@code null}を与えた場合
@@ -48,9 +50,6 @@
this.value = value;
}
- /**
- * {@inheritDoc}
- */
public Void process(RecordModel recordModel) {
Validate.notNull(recordModel);
recordModel.getValues().put(column, value);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -79,6 +79,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -88,25 +89,16 @@
reset();
}
- /**
- * {@inheritDoc}
- */
public void close() {
checkClosed();
closed = true;
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
checkClosed();
return queue.isEmpty() == false;
}
- /**
- * {@inheritDoc}
- */
public JiemamyCommand nextCommand() {
checkClosed();
checkNext();
@@ -116,6 +108,7 @@
/**
* ストリームをリセットして、最初から読み出せるようにする。
+ *
* @throws UnsupportedOperationException
* @throws IllegalStateException Writerが既にcloseされていた場合
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* {@link JiemamyCommand}の内容を{@link RootModel}に書き出す為の、Command stream実装クラス。
+ *
* @author daisuke
*/
public class JiemamyCommandOutputStreamImpl implements JiemamyCommandOutputStream {
@@ -38,15 +39,13 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
*/
public JiemamyCommandOutputStreamImpl(Jiemamy jiemamy) {
dest = new ObjectCommandDestination(jiemamy);
}
- /**
- * {@inheritDoc}
- */
public void close() {
checkClosed();
closed = true;
@@ -67,9 +66,6 @@
return dest.getRootModel();
}
- /**
- * {@inheritDoc}
- */
public void write(JiemamyCommand command) throws JiemamyCommandException {
checkClosed();
dest.apply(command);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,6 +32,7 @@
/**
* {@link XMLEventReader}を{@link JiemamyCommandInputStream}として扱うアダプタ。
+ *
* @author daisuke
*/
public class XmlEventReaderAdapter implements JiemamyCommandInputStream {
@@ -50,9 +51,6 @@
this.xmlEventReader = xmlEventReader;
}
- /**
- * {@inheritDoc}
- */
public void close() throws JiemamyCommandException {
try {
xmlEventReader.close();
@@ -61,16 +59,10 @@
}
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
return xmlEventReader.hasNext();
}
- /**
- * {@inheritDoc}
- */
public JiemamyCommand nextCommand() throws JiemamyCommandException {
try {
XMLEvent xmlEvent = xmlEventReader.nextEvent();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,6 @@
dest = new StaxCommandDestination(eventWriter);
}
- /**
- * {@inheritDoc}
- */
public void close() throws JiemamyCommandException {
try {
dest.getXmlWriter().close();
@@ -59,9 +56,6 @@
}
}
- /**
- * {@inheritDoc}
- */
public void write(JiemamyCommand command) throws JiemamyCommandException {
Validate.notNull(command);
dest.apply(command);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/AbstractJiemamyElement.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/AbstractJiemamyElement.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/AbstractJiemamyElement.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -53,24 +53,15 @@
this.id = id;
}
- /**
- * {@inheritDoc}
- */
public UUID getId() {
return id;
}
- /**
- * {@inheritDoc}
- */
public Jiemamy getJiemamy() {
assert jiemamy != null;
return jiemamy;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
ReflectionToStringBuilder toStringBuilder =
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/ElementReferenceImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/ElementReferenceImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/ElementReferenceImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -67,9 +67,6 @@
return referenceId;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
ReflectionToStringBuilder toStringBuilder =
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/RootModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/RootModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/RootModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -82,9 +82,6 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
@Override
public RootModel clone() {
try {
@@ -94,74 +91,48 @@
}
}
- /**
- * {@inheritDoc}
- */
public String getBeginScript() {
return beginScript;
}
- /**
- * {@inheritDoc}
- */
public List<DataSetModel> getDataSets() {
assert dataSets != null;
return dataSets;
}
- /**
- * {@inheritDoc}
- */
public String getDescription() {
return description;
}
- /**
- * {@inheritDoc}
- */
public String getDialectClassName() {
return dialectClassName;
}
- /**
- * {@inheritDoc}
- */
public List<DomainModel> getDomains() {
assert domains != null;
return domains;
}
- /**
- * {@inheritDoc}
- */
public String getEndScript() {
return endScript;
}
- /**
- * {@inheritDoc}
- */
public SortedSet<EntityModel> getEntities() {
assert entities != null;
return entities;
}
- /**
- * {@inheritDoc}
- */
public String getSchemaName() {
return schemaName;
}
- /**
- * {@inheritDoc}
- */
public void setBeginScript(String beginScript) {
this.beginScript = beginScript;
}
/**
* INSERTデータセットを設定する。
+ *
* @param insertDataSets INSERTデータセット
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -171,16 +142,10 @@
dataSets = insertDataSets;
}
- /**
- * {@inheritDoc}
- */
public void setDescription(String description) {
this.description = description;
}
- /**
- * {@inheritDoc}
- */
public void setDialectClassName(String dialectClassName) {
Validate.notNull(dialectClassName);
this.dialectClassName = dialectClassName;
@@ -188,6 +153,7 @@
/**
* ドメインのリストを設定する。
+ *
* @param domains ドメインのリスト
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -197,15 +163,13 @@
this.domains = domains;
}
- /**
- * {@inheritDoc}
- */
public void setEndScript(String endScript) {
this.endScript = endScript;
}
/**
* ノードのリストを設定する。
+ *
* @param entities ノードのリスト
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -215,16 +179,10 @@
this.entities = entities;
}
- /**
- * {@inheritDoc}
- */
public void setSchemaName(String schemaName) {
this.schemaName = schemaName;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/AbstractAttributeModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/AbstractAttributeModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/AbstractAttributeModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -50,44 +50,26 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public String getDescription() {
return description;
}
- /**
- * {@inheritDoc}
- */
public String getLogicalName() {
return logicalName;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
public void setDescription(String description) {
this.description = description;
}
- /**
- * {@inheritDoc}
- */
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
- /**
- * {@inheritDoc}
- */
public void setName(String name) {
this.name = name;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,6 +54,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id モデルID
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -62,93 +63,54 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public ColumnCheckModel getCheck() {
return check;
}
- /**
- * {@inheritDoc}
- */
public synchronized DataType getDataType() {
return dataType;
}
- /**
- * {@inheritDoc}
- */
public String getDefaultValue() {
return defaultValue;
}
- /**
- * {@inheritDoc}
- */
public NotNullConstraintModel getNotNull() {
return notNull;
}
- /**
- * {@inheritDoc}
- */
public PrimaryKeyModel getPrimaryKey() {
return primaryKey;
}
- /**
- * {@inheritDoc}
- */
public UniqueKeyModel getUniqueKey() {
return uniqueKey;
}
- /**
- * {@inheritDoc}
- */
public void setCheck(ColumnCheckModel check) {
this.check = check;
}
- /**
- * {@inheritDoc}
- */
public synchronized void setDataType(DataType dataType) {
this.dataType = dataType;
}
- /**
- * {@inheritDoc}
- */
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
- /**
- * {@inheritDoc}
- */
public void setNotNull(NotNullConstraintModel notNull) {
this.notNull = notNull;
}
- /**
- * {@inheritDoc}
- */
public void setPrimaryKey(PrimaryKeyModel primaryKey) {
this.primaryKey = primaryKey;
}
- /**
- * {@inheritDoc}
- */
public void setUniqueKey(UniqueKeyModel uniqueKey) {
this.uniqueKey = uniqueKey;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/RepresentationAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/RepresentationAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/RepresentationAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -84,9 +84,6 @@
this.representation = representation;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ClassUtils.getShortClassName(this, "null") + "[" + representation + "]";
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractConstraintModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,6 +32,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractKeyConstraintModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractKeyConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractKeyConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,29 +48,21 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public Deferrability getDeferrability() {
return deferrability;
}
- /**
- * {@inheritDoc}
- */
public List<ColumnRef> getKeyColumns() {
return keyColumns;
}
- /**
- * {@inheritDoc}
- */
public void setDeferrability(Deferrability deferrability) {
this.deferrability = deferrability;
}
/**
* キー制約を構成するカラムのリストを設定する。
+ *
* @param keyColumns キー制約を構成するカラムのリスト
*/
public void setKeyColumns(List<ColumnRef> keyColumns) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractValueConstraintModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractValueConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/AbstractValueConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,6 +35,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -43,23 +44,14 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public String getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
public void setExpression(String expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return super.toString() + "[" + expression + "]";
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -56,9 +56,6 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public InitiallyCheckTime getInitiallyCheckTime() {
if (isDeferrable() == false) {
return null;
@@ -66,23 +63,14 @@
return initiallyCheckTime;
}
- /**
- * {@inheritDoc}
- */
public boolean isDeferrable() {
return deferrable;
}
- /**
- * {@inheritDoc}
- */
public void setDeferrable(boolean deferrable) {
this.deferrable = deferrable;
}
- /**
- * {@inheritDoc}
- */
public void setInitiallyCheckTime(InitiallyCheckTime initiallyCheckTime) {
this.initiallyCheckTime = initiallyCheckTime;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -50,6 +50,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id モデルID
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -58,57 +59,37 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public MatchType getMatchType() {
return matchType;
}
- /**
- * {@inheritDoc}
- */
public ReferentialAction getOnDelete() {
return onDelete;
}
- /**
- * {@inheritDoc}
- */
public ReferentialAction getOnUpdate() {
return onUpdate;
}
- /**
- * {@inheritDoc}
- */
public List<ColumnRef> getReferenceColumns() {
return referenceColumns;
}
- /**
- * {@inheritDoc}
- */
public void setMatchType(MatchType matchType) {
this.matchType = matchType;
}
- /**
- * {@inheritDoc}
- */
public void setOnDelete(ReferentialAction onDelete) {
this.onDelete = onDelete;
}
- /**
- * {@inheritDoc}
- */
public void setOnUpdate(ReferentialAction onUpdate) {
this.onUpdate = onUpdate;
}
/**
* 参照カラムのリストを設定する。
+ *
* @param referenceColumns 参照カラムのリスト
*/
public void setReferenceColumns(List<ColumnRef> referenceColumns) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,12 +24,14 @@
/**
* PRIMARY KEY制約モデル。
+ *
* @author daisuke
*/
public class PrimaryKeyModelImpl extends AbstractKeyConstraintModel implements PrimaryKeyModel {
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,6 +35,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -43,23 +44,14 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public String getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
public void setExpression(String expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return super.toString() + "[" + expression + "]";
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/UniqueKeyModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/UniqueKeyModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/UniqueKeyModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,12 +24,14 @@
/**
* UNIQUE制約モデル。
+ *
* @author daisuke
*/
public class UniqueKeyModelImpl extends AbstractKeyConstraintModel implements UniqueKeyModel {
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/DataSetModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/DataSetModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/DataSetModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* INSERT文用データセット。
+ *
* @author daisuke
*/
public class DataSetModelImpl extends AbstractJiemamyElement implements DataSetModel {
@@ -44,6 +45,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -54,6 +56,7 @@
/**
* データセット名を取得する。
+ *
* @return データセット名
*/
public String getName() {
@@ -62,6 +65,7 @@
/**
* レコード情報を取得する。
+ *
* @return レコード情報
*/
public Map<TableRef, List<RecordModel>> getRecords() {
@@ -70,6 +74,7 @@
/**
* データセット名を設定する。
+ *
* @param name データセット名
*/
public void setName(String name) {
@@ -78,15 +83,13 @@
/**
* レコード情報を設定する。
+ *
* @param records レコード情報
*/
public void setRecords(Map<TableRef, List<RecordModel>> records) {
this.records = records;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/RecordModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/RecordModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/dataset/RecordModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* レコード（INSERT文1つ分）モデル。
+ *
* @author daisuke
*/
public class RecordModelImpl extends AbstractJiemamyElement implements RecordModel {
@@ -51,6 +52,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id モデルID
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -61,6 +63,7 @@
/**
* カラムに対応するデータを取得する。
+ *
* @return カラムに対応するデータ
*/
public Map<ColumnRef, String> getValues() {
@@ -70,15 +73,13 @@
/**
* カラムに対応するデータを設定する。
+ *
* @param values カラムに対応するデータ
*/
public void setValues(Map<ColumnRef, String> values) {
this.values = values;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataTypeImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataTypeImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataTypeImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* {@link BuiltinDataType}の実装クラス。
+ *
* @author daisuke
*/
public class BuiltinDataTypeImpl extends AbstractAdaptable implements BuiltinDataType {
@@ -46,16 +47,10 @@
this.typeName = typeName;
}
- /**
- * {@inheritDoc}
- */
public DataTypeCategory getCategory() {
return category;
}
- /**
- * {@inheritDoc}
- */
public String getTypeName() {
if (typeName == null) {
return category.toString();
@@ -63,24 +58,15 @@
return typeName;
}
- /**
- * {@inheritDoc}
- */
public void setCategory(DataTypeCategory category) {
Validate.notNull(category);
this.category = category;
}
- /**
- * {@inheritDoc}
- */
public void setTypeName(String typeName) {
this.typeName = typeName;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
ReflectionToStringBuilder toStringBuilder =
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,6 +54,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id モデルID
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -63,9 +64,6 @@
Validate.notNull(id);
}
- /**
- * {@inheritDoc}
- */
@Override
public <T>T getAdapter(Class<T> adapterClass) {
if (dataType == null) {
@@ -74,9 +72,6 @@
return dataType.getAdapter(adapterClass);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<Object> getAdapters() {
if (dataType == null) {
@@ -85,51 +80,30 @@
return dataType.getAdapters();
}
- /**
- * {@inheritDoc}
- */
public ColumnCheckModel getCheck() {
return check;
}
- /**
- * {@inheritDoc}
- */
public BuiltinDataType getDataType() {
return dataType;
}
- /**
- * {@inheritDoc}
- */
public String getDescription() {
return description;
}
- /**
- * {@inheritDoc}
- */
public String getLogicalName() {
return logicalName;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
public NotNullConstraintModel getNotNull() {
return notNull;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasAdapter(Class<?> adapterClass) {
if (dataType == null) {
@@ -138,9 +112,6 @@
return dataType.hasAdapter(adapterClass);
}
- /**
- * {@inheritDoc}
- */
@Override
public void registerAdapter(Object adapter) {
if (dataType == null) {
@@ -149,44 +120,26 @@
dataType.registerAdapter(adapter);
}
- /**
- * {@inheritDoc}
- */
public void setCheck(ColumnCheckModel check) {
this.check = check;
}
- /**
- * {@inheritDoc}
- */
public void setDataType(BuiltinDataType dataType) {
this.dataType = dataType;
}
- /**
- * {@inheritDoc}
- */
public void setDescription(String description) {
this.description = description;
}
- /**
- * {@inheritDoc}
- */
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
- /**
- * {@inheritDoc}
- */
public void setName(String name) {
this.name = name;
}
- /**
- * {@inheritDoc}
- */
public void setNotNull(NotNullConstraintModel notNull) {
this.notNull = notNull;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/PrecisionedDataTypeAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/PrecisionedDataTypeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/PrecisionedDataTypeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* 精度とスケールを持つDataType用のアダプタ。
+ *
* @author daisuke
*/
@Adapter(AdapterType.MODEL)
@@ -38,9 +39,6 @@
private Integer scale;
- /**
- * {@inheritDoc}
- */
public void copy(DataTypeAdapter src) {
Validate.notNull(src);
if (src instanceof PrecisionedDataTypeAdapter) {
@@ -83,6 +81,7 @@
/**
* 精度を取得する。
+ *
* @return 精度
*/
public int getPrecision() {
@@ -91,6 +90,7 @@
/**
* スケールを取得する。
+ *
* @return スケール
*/
public int getScale() {
@@ -108,6 +108,7 @@
/**
* 精度を設定する。
+ *
* @param precision 精度
*/
public void setPrecision(Integer precision) {
@@ -116,15 +117,13 @@
/**
* スケールを設定する。
+ *
* @param scale スケール
*/
public void setScale(Integer scale) {
this.scale = scale;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SerialDataTypeAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SerialDataTypeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SerialDataTypeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* シリアル（通し番号）型であることを表すアダプタ。
+ *
* @author daisuke
*/
@Adapter(AdapterType.MODEL)
@@ -35,9 +36,6 @@
private Boolean serial;
- /**
- * {@inheritDoc}
- */
public void copy(DataTypeAdapter src) {
// nothing to do
}
@@ -74,6 +72,7 @@
/**
* シリアル（通し番号）型であるどうかを取得する。
+ *
* @return シリアル（通し番号）型であれば{@code true}
*/
public boolean isSerial() {
@@ -82,15 +81,13 @@
/**
* シリアル（通し番号）型であるどうかを設定する。
+ *
* @param serial シリアル（通し番号）型であるどうか
*/
public void setSerial(Boolean serial) {
this.serial = serial;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
if (serial != null && serial) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SizedDataTypeAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SizedDataTypeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/SizedDataTypeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,9 +35,6 @@
private Integer size;
- /**
- * {@inheritDoc}
- */
public void copy(DataTypeAdapter src) {
Validate.notNull(src);
if (src instanceof SizedDataTypeAdapter) {
@@ -72,6 +69,7 @@
/**
* サイズを取得する。
+ *
* @return サイズ
*/
public Integer getSize() {
@@ -88,15 +86,13 @@
/**
* サイズを設定する。
+ *
* @param size サイズ
*/
public void setSize(Integer size) {
this.size = size;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/TimezonedDataTypeAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/TimezonedDataTypeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/adapter/TimezonedDataTypeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* タイムゾーン管理の有無を持つDataType用のアダプタ。
+ *
* @author daisuke
*/
@Adapter(AdapterType.MODEL)
@@ -35,9 +36,6 @@
private Boolean withTimezone;
- /**
- * {@inheritDoc}
- */
public void copy(DataTypeAdapter src) {
Validate.notNull(src);
if (src instanceof TimezonedDataTypeAdapter) {
@@ -80,6 +78,7 @@
/**
* タイムゾーンを管理するかどうかを取得する。
+ *
* @return 精度
*/
public Boolean isWithTimezone() {
@@ -88,15 +87,13 @@
/**
* タイムゾーンを管理するかどうかを設定する。
+ *
* @param withTimezone 精度
*/
public void setWithTimezone(Boolean withTimezone) {
this.withTimezone = withTimezone;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/AbstractEntityModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/AbstractEntityModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/AbstractEntityModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,6 +48,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id モデルID
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -56,72 +57,42 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public String getBeginScript() {
return beginScript;
}
- /**
- * {@inheritDoc}
- */
public String getDescription() {
return description;
}
- /**
- * {@inheritDoc}
- */
public String getEndScript() {
return endScript;
}
- /**
- * {@inheritDoc}
- */
public String getLogicalName() {
return logicalName;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
public void setBeginScript(String beginScript) {
this.beginScript = beginScript;
}
- /**
- * {@inheritDoc}
- */
public void setDescription(String description) {
this.description = description;
}
- /**
- * {@inheritDoc}
- */
public void setEndScript(String endScript) {
this.endScript = endScript;
}
- /**
- * {@inheritDoc}
- */
public void setLogicalName(String logicalName) {
this.logicalName = logicalName;
}
- /**
- * {@inheritDoc}
- */
public void setName(String name) {
this.name = name;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/TableModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/TableModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/TableModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,6 +43,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -51,17 +52,11 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public List<AttributeModel> getAttributes() {
assert attributes != null;
return attributes;
}
- /**
- * {@inheritDoc}
- */
public List<IndexModel> getIndexes() {
assert indexes != null;
return indexes;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/ViewModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/ViewModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/entity/ViewModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,6 +35,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -43,16 +44,10 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public String getDefinition() {
return definition;
}
- /**
- * {@inheritDoc}
- */
public void setDefinition(String definition) {
this.definition = definition;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexColumnModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexColumnModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexColumnModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* インデックスカラムのモデル。
+ *
* @author daisuke
*/
public class IndexColumnModelImpl extends AbstractJiemamyElement implements IndexColumnModel {
@@ -42,6 +43,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -50,37 +52,22 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public ColumnRef getColumn() {
return column;
}
- /**
- * {@inheritDoc}
- */
public SortType getSortType() {
return sortType;
}
- /**
- * {@inheritDoc}
- */
public void setColumn(ColumnRef column) {
this.column = column;
}
- /**
- * {@inheritDoc}
- */
public void setSortType(SortType sortType) {
this.sortType = sortType;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/index/IndexModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -46,6 +46,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
*/
@@ -53,53 +54,36 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public List<IndexColumnModel> getColumns() {
assert columns != null;
return columns;
}
- /**
- * {@inheritDoc}
- */
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
public boolean isUnique() {
return unique;
}
/**
* インデックスカラムのリストを設定する。
+ *
* @param columns インデックスカラムのリスト
*/
public void setColumns(List<IndexColumnModel> columns) {
this.columns = columns;
}
- /**
- * {@inheritDoc}
- */
public void setName(String name) {
this.name = name;
}
- /**
- * {@inheritDoc}
- */
public void setUnique(boolean unique) {
this.unique = unique;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Identifier.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Identifier.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Identifier.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -40,9 +40,6 @@
this.identifier = identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return identifier;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Operator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Operator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Operator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,9 +49,6 @@
this.string = string;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return string;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Separator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Separator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/Separator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,9 +44,6 @@
this.string = string;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return string;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/SqlStatementImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/SqlStatementImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/sql/SqlStatementImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* SQL文実装クラス。
+ *
* @author daisuke
*/
public class SqlStatementImpl implements SqlStatement {
@@ -36,7 +37,6 @@
/**
* インスタンスを生成する。
- *
*/
public SqlStatementImpl() {
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomSerializer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,9 +43,11 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.model.RootModel;
+import org.jiemamy.utils.LogMarker;
/**
* シリアライザのDOMによる実装。
+ *
* @author daisuke
*/
public class JiemamyDomSerializer implements JiemamySerializer {
@@ -83,12 +85,9 @@
this.jiemamy = jiemamy;
}
- /**
- * {@inheritDoc}
- */
public RootModel deserialize(InputStream in) throws SerializationException {
Validate.notNull(in);
- logger.debug("deserialize");
+ logger.debug(LogMarker.LIFECYCLE, "deserialize");
RootModel rootModel;
try {
@@ -104,13 +103,10 @@
return rootModel;
}
- /**
- * {@inheritDoc}
- */
public void serialize(RootModel rootModel, OutputStream out) throws SerializationException {
Validate.notNull(rootModel);
Validate.notNull(out);
- logger.debug("serialize");
+ logger.debug(LogMarker.LIFECYCLE, "serialize");
try {
Document document = toDom(rootModel);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -96,9 +96,6 @@
this.jiemamy = jiemamy;
}
- /**
- * {@inheritDoc}
- */
public RootModel deserialize(InputStream in) throws SerializationException {
Validate.notNull(in);
@@ -129,9 +126,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
public void serialize(RootModel rootModel, OutputStream out) throws SerializationException {
Validate.notNull(rootModel);
Validate.notNull(out);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AbstractContext.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AbstractContext.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AbstractContext.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,6 +33,7 @@
/**
* コンテキスト値のマップを取得する。
+ *
* @return コンテキスト値のマップ
*/
public Map<String, Object> getProperties() {
@@ -42,6 +43,7 @@
/**
* コンテキスト値を取得する。
+ *
* @param <T> コンテキスト値の型
* @param key キー
* @return コンテキスト値
@@ -55,6 +57,7 @@
/**
* コンテキスト値のマップを設定する。
+ *
* @param properties コンテキスト値のマップ
*/
public void setProperties(Map<String, Object> properties) {
@@ -64,6 +67,7 @@
/**
* コンテキスト値を設定する。
+ *
* @param <T> コンテキスト値の型
* @param key キー
* @param value コンテキスト値
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ArrayEssentialStack.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ArrayEssentialStack.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ArrayEssentialStack.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link EssentialStack}の{@link ArrayStack}を用いた実装。
+ *
* @param <E> 要素の型
* @author daisuke
*/
@@ -32,65 +33,38 @@
private ArrayStack<E> stack = new ArrayStack<E>();
- /**
- * {@inheritDoc}
- */
public void clear() {
stack.clear();
}
- /**
- * {@inheritDoc}
- */
public boolean isEmpty() {
return stack.isEmpty();
}
- /**
- * {@inheritDoc}
- */
public Iterator<E> iterator() {
return stack.iterator();
}
- /**
- * {@inheritDoc}
- */
public E peek() {
return stack.peek();
}
- /**
- * {@inheritDoc}
- */
public E peek(int n) {
return stack.peek(n);
}
- /**
- * {@inheritDoc}
- */
public E pop() {
return stack.pop();
}
- /**
- * {@inheritDoc}
- */
public void push(E element) {
stack.push(element);
}
- /**
- * {@inheritDoc}
- */
public int size() {
return stack.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return stack.toString();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AttributeComparator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AttributeComparator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/AttributeComparator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -75,9 +75,6 @@
this.tableModel = tableModel;
}
- /**
- * {@inheritDoc}
- */
public int compare(AttributeModel o1, AttributeModel o2) {
int i1 = getOrder(o1.getClass().getInterfaces());
int i2 = getOrder(o2.getClass().getInterfaces());
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DateUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DateUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DateUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -59,4 +59,7 @@
cal.set(Calendar.DATE, 1);
return new java.sql.Time(cal.getTimeInMillis());
}
+
+ private DateUtil() {
+ }
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DisablableImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DisablableImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DisablableImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link Exporter}に対する非処理指示可能を表すアダプタ実装。
+ *
* @author daisuke
*/
public class DisablableImpl implements Disablable {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DriverUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DriverUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DriverUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* JDBCドライバ関係のユーティリティクラス。
+ *
* @author daisuke
*/
public final class DriverUtil {
@@ -97,6 +98,7 @@
/**
* JARファイル内の、{@link Driver}を実装したクラスのリストを抽出する。
+ *
* @author daisuke
*/
private static final class GetDriverClassesFromJarHandler implements ResourceHandler {
@@ -119,9 +121,6 @@
this.classLoader = classLoader;
}
- /**
- * {@inheritDoc}
- */
public void processResource(String path, InputStream is) {
if (path.endsWith(CLASS_EXTENSION) == false) {
return;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EntityDependencyCalculator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EntityDependencyCalculator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EntityDependencyCalculator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* エンティティの依存度を計算するクラス。
+ *
* @author daisuke
*/
public final class EntityDependencyCalculator {
@@ -59,6 +60,7 @@
/**
* 対象に依存するentityを結果に追加します。
+ *
* @param entityModel 依存調査対象となるentity
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -75,6 +77,7 @@
/**
* entityを結果に追加します。 但し、既に結果に含まれていた場合は何もしない。
+ *
* @param entityModel 追加するentity
*/
private static void addToResult(EntityModel entityModel) {
@@ -84,9 +87,6 @@
}
}
- /**
- * ユーティリティクラス。
- */
private EntityDependencyCalculator() {
}
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialQueue.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialQueue.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialQueue.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -46,24 +46,28 @@
/**
* キューに要素を追加する。
+ *
* @param element 追加する要素
*/
void enqueue(E element);
/**
* 与えられたキューの内容を、このキューに全て追加する。
+ *
* @param queue
*/
void enqueue(EssentialQueue<E> queue);
/**
* 取り出す要素があるかどうか調べる。
+ *
* @return キューが空の場合{@code true}
*/
boolean isEmpty();
/**
* 次にキューから取り出される要素を取得する。キューから削除は行わない。
+ *
* @return 次にキューから取り出される要素
* @throws NoSuchElementException 取り出す要素が無い場合
*/
@@ -71,6 +75,7 @@
/**
* キューから取り出せる要素の数を取得する。
+ *
* @return 要素の数
*/
int size();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialStack.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialStack.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/EssentialStack.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,12 +38,14 @@
/**
* 取り出す要素があるかどうか調べる。
+ *
* @return スタックが空の場合{@code true}
*/
boolean isEmpty();
/**
* 次の{@link #pop()}でスタックから取り出される要素を取得する。スタックから削除は行わない。
+ *
* @return 要素
* @throws NoSuchElementException 取り出す要素が無い場合
*/
@@ -51,6 +53,7 @@
/**
* n番目の{@link #pop()}でスタックから取り出される要素を取得する。スタックから削除は行わない。
+ *
* @param n
* @return 要素
*/
@@ -66,12 +69,14 @@
/**
* スタックに要素を追加する。
+ *
* @param element 追加する要素
*/
void push(E element);
/**
* スタックから取り出せる要素の数を取得する。
+ *
* @return 要素の数
*/
int size();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ForEachUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ForEachUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ForEachUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -123,6 +123,7 @@
/**
* ループが終了した後、acceptが返すべき戻り値を取得する。
+ *
* @return ループが終了した後、acceptが返すべき戻り値
*/
R getFinalResult();
@@ -150,6 +151,7 @@
/**
* ループが終了した後、acceptが返すべき戻り値を取得する。
+ *
* @return ループが終了した後、acceptが返すべき戻り値
*/
R getFinalResult();
@@ -177,6 +179,7 @@
/**
* ループが終了した後、acceptが返すべき戻り値を取得する。
+ *
* @return ループが終了した後、acceptが返すべき戻り値
*/
R getFinalResult();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IterableNodeList.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IterableNodeList.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IterableNodeList.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,9 +44,6 @@
this.nodeList = nodeList;
}
- /**
- * {@inheritDoc}
- */
public Iterator<Node> iterator() {
return new NodeListIterator(nodeList);
}
@@ -75,23 +72,14 @@
this.nodeList = nodeList;
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
return nodeList.getLength() > index;
}
- /**
- * {@inheritDoc}
- */
public Node next() {
return nodeList.item(index++);
}
- /**
- * {@inheritDoc}
- */
public void remove() {
throw new UnsupportedOperationException();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/JmStringUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/JmStringUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/JmStringUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* Stringユーティリティ。
+ *
* @author daisuke
* @author wencheng
*/
@@ -32,6 +33,7 @@
/**
* 大文字小文字を無視した条件下で、配列中に指定した文字列を含むかどうかを調べる。
+ *
* @param array 調査対象配列
* @param stringToFind 探す文字列
* @return 含む場合{@code true}
@@ -42,6 +44,7 @@
/**
* 大文字小文字を無視した条件下で、配列中に指定した文字列のインデックスを調べる。
+ *
* @param array 調査対象配列
* @param stringToFind 探す文字列
* @return インデックス番号
@@ -52,6 +55,7 @@
/**
* 大文字小文字を無視した条件下で、配列中に指定した文字列のインデックスを調べる。
+ *
* @param array 調査対象配列
* @param stringToFind 探す文字列
* @param startIndex 調査開始インデックス
@@ -82,6 +86,7 @@
/**
* 文字列の1文字目を大文字にする。
+ *
* @param str 入力文字列
* @return 出力文字列
*/
@@ -93,6 +98,7 @@
/**
* SQL名（ex. AGILE_DATABASE）からJavaクラス名（ex. AgileDatabase）を生成する。
+ *
* @param str SQL名
* @return Javaクラス名
*/
@@ -102,6 +108,7 @@
/**
* SQL名（ex. AGILE_DATABASE）からJavaクラス名（ex. AgileDatabase）を生成する。 prifixが存在した場合、取り除く。
+ *
* @param str SQL名
* @param prefix 接頭辞
* @return Javaクラス名
@@ -112,6 +119,7 @@
/**
* SQL名（ex. AGILE_DATABASE）からJava名（ex. agileDatabase）を生成する。
+ *
* @param str SQL名
* @return Java名
*/
@@ -121,6 +129,7 @@
/**
* SQL名（ex. AGILE_DATABASE）からJava名（ex. agileDatabase）を生成する。 prifixが存在した場合、取り除く。
+ *
* @param str SQL名
* @param prefix 接頭辞
* @return Java名
@@ -148,6 +157,7 @@
/**
* Java名（ex. AgileDatabase, agileDatabase）からSQL名（ex. AGILE_DATABASE）を生成する。
+ *
* @param str Java名
* @return SQL名
*/
@@ -157,6 +167,7 @@
/**
* Java名（ex. AgileDatabase, agileDatabase）からSQL名（ex. AGILE_DATABASE）を生成する。 prifixを付加する。
+ *
* @param str Java名
* @param prefix 接頭辞
* @return SQL名
@@ -182,6 +193,7 @@
/**
* 文字列の1文字目を大文字にする。
+ *
* @param str 入力文字列
* @return 出力文字列
*/
@@ -191,9 +203,6 @@
return new String(ch);
}
- /**
- * ユーティリティクラス。
- */
private JmStringUtil() {
}
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LinkedEssentialQueue.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LinkedEssentialQueue.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LinkedEssentialQueue.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link EssentialQueue}の{@link LinkedList}を用いた実装。
+ *
* @param <E> 要素の型
* @author daisuke
*/
@@ -32,30 +33,18 @@
private LinkedList<E> linkedList = new LinkedList<E>();
- /**
- * {@inheritDoc}
- */
public void clear() {
linkedList.clear();
}
- /**
- * {@inheritDoc}
- */
public E dequeue() {
return linkedList.poll();
}
- /**
- * {@inheritDoc}
- */
public void enqueue(E element) {
linkedList.offer(element);
}
- /**
- * {@inheritDoc}
- */
public void enqueue(EssentialQueue<E> queue) {
try {
while (true) {
@@ -67,37 +56,22 @@
}
}
- /**
- * {@inheritDoc}
- */
public boolean isEmpty() {
return linkedList.isEmpty();
}
- /**
- * {@inheritDoc}
- */
public Iterator<E> iterator() {
return linkedList.iterator();
}
- /**
- * {@inheritDoc}
- */
public E peek() {
return linkedList.peek();
}
- /**
- * {@inheritDoc}
- */
public int size() {
return linkedList.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return linkedList.toString();
Added: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LogMarker.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LogMarker.java (rev 0)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LogMarker.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/23
+ *
+ * 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.utils;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+/**
+ * TODO for daisuke
+ *
+ * <p>cf. <a
+ * href="http://d.hatena.ne.jp/taichitaichi/20090220/1235124140">http://d.hatena.ne.jp/taichitaichi/20090220/1235124140</a></p>
+ *
+ * @author daisuke
+ */
+public class LogMarker {
+
+ private static final String PREFIX_PKG = "org.jiemamy";
+
+ public static final Marker MARKER_ROOT = MarkerFactory.getMarker(PREFIX_PKG);
+
+ /** 設計判断を伴う処理に関連する項目。アドインやプラグインに関連する部分など */
+ public static final Marker DESIGN = MarkerFactory.getMarker(PREFIX_PKG + ".design");
+
+ /** ファイルやネットワーク、他の依存ライブラリに対するインターフェースに関連する項目 */
+ public static final Marker BOUNDARY = MarkerFactory.getMarker(PREFIX_PKG + ".boundary");
+
+ /** ライブラリ内に定義されているオブジェクトのライフサイクルに関連する項目 */
+ public static final Marker LIFECYCLE = MarkerFactory.getMarker(PREFIX_PKG + ".lifecycle");
+
+ /**
+ * 処理の中で、詳細な情報を出力する為の項目
+ *
+ * <p>このマーカは、主にライブリやフレームワークの実装者が、バグの調査を目的として使う</p>
+ */
+ public static final Marker DETAIL = MarkerFactory.getMarker(PREFIX_PKG + ".detail");
+
+ static {
+ Marker[] markers = {
+ DESIGN,
+ BOUNDARY,
+ LIFECYCLE,
+ DETAIL
+ };
+ for (Marker m : markers) {
+ MARKER_ROOT.add(m);
+ }
+ }
+
+
+ private LogMarker() {
+ }
+}
Property changes on: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/LogMarker.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Processor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Processor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Processor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,6 +32,7 @@
/**
* オブジェクトに対する処理を実行する。
+ *
* @param target 対象オブジェクト
* @return 結果
* @throws X Process処理が正常に終了しなかった場合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ProcessorUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ProcessorUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ProcessorUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* {@link Processor}を実行するためのユーティリティクラス。
+ *
* @author daisuke
*/
public final class ProcessorUtil {
/**
* オブジェクトに対する処理を実行する。
+ *
* @param <T> 処理対象の型
* @param <R> 処理結果の型
* @param <X> プロセッサがスローする可能性のある例外
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Resolvable.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Resolvable.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/Resolvable.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* {@link ResolvableQueue}に与えることができる、分割可能要素であることを示すインターフェイス。
+ *
* @param <T> 分割後の要素型
* @author daisuke
*/
@@ -27,6 +28,7 @@
/**
* 要素を分割する。
+ *
* @return 分割された要素を含むキュー
*/
EssentialQueue<T> resolve();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResolvableQueue.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResolvableQueue.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResolvableQueue.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,31 +37,19 @@
private List stock = new LinkedList();
- /**
- * {@inheritDoc}
- */
public void clear() {
stock.clear();
}
- /**
- * {@inheritDoc}
- */
public E dequeue() {
emptyCheck();
return getHead(stock);
}
- /**
- * {@inheritDoc}
- */
public void enqueue(E element) {
stock.add(element);
}
- /**
- * {@inheritDoc}
- */
public void enqueue(EssentialQueue<E> queue) {
if (queue instanceof ResolvableQueue) {
// resolvableであった場合は、分割せずにenqueueを行うために、stockを直接読み出す。
@@ -78,29 +66,21 @@
/**
* 可分割要素を追加する。
+ *
* @param element 可分割要素
*/
public void enqueue(Resolvable<E> element) {
stock.add(element);
}
- /**
- * {@inheritDoc}
- */
public boolean isEmpty() {
return stock.isEmpty();
}
- /**
- * {@inheritDoc}
- */
public Iterator<E> iterator() {
return new ResolvableIterator(new LinkedList(stock));
}
- /**
- * {@inheritDoc}
- */
public E peek() {
emptyCheck();
E head = getHead(stock);
@@ -108,9 +88,6 @@
return head;
}
- /**
- * {@inheritDoc}
- */
public int size() {
int size = 0;
for (Object content : stock) {
@@ -126,9 +103,6 @@
return size;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return stock.toString();
@@ -168,6 +142,7 @@
/**
* 用事分割イテレータ。
+ *
* @author daisuke
*/
private final class ResolvableIterator implements Iterator<E> {
@@ -177,22 +152,17 @@
/**
* インスタンスを生成する。
+ *
* @param list
*/
private ResolvableIterator(List<E> list) {
this.list = list;
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
return list.isEmpty() == false;
}
- /**
- * {@inheritDoc}
- */
public E next() {
if (hasNext() == false) {
throw new NoSuchElementException();
@@ -200,9 +170,6 @@
return getHead(list);
}
- /**
- * {@inheritDoc}
- */
public void remove() {
throw new UnsupportedOperationException();
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResourceTraversal.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResourceTraversal.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ResourceTraversal.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -124,7 +124,6 @@
/**
* リソースを処理するインターフェースです。
- *
*/
public interface ResourceHandler {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/StaxUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/StaxUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/StaxUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* イベントタイプを表すintから、enumに変換する。
+ *
* @param eventType イベントタイプを表すint
* @return イベントタイプを表すenum
*/
@@ -88,9 +89,11 @@
/**
* StAXのイベントタイプ。
+ *
* @author daisuke
*/
public static enum StaxEventType {
+
/** {@link XMLStreamConstants#START_ELEMENT} */
START_ELEMENT,
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* {@link UUID}用ユーティリティクラス。
+ *
* @author daisuke
*/
public final class UUIDUtil {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,12 +28,14 @@
/**
* {@link ColumnModel}を構築するためのビルダークラス。
+ *
* @author daisuke
*/
public class ColumnBuilder extends ModelBuilder<ColumnModel> {
/**
* インスタンスを生成する。
+ *
* @param factory
* @param name カラム名
* @param type 型記述子
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* {@link BuiltinDataType}を生成するビルダ。
+ *
* @author daisuke
*/
public class DataTypeBuilder {
@@ -52,6 +53,7 @@
/**
* インスタンスを生成する。
+ *
* @param factory
* @param typeCategory
* @param typeName
@@ -65,6 +67,7 @@
/**
* モデルを構築する。
+ *
* @return model 構築されたモデル
*/
public BuiltinDataType build() {
@@ -73,6 +76,7 @@
/**
* 精度を設定する。
+ *
* @param precision 精度
* @return this
*/
@@ -83,6 +87,7 @@
/**
* スケールを設定する。
+ *
* @param scale スケール
* @return this
*/
@@ -93,6 +98,7 @@
/**
* 自動採番型かどうかを設定する。
+ *
* @param serial 自動採番であれば{@code true}
* @return this
*/
@@ -103,6 +109,7 @@
/**
* サイズを設定する。
+ *
* @param size サイズ
* @return this
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,6 +35,7 @@
/**
* {@link ForeignKeyModel}を構築するためのビルダークラス。
+ *
* @author daisuke
*/
public class ForeignKeyBuilder extends ModelBuilder<ForeignKeyModel> {
@@ -48,6 +49,7 @@
/**
* インスタンスを生成する。
+ *
* @param factory
* @param source 参照元テーブル
* @param target 参照先テーブル
@@ -67,6 +69,7 @@
/**
* カラム同士のマッピングを設定する。
+ *
* @param foreignKeyColumn 参照元テーブルの「制約を受けるカラム」の一つ
* @param keyColumn 参照先テーブルの主キーカラムの一つ
* @return this
@@ -81,6 +84,7 @@
/**
* カラム同士のマッピングを設定する。
+ *
* @param foreignKeyColumn 参照元テーブルの「制約を受けるカラム」の一つ
* @param keyColumn 参照先テーブルの主キーカラムの一つ
* @return this
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ModelBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ModelBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ModelBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* モデルオブジェクトを構築するためのビルダークラス。
+ *
* @param <T> 構築するモデルの型
* @author daisuke
*/
@@ -40,6 +41,7 @@
/**
* インスタンスを生成する。
+ *
* @param factory 構築元となる{@link RootModel}
* @param clazz 構築するオブジェクトを表す型
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -53,6 +55,7 @@
/**
* モデルを構築する。
+ *
* @return model 構築されたモデル
*/
public T build() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,12 +28,14 @@
/**
* {@link TableModel}を構築するためのビルダークラス。
+ *
* @author daisuke
*/
public class TableBuilder extends ModelBuilder<TableModel> {
/**
* インスタンスを生成する。
+ *
* @param factory
* @param name
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -46,6 +48,7 @@
/**
* カラムを追加する。
+ *
* @param column 追加するカラム
* @return this
*/
@@ -56,6 +59,7 @@
/**
* 主キーをカラムのインデックスで指定する。
+ *
* @param index
* @param otherIndexes
* @return this
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,12 +26,14 @@
/**
* {@link TableModel}を構築するためのビルダークラス。
+ *
* @author daisuke
*/
public class ViewBuilder extends ModelBuilder<ViewModel> {
/**
* インスタンスを生成する。
+ *
* @param factory
* @param name
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -44,6 +46,7 @@
/**
* VIEW定義SELECT文を設定する。
+ *
* @param definition VIEW定義SELECT文
* @return this
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/AttributesMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -148,9 +148,6 @@
assert isNullable != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/BestRowIdentifierMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -81,9 +81,6 @@
assert pseudoColumn != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/CatalogMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,9 +49,6 @@
assert tableCat != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -153,9 +153,6 @@
assert isNullable != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ColumnPrivilegeMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -80,9 +80,6 @@
assert privilege != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/IndexInfoMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -108,9 +108,6 @@
assert ascOrDesc != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/KeyMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -108,9 +108,6 @@
assert deferrability != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/PrimaryKeyMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -70,9 +70,6 @@
assert columnName != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureColumnsMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -97,9 +97,6 @@
assert nullable != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/ProcedureMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -67,9 +67,6 @@
assert procedureType != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SchemaMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -53,9 +53,6 @@
assert tableSchem != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTableMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -62,9 +62,6 @@
assert supertableName != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/SuperTypeMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -70,9 +70,6 @@
assert supertypeName != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -91,9 +91,6 @@
assert remarks != null; // THINK ?
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TablePrivilegeMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -75,9 +75,6 @@
assert privilege != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TableTypeMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -52,9 +52,6 @@
assert this.tableType != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeInfoMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -120,9 +120,6 @@
assert searchable != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/TypeSafeDatabaseMetaData.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -407,9 +407,6 @@
resultSet.close();
}
- /**
- * {@inheritDoc}
- */
public Iterator<T> iterator() {
return new ResultSetIterator<T>(resultSet, resultClass);
}
@@ -434,9 +431,6 @@
this.resultClass = resultClass;
}
- /**
- * {@inheritDoc}
- */
public boolean hasNext() {
try {
return resultSet.isLast() == false;
@@ -446,9 +440,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
public T next() {
try {
try {
@@ -476,9 +467,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
public void remove() {
try {
resultSet.deleteRow();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/UDTMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -79,9 +79,6 @@
assert remarks != null; // THINK ?
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/metadata/VersionColumnMeta.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -80,9 +80,6 @@
assert pseudoColumn != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DataTypeUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DataTypeUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DataTypeUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -36,6 +36,7 @@
/**
* データ型名を取得する。
+ *
* @param dataType 対象
* @param resolver 参照リゾルバ
* @return データ型名
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EntityUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EntityUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EntityUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -46,6 +46,7 @@
/**
* 指定したエンティティを外部キー制約によって参照している（指定したエンティティに依存している:A→BにおけるA）エンティティの集合を取得する。
+ *
* @param entity 対象エンティティ
* @param recursive 再帰的に検索する場合は{@code true}
* @return エンティティの集合
@@ -56,6 +57,7 @@
/**
* 指定したエンティティが外部キー制約によって参照している（指定したエンティティが依存している:A→BにおけるB）エンティティの集合を取得する。
+ *
* @param entity 対象エンティティ
* @param recursive 再帰的に検索する場合は{@code true}
* @return エンティティの集合
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -107,9 +107,6 @@
private static class AdapterConverter implements ConverterDriver {
- /**
- * {@inheritDoc}
- */
public Value convert(Object object, ObjectConverter converter) {
Adapter annotation = AnnotationUtil.getTypeAnnotation(object, Adapter.class);
if (annotation == null) {
@@ -142,9 +139,6 @@
private static class JiemamyPropertyConverter implements ConverterDriver {
- /**
- * {@inheritDoc}
- */
public Value convert(Object object, ObjectConverter converter) {
if (object instanceof Jiemamy) {
return Terminal.of("<JIEMAMY>");
@@ -156,9 +150,6 @@
private static class ReferenceConverter implements ConverterDriver {
- /**
- * {@inheritDoc}
- */
public Value convert(Object object, ObjectConverter converter) {
if (object instanceof ElementReference) {
ElementReference<?> ref = (ElementReference<?>) object;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/ForeignKeyUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/ForeignKeyUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/ForeignKeyUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,6 +43,7 @@
/**
* マッピング情報を追加する。
+ *
* @param fkModel 対象外部キー制約モデル
* @param foreignKeyColumn キーカラム
* @param keyColumn 参照カラム
@@ -54,6 +55,7 @@
/**
* マッピング情報を追加する。
+ *
* @param fkModel 対象外部キー制約モデル
* @param keyColumn キーカラムの参照
* @param referenceColumn 参照カラムの参照
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/KeyConstraintUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/KeyConstraintUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/KeyConstraintUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -83,6 +83,12 @@
keyColumns.removeAll(toRemove);
}
+ /**
+ * TODO for daisuke
+ *
+ * @param keyModel
+ * @return
+ */
public static String toStringKeyColumns(KeyConstraintModel keyModel) {
ReferenceResolver resolver = keyModel.getJiemamy().getReferenceResolver();
List<ColumnRef> keyColumns = keyModel.getKeyColumns();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -173,6 +173,7 @@
/**
* 特定の種類のノードのリストを取得する。
+ *
* @param <T> 取得したいノードのクラス
* @param rootModel
* @param clazz 取得したいノードのクラス
@@ -241,6 +242,7 @@
/**
* SQL方言を設定する。
+ *
* @param rootModel
* @param dialectClass SQL方言クラス
*/
@@ -250,6 +252,7 @@
/**
* SQL方言を設定する。
+ *
* @param rootModel
* @param dialect SQL方言
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/TableUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/TableUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/TableUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -78,6 +78,7 @@
/**
* 指定した型を持つ属性のリストを取得する。
+ *
* @param <T> 属性の型
* @param tableModel 対象のテーブル
* @param clazz
@@ -159,6 +160,7 @@
/**
* カラムのリストを取得する。
+ *
* @param tableModel 対象のテーブル
* @return カラムのリスト
*/
@@ -188,6 +190,7 @@
/**
* 主キーを取得する。
+ *
* @param tableModel 対象のテーブル
* @return 主キー
* @throws TooManyElementsException
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/ReferenceQueueMonitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/ReferenceQueueMonitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/ReferenceQueueMonitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -62,9 +62,6 @@
this.running = true;
}
- /**
- * {@inheritDoc}
- */
public void run() {
while (running) {
try {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/Swapper.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/Swapper.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/swap/Swapper.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -73,7 +73,6 @@
/**
* インスタンスを生成する。
- *
*/
private Swapper() {
try {
@@ -320,9 +319,6 @@
*/
private static class SetComparator implements Comparator<Reference<SwapObject<?>>> {
- /**
- * {@inheritDoc}
- */
public int compare(Reference<SwapObject<?>> o1, Reference<SwapObject<?>> o2) {
SwapObject<?> s1 = o1.get();
SwapObject<?> s2 = o2.get();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractCollectionVisitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractCollectionVisitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractCollectionVisitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link Collection}に対するビジターの抽象クラス。
+ *
* @author daisuke
* @param <T> Collectionが保持する型
* @param <R> forEachが返すべき戻り値の型
@@ -43,16 +44,10 @@
init();
}
- /**
- * {@inheritDoc}
- */
public R getFinalResult() {
return finalResult;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return finalResult.toString();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractMapVisitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractMapVisitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractMapVisitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,11 +24,12 @@
/**
* {@link Map}に対するビジターの抽象クラス。
- * @author daisuke
+ *
* @param <K> MapのKeyの型
* @param <V> MapのValueの型
* @param <R> forEachが返すべき戻り値の型
* @param <X> スローする可能性のある例外
+ * @author daisuke
*/
public abstract class AbstractMapVisitor<K, V, R, X extends Exception> implements ForEachUtil.MapVisitor<K, V, R, X> {
@@ -43,16 +44,10 @@
init();
}
- /**
- * {@inheritDoc}
- */
public R getFinalResult() {
return finalResult;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return finalResult.toString();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractResultSetVisitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractResultSetVisitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/AbstractResultSetVisitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,9 +24,10 @@
/**
* {@link ResultSet}に対するビジターの抽象クラス。
- * @author daisuke
+ *
* @param <R> 戻り値の型
* @param <X> visitメソッドが投げる可能性のある例外
+ * @author daisuke
*/
public abstract class AbstractResultSetVisitor<R, X extends Exception> implements
ForEachUtil.ResultSetVisitor<ResultSet, R, X> {
@@ -42,16 +43,10 @@
init();
}
- /**
- * {@inheritDoc}
- */
public R getFinalResult() {
return finalResult;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return finalResult.toString();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/EntityNamesVisitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/EntityNamesVisitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/EntityNamesVisitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* エンティティ名のリストを取得するビジター。
+ *
* @author daisuke
*/
public class EntityNamesVisitor extends AbstractResultSetVisitor<List<String>, RuntimeException> {
@@ -40,9 +41,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void init() {
finalResult = new ArrayList<String>();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/SizeVisitor.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/SizeVisitor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/visitor/impl/SizeVisitor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,22 +24,17 @@
/**
* {@link Collection}のサイズを取得するビジター。
+ *
* @author daisuke
* @param <T> {@link Collection}が保持する型
*/
public class SizeVisitor<T> extends AbstractCollectionVisitor<T, Integer, RuntimeException> {
- /**
- * {@inheritDoc}
- */
public Integer visit(T element) {
finalResult++;
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void init() {
finalResult = 0;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,9 +34,6 @@
*/
public abstract class AbstractValidator implements Validator {
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/CompositeValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/CompositeValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/CompositeValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,9 +43,6 @@
return validators;
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,6 +54,7 @@
/**
* インスタンスを生成する。
+ *
* @param patternString 識別子としての妥当性を判断する正規表現パターン文字列
* @param reservedWords 予約語プロバイダ
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -112,6 +113,7 @@
/**
* インスタンスを生成する。
+ *
* @param name
* @param pattern
*/
@@ -124,9 +126,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
@@ -137,6 +136,7 @@
/**
* インスタンスを生成する。
+ *
* @param name
*/
public ReservedWordProblem(String name) {
@@ -147,9 +147,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -77,6 +77,7 @@
/**
* インスタンスを生成する。
+ *
* @param tableModel
* @param index
*/
@@ -99,6 +100,7 @@
/**
* インスタンスを生成する。
+ *
* @param tableModel
* @param columnModel
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,9 +37,6 @@
*/
public class EntityNameCollisionValidator extends AbstractValidator {
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
@@ -86,13 +83,8 @@
// TODO とりあえず実装。リソースバンドル使えた方がええよなぁ。
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
-
}
-
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -47,9 +47,6 @@
private static Logger logger = LoggerFactory.getLogger(ForeignKeyValidator.class);
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -77,9 +77,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.FATAL;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,6 @@
private static Logger logger = LoggerFactory.getLogger(IndexValidator.class);
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
@@ -79,6 +76,7 @@
/**
* インスタンスを生成する。
+ *
* @param columnRef
* @param indexModel
* @param tableModel
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -76,9 +76,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.FATAL;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -73,9 +73,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.FATAL;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -40,9 +40,6 @@
*/
public class PrimaryKeyValidator extends AbstractValidator {
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
@@ -73,9 +70,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
@@ -96,9 +90,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.NOTICE;
}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/ArtemisJiemamyFactoryTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/ArtemisJiemamyFactoryTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/ArtemisJiemamyFactoryTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -251,44 +251,26 @@
private static class JiemamyElementMock implements JiemamyElement {
- /**
- * {@inheritDoc}
- */
public <T>T getAdapter(Class<T> adapterClass) {
return null;
}
- /**
- * {@inheritDoc}
- */
public List<Object> getAdapters() {
return null;
}
- /**
- * {@inheritDoc}
- */
public UUID getId() {
return null;
}
- /**
- * {@inheritDoc}
- */
public Jiemamy getJiemamy() {
return null;
}
- /**
- * {@inheritDoc}
- */
public boolean hasAdapter(Class<?> adapterClass) {
return false;
}
- /**
- * {@inheritDoc}
- */
public void registerAdapter(Object adapter) {
}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerImplTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -307,16 +307,10 @@
this.target = target;
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
commandList.add(command);
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
return target;
}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/ResolvableQueueTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/ResolvableQueueTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/ResolvableQueueTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,74 +34,6 @@
*/
public class ResolvableQueueTest {
- /**
- * テスト用要素クラス。
- * @author daisuke
- */
- private static class Element {
-
- char ch;
-
-
- Element(char c) {
- ch = c;
- }
- }
-
- /**
- * テスト用多段可分割要素クラス。
- * @author daisuke
- */
- private static class MultiResolvableElement implements Resolvable<Element> {
-
- String[] str;
-
-
- MultiResolvableElement(String... str) {
- this.str = str;
- }
-
- /**
- * {@inheritDoc}
- */
- public EssentialQueue<Element> resolve() {
- resolveCount++;
- ResolvableQueue<Element> queue = new ResolvableQueue<Element>();
- for (String s : str) {
- queue.enqueue(new ResolvableElement(s));
- }
- return queue;
- }
- }
-
- /**
- * テスト用可分割要素クラス。
- * @author daisuke
- */
- private static class ResolvableElement implements Resolvable<Element> {
-
- String str;
-
-
- ResolvableElement(String str) {
- this.str = str;
- }
-
- /**
- * {@inheritDoc}
- */
- public EssentialQueue<Element> resolve() {
- resolveCount++;
- EssentialQueue<Element> queue = new LinkedEssentialQueue<Element>();
- char[] array = str.toCharArray();
- for (char c : array) {
- queue.enqueue(new Element(c));
- }
- return queue;
- }
- }
-
-
private static int resolveCount;
@@ -392,4 +324,66 @@
queue.dequeue();
queue.peek();
}
+
+
+ /**
+ * テスト用要素クラス。
+ * @author daisuke
+ */
+ private static class Element {
+
+ char ch;
+
+
+ Element(char c) {
+ ch = c;
+ }
+ }
+
+ /**
+ * テスト用多段可分割要素クラス。
+ * @author daisuke
+ */
+ private static class MultiResolvableElement implements Resolvable<Element> {
+
+ String[] str;
+
+
+ MultiResolvableElement(String... str) {
+ this.str = str;
+ }
+
+ public EssentialQueue<Element> resolve() {
+ resolveCount++;
+ ResolvableQueue<Element> queue = new ResolvableQueue<Element>();
+ for (String s : str) {
+ queue.enqueue(new ResolvableElement(s));
+ }
+ return queue;
+ }
+ }
+
+ /**
+ * テスト用可分割要素クラス。
+ * @author daisuke
+ */
+ private static class ResolvableElement implements Resolvable<Element> {
+
+ String str;
+
+
+ ResolvableElement(String str) {
+ this.str = str;
+ }
+
+ public EssentialQueue<Element> resolve() {
+ resolveCount++;
+ EssentialQueue<Element> queue = new LinkedEssentialQueue<Element>();
+ char[] array = str.toCharArray();
+ for (char c : array) {
+ queue.enqueue(new Element(c));
+ }
+ return queue;
+ }
+ }
}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/CompositeValidatorTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/CompositeValidatorTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/CompositeValidatorTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -94,9 +94,6 @@
super("MOCK1");
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
@@ -109,9 +106,6 @@
super("MOCK2");
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.WARN;
}
@@ -120,9 +114,6 @@
private static class MockValidator1 implements Validator {
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("serial")
public Collection<Problem> validate(RootModel rootModel) {
return new ArrayList<Problem>() {
@@ -138,9 +129,6 @@
private static class MockValidator2 implements Validator {
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("serial")
public Collection<Problem> validate(RootModel rootModel) {
return new ArrayList<Problem>() {
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,6 +34,7 @@
/**
* MySQLに対するSQL方言実装クラス。
+ *
* @author daisuke
*/
public class MySqlDialect extends AbstractDialect {
@@ -68,16 +69,10 @@
// FIXME 適当
}
- /**
- * {@inheritDoc}
- */
public List<BuiltinDataTypeMold> getAllDataTypes() {
return allDataTypes;
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
CompositeValidator validator = (CompositeValidator) super.getValidator();
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* MySQL用識別子バリデータ。
+ *
* @author daisuke
*/
public class MySqlIdentifierValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* MySQLの予約語を提供するクラス。
+ *
* @author daisuke
*/
public class MySqlReservedWords implements ReservedWordsProvider {
@@ -59,9 +60,6 @@
"ACCESSIBLE", "LINEAR", "MASTER_SSL_VERIFY_SERVER_CERT", "RANGE", "READ_ONLY", "READ_WRITE");
- /**
- * {@inheritDoc}
- */
public boolean isReserved(String name) {
return RESERVED_WORDS.contains(name);
}
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* PostgreSQLに対するSQL方言実装クラス。
+ *
* @author daisuke
*/
public class PostgresqlDialect extends AbstractDialect {
@@ -66,16 +67,10 @@
setQuoter(new PostgresqlQuoter());
}
- /**
- * {@inheritDoc}
- */
public List<BuiltinDataTypeMold> getAllDataTypes() {
return allDataTypes;
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
CompositeValidator validator = (CompositeValidator) super.getValidator();
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* PostgreSQL用識別子バリデータ。
+ *
* @author daisuke
*/
public class PostgresqlIdentifierValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,13 +22,11 @@
/**
* PostgreSQL用 {@link Quoter}実装。
+ *
* @author daisuke
*/
class PostgresqlQuoter implements Quoter {
- /**
- * {@inheritDoc}
- */
public String quote(String input, QuoteKind kind) {
if (kind == QuoteKind.DATA) {
return "'" + input + "'";
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* PostgreSQLの予約語を提供するクラス。
+ *
* @author daisuke
*/
public class PostgresqlReservedWords implements ReservedWordsProvider {
@@ -43,9 +44,6 @@
"VERBOSE");
- /**
- * {@inheritDoc}
- */
public boolean isReserved(String name) {
return RESERVED_WORDS.contains(name);
}
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -138,44 +138,26 @@
driver = d;
}
- /**
- * {@inheritDoc}
- */
public boolean acceptsURL(String u) throws SQLException {
return driver.acceptsURL(u);
}
- /**
- * {@inheritDoc}
- */
public Connection connect(String u, Properties p) throws SQLException {
return driver.connect(u, p);
}
- /**
- * {@inheritDoc}
- */
public int getMajorVersion() {
return driver.getMajorVersion();
}
- /**
- * {@inheritDoc}
- */
public int getMinorVersion() {
return driver.getMinorVersion();
}
- /**
- * {@inheritDoc}
- */
public DriverPropertyInfo[] getPropertyInfo(String u, Properties p) throws SQLException {
return driver.getPropertyInfo(u, p);
}
- /**
- * {@inheritDoc}
- */
public boolean jdbcCompliant() {
return driver.jdbcCompliant();
}
Modified: artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,6 +34,7 @@
/**
* 標準SQL99に対するSQL方言実装クラス。
+ *
* @author daisuke
*/
public class Sql99Dialect extends AbstractDialect {
@@ -68,16 +69,10 @@
// FIXME 適当
}
- /**
- * {@inheritDoc}
- */
public List<BuiltinDataTypeMold> getAllDataTypes() {
return allDataTypes;
}
- /**
- * {@inheritDoc}
- */
@Override
public Validator getValidator() {
CompositeValidator validator = (CompositeValidator) super.getValidator();
Modified: artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java
===================================================================
--- artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,9 +32,6 @@
private static final List<String> RESERVED_WORDS = Arrays.asList("FOO", "BAR");
- /**
- * {@inheritDoc}
- */
public boolean isReserved(String name) {
return RESERVED_WORDS.contains(name);
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ArtemisView.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ArtemisView.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ArtemisView.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,13 +27,11 @@
/**
* Jiemamy {@link Artemis} Implementationに対する、Jiemamy View Specification拡張クラス。
+ *
* @author daisuke
*/
public class ArtemisView implements ArtemisExtender {
- /**
- * {@inheritDoc}
- */
public List<Enhance> getEnhances() {
List<Enhance> enhances = CollectionsUtil.newArrayList();
@@ -43,9 +41,6 @@
return enhances;
}
- /**
- * {@inheritDoc}
- */
public Set<? extends OptionalSpec> getSpecs() {
return EnumSet.of(OfficialSpecs.VIEW);
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/NodeProfileImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -57,16 +57,10 @@
return layout;
}
- /**
- * {@inheritDoc}
- */
public void setColor(JmColor color) {
this.color = color;
}
- /**
- * {@inheritDoc}
- */
public void setLayout(JmRectangle layout) {
this.layout = layout;
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancePointcut.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancePointcut.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancePointcut.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* {@link JiemamyFactory#getSerializer()}の拡張位置を指定するポイントカット。
+ *
* @author daisuke
*/
public class ViewDomSerializerEnhancePointcut implements InvocationPointcut {
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -47,6 +47,7 @@
import org.jiemamy.serializer.JiemamyDomSerializer;
import org.jiemamy.utils.DomUtil;
import org.jiemamy.utils.IterableNodeList;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.XpathUtil;
import org.jiemamy.utils.enhancer.Invocation;
import org.jiemamy.utils.enhancer.InvocationHandler;
@@ -56,6 +57,7 @@
/**
* {@link JiemamyFactory#getSerializer()}を拡張する。
+ *
* @author daisuke
*/
public class ViewDomSerializerEnhancer implements InvocationHandler {
@@ -87,7 +89,7 @@
public JiemamyViewDomSerializer(Jiemamy jiemamy) {
super(jiemamy);
this.jiemamy = jiemamy;
- logger.info("JiemamyDomSerializer extended by Jiemamy VIEW Specification");
+ logger.info(LogMarker.LIFECYCLE, "JiemamyDomSerializer extended by Jiemamy VIEW Specification");
}
@Override
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancePointcut.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancePointcut.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancePointcut.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link JiemamyFactory#newModel(Class)}の拡張位置を指定するポイントカット。
+ *
* @author daisuke
*/
public class ViewFactoryExtensionEnhancePointcut implements InvocationPointcut {
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewFactoryExtensionEnhancer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -40,6 +40,7 @@
/**
* {@link JiemamyFactory#newModel(Class)}を拡張する。
+ *
* @author daisuke
*/
public class ViewFactoryExtensionEnhancer implements InvocationHandler {
@@ -53,6 +54,7 @@
/**
* {@link FactoryExtension}の拡張。
+ *
* @param <T>
* @author daisuke
*/
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetBendpointsProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* ベンドポイントのリストを取得する。
+ *
* @author daisuke
*/
public class GetBendpointsProcessor extends AbstractProcessor<RootModel, List<JmPoint>, RuntimeException> {
@@ -41,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param index
* @param connection
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -51,9 +53,6 @@
this.connection = connection;
}
- /**
- * {@inheritDoc}
- */
public List<JmPoint> process(RootModel rootModel) {
Validate.notNull(rootModel);
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetConnectionsProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetConnectionsProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/GetConnectionsProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* 特定の種類のコネクションを取得する。
+ *
* @param <T> コネクションの種類を表すクラス
* @author daisuke
*/
@@ -52,9 +53,6 @@
this.clazz = clazz;
}
- /**
- * {@inheritDoc}
- */
public List<T> process(RootModel rootModel) {
Validate.notNull(rootModel);
List<T> connections = CollectionsUtil.newArrayList();
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/IsCyclicProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/IsCyclicProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/IsCyclicProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* 自己参照コネクション（sourceとtargetが同一）かどうかを調べる。
+ *
* @author daisuke
*/
public class IsCyclicProcessor extends AbstractProcessor<ConnectionAdapter, Boolean, RuntimeException> {
@@ -46,9 +47,6 @@
private IsCyclicProcessor() {
}
- /**
- * {@inheritDoc}
- */
public Boolean process(ConnectionAdapter connectionAdapter) {
Validate.notNull(connectionAdapter);
return connectionAdapter.getSource().equals(connectionAdapter.getTarget());
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/ResetBendpointProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/ResetBendpointProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/ResetBendpointProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -43,6 +43,7 @@
/**
* インスタンスを生成する。
+ *
* @param connection
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -51,9 +52,6 @@
this.connection = connection;
}
- /**
- * {@inheritDoc}
- */
public Void process(DiagramPresentationModel diagramPresentation) {
Validate.notNull(diagramPresentation);
List<JmPoint> bendpoints = diagramPresentation.getConnectionLayouts().get(connection);
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/processor/SetBendpointsProcessor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,6 +30,7 @@
/**
* ベンドポイントの座標を設定する。
+ *
* @author daisuke
*/
public class SetBendpointsProcessor extends AbstractProcessor<RootModel, Void, RuntimeException> {
@@ -43,6 +44,7 @@
/**
* インスタンスを生成する。
+ *
* @param index ベンドポイントインデックス
* @param connection 対象のコネクション
* @param bendpoints 座標のリスト
@@ -56,9 +58,6 @@
this.bendpoints = bendpoints;
}
- /**
- * {@inheritDoc}
- */
public Void process(RootModel rootModel) {
Validate.notNull(rootModel);
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,6 +34,7 @@
/**
* ダイアグラム表現（レイアウト等）モデル。
+ *
* @author daisuke
*/
public class DiagramPresentationModelImpl extends AbstractJiemamyElement implements DiagramPresentationModel {
@@ -111,6 +112,7 @@
/**
* コネクションのベンドポイント情報を設定する。
+ *
* @param connectionLayouts コネクションのベンドポイント情報
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -136,6 +138,7 @@
/**
* ノードのレイアウト情報を設定する。
+ *
* @param nodeProfiles ノードのレイアウト情報
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationsImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,6 +28,7 @@
/**
* ダイアグラム表現の集合モデルクラス。
+ *
* @author daisuke
*/
public class DiagramPresentationsImpl implements DiagramPresentations {
@@ -46,40 +47,29 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
*/
public DiagramPresentationsImpl(RootModel rootModel) {
this.rootModel = rootModel;
}
- /**
- * {@inheritDoc}
- */
public void add(DiagramPresentationModel presentation) {
assert presentations != null;
Validate.notNull(presentation);
presentations.add(presentation);
}
- /**
- * {@inheritDoc}
- */
public DiagramPresentationModel get(int index) {
assert presentations != null;
return presentations.get(index);
}
- /**
- * {@inheritDoc}
- */
public Iterator<DiagramPresentationModel> iterator() {
assert presentations != null;
return UnmodifiableIterator.decorate(presentations.iterator());
}
- /**
- * {@inheritDoc}
- */
public void remove(DiagramPresentationModel presentation) {
assert presentations != null;
Validate.notNull(presentation);
@@ -97,17 +87,11 @@
this.presentations = presentations;
}
- /**
- * {@inheritDoc}
- */
public int size() {
assert presentations != null;
return presentations.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return presentations.toString();
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapterImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -51,9 +51,6 @@
this.wrapped = wrapped;
}
- /**
- * {@inheritDoc}
- */
public NodeAdapter getSource() {
List<ColumnRef> foreignKeyColumns = wrapped.getKeyColumns();
if (foreignKeyColumns.size() == 0) {
@@ -64,9 +61,6 @@
return ColumnUtil.getDefinedTable(columnModel).getAdapter(NodeAdapter.class);
}
- /**
- * {@inheritDoc}
- */
public NodeAdapter getTarget() {
List<ColumnRef> keyColumns = wrapped.getReferenceColumns();
if (keyColumns.size() == 0) {
@@ -77,24 +71,15 @@
return ColumnUtil.getDefinedTable(columnModel).getAdapter(NodeAdapter.class);
}
- /**
- * {@inheritDoc}
- */
public boolean isSelfConnection() {
return ProcessorUtil.process(this, IsCyclicProcessor.getInstance());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
- /**
- * {@inheritDoc}
- */
public ForeignKeyModel unwrap() {
// if (wrapped == null) {
// throw new UnsupportedOperationException();
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/NodeAdapterImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/NodeAdapterImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/NodeAdapterImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -58,9 +58,6 @@
this.wrapped = wrapped;
}
- /**
- * {@inheritDoc}
- */
public int compareTo(NodeAdapter o) {
if (o == null) {
return -1;
@@ -71,9 +68,6 @@
return wrapped.getId().compareTo(((NodeAdapterImpl) o).wrapped.getId());
}
- /**
- * {@inheritDoc}
- */
public List<ConnectionAdapter> getSourceConnections() {
if (wrapped == null) {
throw new IllegalImplementationException("Custom node must be overriden getSourceConnections method");
@@ -91,9 +85,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
public List<ConnectionAdapter> getTargetConnections() {
if (wrapped == null) {
throw new IllegalImplementationException("Custom node must be overriden getSourceConnections method");
@@ -121,17 +112,11 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
- /**
- * {@inheritDoc}
- */
public EntityModel unwrap() {
// if (wrapped == null) {
// throw new UnsupportedOperationException();
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModel.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,18 +22,21 @@
/**
* ダイアグラムにおける「付箋（注釈）」を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface StickyModel extends NodeAdapter, JiemamyElement {
/**
* 内容文を取得する。
+ *
* @return 内容文
*/
String getContents();
/**
* 内容文を設定する。
+ *
* @param contents 内容文
*/
void setContents(String contents);
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModelImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/node/StickyModelImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -41,6 +41,7 @@
/**
* インスタンスを生成する。
+ *
* @param jiemamy
* @param id
*/
@@ -48,41 +49,31 @@
super(jiemamy, id);
}
- /**
- * {@inheritDoc}
- */
public int compareTo(NodeAdapter o) {
// TODO Auto-generated method stub
return 0;
}
- /**
- * {@inheritDoc}
- */
public String getContents() {
return contents;
}
+ @SuppressWarnings("unchecked")
public List<ConnectionAdapter> getSourceConnections() {
// TODO
return ListUtils.EMPTY_LIST;
}
+ @SuppressWarnings("unchecked")
public List<ConnectionAdapter> getTargetConnections() {
// TODO
return ListUtils.EMPTY_LIST;
}
- /**
- * {@inheritDoc}
- */
public void setContents(String contents) {
this.contents = contents;
}
- /**
- * {@inheritDoc}
- */
public EntityModel unwrap() {
return null;
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/test/ViewTestModelBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -122,18 +122,12 @@
super(uuid, jiemamy);
}
- /**
- * {@inheritDoc}
- */
@Override
public void build() {
super.build();
createPresentations();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEntities() {
super.createEntities();
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/utils/JmPointUtil.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/utils/JmPointUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/utils/JmPointUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,6 +31,7 @@
/**
* 2点の差を求める。
+ *
* @param from 基準点
* @param to 対象点
* @return 差
@@ -44,6 +45,7 @@
/**
* 矩形の配置点（左上）2点の差を求める。
+ *
* @param from 基準矩形
* @param to 対象矩形
* @return 差
@@ -57,6 +59,7 @@
/**
* 位置を負方向に移動させる。
+ *
* @param target 移動対象
* @param x X軸移動量
* @param y Y軸移動量
@@ -70,6 +73,7 @@
/**
* 位置を負方向に移動させる。
+ *
* @param target 移動対象
* @param delta 移動量
* @return 移動結果
@@ -82,6 +86,7 @@
/**
* 位置を正方向に移動させる。
+ *
* @param target 移動対象
* @param x X軸移動量
* @param y Y軸移動量
@@ -95,6 +100,7 @@
/**
* 位置を正方向に移動させる。
+ *
* @param target 移動対象
* @param delta 移動量
* @return 移動結果
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,13 +25,11 @@
/**
* Eclipse環境においての{@link Dialect}インスタンス取得戦略クラス。
+ *
* @author daisuke
*/
public class EclipseDialectProvider implements InstanceProvider<Dialect> {
- /**
- * {@inheritDoc}
- */
public Dialect getInstance(String fqcn) {
try {
return JiemamyPlugin.getDialectResolver().getInstance(fqcn);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,13 +25,11 @@
/**
* Eclipse環境においての{@link Exporter}インスタンス取得戦略クラス。
+ *
* @author daisuke
*/
public class EclipseExporterProvider implements InstanceProvider<Exporter> {
- /**
- * {@inheritDoc}
- */
public Exporter getInstance(String fqcn) {
try {
return JiemamyPlugin.getExporterResolver().getInstance(fqcn);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,13 +25,11 @@
/**
* Eclipse環境においての{@link Importer}インスタンス取得戦略クラス。
+ *
* @author daisuke
*/
public class EclipseImporterProvider implements InstanceProvider<Importer> {
- /**
- * {@inheritDoc}
- */
public Importer getInstance(String fqcn) {
try {
return JiemamyPlugin.getImporterResolver().getInstance(fqcn);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/Images.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/Images.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/Images.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -21,7 +21,7 @@
/**
* 画像リソースのキークラス。
*
- * TODO NLSクラスで実装？
+ * <p>TODO NLSクラスで実装？</p>
*
* @author daisuke
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -46,6 +46,7 @@
/**
* Jiemamy Eclipse Pluginクラス。
+ *
* @author daisuke
*/
public class JiemamyPlugin extends AbstractUIPlugin {
@@ -189,9 +190,6 @@
plugin.getLog().log(status);
}
- /**
- * {@inheritDoc}
- */
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -203,9 +201,6 @@
validatorResolver = new ExtensionResolver<ModelValidator>(PLUGIN_ID, "validators", "dialect", "class");
}
- /**
- * {@inheritDoc}
- */
@Override
public void stop(BundleContext context) throws Exception {
dialectResolver = null;
@@ -217,9 +212,6 @@
super.stop(context);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeImageRegistry(ImageRegistry registry) {
// Display display = Display.getCurrent();
@@ -275,6 +267,7 @@
/**
* TODO for daisuke
+ *
* @param display
*/
private void setupImageManager(Display display) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/AutoLayoutAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -71,9 +71,6 @@
super("Auto Layout", viewer);
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
RootModel rootModel = (RootModel) getViewer().getContents().getModel();
@@ -195,9 +192,6 @@
oldY = layout.y;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
@@ -212,9 +206,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ChangeNodeBackgroundColorAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,9 +49,6 @@
super("menu.color", viewer); // RESOURCE
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
RootModel rootModel = (RootModel) getViewer().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -64,9 +64,6 @@
this.editor = editor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
RootModel rootModel = (RootModel) getViewer().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,9 +44,6 @@
super("action.fit", viewer); // RESOURCE
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
RootModel rootModel = (RootModel) getViewer().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -64,9 +64,6 @@
this.editor = editor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
RootModel rootModel = (RootModel) getViewer().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/PropertyAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/PropertyAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/PropertyAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,9 +37,6 @@
super("menu.property", viewer); // RESOURCE
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
// TODO 現状、その時フォーカスされているFigureのEditPartを取得している。
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/SaveDiagramImageAction.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -90,9 +90,6 @@
this.editor = editor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void run() {
if (prepare()) {
@@ -183,18 +180,12 @@
setWindowTitle("Graphic");
}
- /**
- * {@inheritDoc}
- */
@Override
public void addPages() {
page = new GraphicWizardPage(project);
addPage(page);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean performFinish() {
IPath pathx = page.getOutputFolderResource().getProjectRelativePath();
@@ -233,9 +224,6 @@
formatList.add(new ImageFileFormat("Windows ICO file format", "ico", SWT.IMAGE_ICO));
}
- /**
- * {@inheritDoc}
- */
@Override
public void createControl(Composite parent) {
super.createControl(parent);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -105,10 +105,12 @@
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.RootModelUtil;
/**
* ERダイアグラムエディタ。
+ *
* @author daisuke
*/
public class DiagramEditor extends GraphicalEditorWithFlyoutPalette implements IResourceChangeListener, JiemamyEditor {
@@ -159,7 +161,7 @@
public DiagramEditor() {
setEditDomain(new DefaultEditDomain(this));
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- logger.debug("constructed - single");
+ logger.debug(LogMarker.LIFECYCLE, "constructed - single");
}
/**
@@ -171,12 +173,9 @@
public DiagramEditor(RootModel rootModel, int tabIndex) {
// TODO Auto-generated constructor stub
this.tabIndex = tabIndex;
- logger.debug("constructed - multi");
+ logger.debug(LogMarker.LIFECYCLE, "constructed - multi");
}
- /**
- * {@inheritDoc}
- */
@Override
public void commandStackChanged(EventObject event) {
if (isDirty()) {
@@ -191,19 +190,13 @@
super.commandStackChanged(event);
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
super.dispose();
- logger.debug("disposed");
+ logger.debug(LogMarker.LIFECYCLE, "disposed");
}
- /**
- * {@inheritDoc}
- */
@Override
public void doSave(IProgressMonitor monitor) {
ByteArrayOutputStream out = null;
@@ -224,9 +217,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void doSaveAs() {
Shell shell = getSite().getWorkbenchWindow().getShell();
@@ -288,6 +278,7 @@
/**
* {@link RootModel}を取得する。
+ *
* @return エディタのルートモデル
*/
public RootModel getRootModel() {
@@ -318,7 +309,7 @@
});
- logger.debug("initialized");
+ logger.debug(LogMarker.LIFECYCLE, "initialized");
}
@Override
@@ -365,7 +356,7 @@
JmContributor contributor = (JmContributor) getEditorSite().getActionBarContributor();
contributor.selectCombo(rootModel);
// Thanks to Naokiさん
- logger.debug("setFocus");
+ logger.debug(LogMarker.LIFECYCLE, "setFocus");
}
/**
@@ -700,7 +691,7 @@
*/
protected void initializeOutlineViewer() {
// グラフィカル・エディタのルート・モデルをツリー・ビューワにも設定
- setContents(getRootModel());
+ setContents(rootModel);
}
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorPaletteFactory.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -53,6 +53,7 @@
/**
* エディタパレットを生成する。
+ *
* @return 生成したエディタパレット
*/
public static PaletteRoot createPalette() {
@@ -129,18 +130,18 @@
}
private static PaletteContainer createEntityDrawer(PaletteRoot palette) {
- PaletteDrawer drawer = new PaletteDrawer("palette.entity"); // RESOURCE
+ PaletteDrawer drawer = new PaletteDrawer("エンティティ"); // RESOURCE
CombinedTemplateCreationEntry tableCreationEntry =
- new CombinedTemplateCreationEntry("palette.entity.table", // RESOURCE
- "palette.entity.table.desc", // RESOURCE
+ new CombinedTemplateCreationEntry("テーブル", // RESOURCE
+ "新しいテーブルを作成します", // RESOURCE
new JiemamyModelCreationFactory(TableModel.class), imageRegistry
.getDescriptor(Images.BUTTON_TABLE), imageRegistry.getDescriptor(Images.BUTTON_TABLE));
drawer.add(tableCreationEntry);
CombinedTemplateCreationEntry viewCreationEntry =
- new CombinedTemplateCreationEntry("palette.entity.view", // RESOURCE
- "palette.entity.view.desc", // RESOURCE
+ new CombinedTemplateCreationEntry("ビュー", // RESOURCE
+ "新しいビューを作成します。", // RESOURCE
new JiemamyModelCreationFactory(ViewModel.class), imageRegistry
.getDescriptor(Images.BUTTON_VIEW), imageRegistry.getDescriptor(Images.BUTTON_VIEW));
drawer.add(viewCreationEntry);
@@ -149,11 +150,11 @@
}
private static PaletteContainer createOtherDrawer(PaletteRoot palette) {
- PaletteDrawer drawer = new PaletteDrawer("palette.other"); // RESOURCE
+ PaletteDrawer drawer = new PaletteDrawer("その他"); // RESOURCE
CombinedTemplateCreationEntry stickyCreationEntry =
- new CombinedTemplateCreationEntry("palette.other.sticky", // RESOURCE
- "palette.other.sticky.desc", // RESOURCE
+ new CombinedTemplateCreationEntry("メモ", // RESOURCE
+ "新しいメモを作成します。", // RESOURCE
new JiemamyModelCreationFactory(StickyModel.class), imageRegistry
.getDescriptor(Images.BUTTON_VIEW), imageRegistry.getDescriptor(Images.BUTTON_VIEW));
drawer.add(stickyCreationEntry);
@@ -162,11 +163,11 @@
}
private static PaletteContainer createRelationDrawer(PaletteRoot palette) {
- PaletteDrawer drawer = new PaletteDrawer("palette.relation"); // RESOURCE
+ PaletteDrawer drawer = new PaletteDrawer("コネクション"); // RESOURCE
ConnectionCreationToolEntry foreignKeyCreationEntry =
- new ConnectionCreationToolEntry("palette.relation.foreignKey", // RESOURCE
- "palette.relation.foreignKey.desc", // RESOURCE
+ new ConnectionCreationToolEntry("外部キー", // RESOURCE
+ "新しい外部キーを定義します。", // RESOURCE
new JiemamyModelCreationFactory(ForeignKeyModel.class), imageRegistry
.getDescriptor(Images.BUTTON_FK), imageRegistry.getDescriptor(Images.BUTTON_FK));
drawer.add(foreignKeyCreationEntry);
@@ -183,6 +184,7 @@
/**
* Jiemamyのモデルインスタンスを生成するファクトリ。
+ *
* @author daisuke
*/
private static class JiemamyModelCreationFactory implements CreationFactory {
@@ -192,24 +194,19 @@
/**
* インスタンスを生成する。
+ *
* @param type
*/
public JiemamyModelCreationFactory(Class<? extends JiemamyElement> type) {
this.type = type;
}
- /**
- * {@inheritDoc}
- */
public Object getNewObject() {
JiemamyEditor activeEditor = (JiemamyEditor) EditorUtil.getActiveEditor();
RootModel rootModel = activeEditor.getRootModel();
return rootModel.getJiemamy().getFactory().newModel(type);
}
- /**
- * {@inheritDoc}
- */
public Object getObjectType() {
return type;
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayPlace.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayPlace.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayPlace.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* 文字列の表示場所（用途）を表す。
+ *
* @author daisuke
*/
public enum DisplayPlace {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayStatus.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayStatus.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayStatus.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,6 +23,7 @@
/**
* ディスプレイモードを表す型。
+ *
* @author daisuke
*/
public enum DisplayStatus {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayTarget.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayTarget.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DisplayTarget.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* モデルの何を表示するのかを表す。
+ *
* @author daisuke
*/
public enum DisplayTarget {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -61,6 +61,7 @@
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
+import org.jiemamy.utils.LogMarker;
/**
* エディタのコントリビュータ。
@@ -206,8 +207,8 @@
cmbDisplayStatus.addSelectionListener(new ComboSelectionListener());
IEditorPart editor = EditorUtil.getActiveEditor();
- if (editor instanceof DiagramEditor) {
- RootModel rootModel = ((DiagramEditor) editor).getRootModel();
+ if (editor instanceof JiemamyEditor) {
+ RootModel rootModel = ((JiemamyEditor) editor).getRootModel();
if (rootModel != null) {
selectCombo(rootModel);
}
@@ -223,7 +224,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
- logger.debug("DisplayStatus changed");
+ logger.debug(LogMarker.LIFECYCLE, "DisplayStatus changed");
int index = cmbDisplayStatus.getSelectionIndex();
if (index == -1) {
return;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,6 +49,7 @@
/**
* インスタンスを生成する。
+ *
* @param name 作成するコンテナの名前
* @param jiemamy
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -63,28 +64,24 @@
/**
* childrenを取得する。
+ *
* @return children
*/
public List<Object> getChildren() {
return children;
}
- /**
- * {@inheritDoc}
- */
public UUID getId() {
return id;
}
- /**
- * {@inheritDoc}
- */
public Jiemamy getJiemamy() {
return jiemamy;
}
/**
* コンテナ名を取得する。
+ *
* @return コンテナ名
*/
public String getName() {
@@ -93,15 +90,13 @@
/**
* コンテナが持つ子モデルを設定する。
+ *
* @param children コンテナが持つ子モデル
*/
public void setChildren(List<Object> children) {
this.children = children;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return ClassUtils.getShortClassName(this.getClass()) + "[" + name + "]";
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -79,18 +79,12 @@
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
super.dispose();
}
- /**
- * {@inheritDoc}
- */
@Override
public void doSave(IProgressMonitor monitor) {
ByteArrayOutputStream out = null;
@@ -114,9 +108,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void doSaveAs() {
Shell shell = getSite().getWorkbenchWindow().getShell();
@@ -169,15 +160,13 @@
/**
* {@link RootModel}を取得する。
+ *
* @return エディタのルートモデル
*/
public RootModel getRootModel() {
return rootModel;
}
- /**
- * {@inheritDoc}
- */
@Override
public void init(IEditorSite site, IEditorInput input) throws PartInitException {
super.init(site, input);
@@ -209,17 +198,11 @@
setPartName(input.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isSaveAsAllowed() {
return true;
}
- /**
- * {@inheritDoc}
- */
public void resourceChanged(IResourceChangeEvent event) {
// TODO Auto-generated method stub
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -58,9 +58,6 @@
this.newColor = newColor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
@@ -68,9 +65,6 @@
presentation.getFigureProfiles().get(nodeAdapter).setColor(newColor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.JmPointUtil;
+import org.jiemamy.utils.LogMarker;
/**
* ノードの位置・サイズ変更コマンド
@@ -63,6 +64,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @param nodeAdapter
* @param rectangle
@@ -88,6 +90,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @param nodeAdapter 変更対象のエンティティ
* @param rectangle constraint
@@ -98,12 +101,9 @@
this(rootModel, nodeAdapter, ConvertUtil.convert(rectangle), viewer);
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
- logger.debug("execute");
+ logger.debug(LogMarker.LIFECYCLE, "execute");
// 本体の移動
jiemamyFacade.changeNodeConstraint(Migration.DIAGRAM_INDEX, nodeAdapter, constraint);
@@ -115,9 +115,6 @@
shiftPosition(false);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
jiemamyFacade.undo();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -63,9 +63,6 @@
setShift(new JmPoint(shiftX, shiftY));
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
@@ -74,9 +71,6 @@
shiftPosition(false);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -56,6 +56,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @param connection 作成するコネクションモデル
*/
@@ -66,9 +67,6 @@
target = connection.getTarget();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canExecute() {
if (source == null || target == null) {
@@ -100,9 +98,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
if (connection.unwrap() != null) {
@@ -145,9 +140,6 @@
// connection.setTarget(target);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
if (connection.unwrap() != null) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -61,9 +61,6 @@
jiemamyFacade = new JiemamyViewFacadeImpl(model.getJiemamy());
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
if (model instanceof EntityModel) {
@@ -78,9 +75,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
jiemamyFacade.undo();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -56,9 +56,6 @@
this.index = index;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
@@ -68,9 +65,6 @@
presentation.getConnectionLayouts().get(relation).remove(index);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -59,9 +59,6 @@
targetNode = nodeAdapter;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
sourceConnections = CollectionsUtil.newArrayList(targetNode.getSourceConnections());
@@ -78,9 +75,6 @@
rootModel.getEntities().remove(targetNode);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DeleteRelationCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,18 +44,12 @@
this.relation = relation;
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
// FIXME
// rootModel.removeConnection(relation);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
// FIXME
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -100,9 +100,6 @@
this.nodeAdapter = nodeAdapter;
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
if (nodeAdapter instanceof EntityModel) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditDatabaseModelCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,18 +54,12 @@
this.afterEditMemento = afterEditMemento;
}
- /**
- * {@inheritDoc}
- */
@Override
public void redo() {
// 編集後のスナップショットをオリジナルに反映
// BeanUtil.copyBean(targetModel, afterEditMemento, new DatabaseEditDialogMemento.DatabaseModelFilter());
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
// 編集前のスナップショットをオリジナルに反映
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditForeignKeyModelCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,18 +54,12 @@
this.afterEditMemento = afterEditMemento;
}
- /**
- * {@inheritDoc}
- */
@Override
public void redo() {
// 編集後のスナップショットをオリジナルに反映
// BeanUtil.copyBean(targetModel, afterEditMemento, new ForeignKeyEditDialogMemento.FkModelFilter());
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
// 編集前のスナップショットをオリジナルに反映
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditTableModelCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,18 +54,12 @@
this.afterEditMemento = afterEditMemento;
}
- /**
- * {@inheritDoc}
- */
@Override
public void redo() {
// 編集後のスナップショットをオリジナルに反映
// BeanUtil.copyBean(targetModel, afterEditMemento, new TableEditDialogMemento.TableModelFilter());
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
// 編集前のスナップショットをオリジナルに反映
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/EditViewModelCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -54,18 +54,12 @@
this.afterEditMemento = afterEditMemento;
}
- /**
- * {@inheritDoc}
- */
@Override
public void redo() {
// 編集後のスナップショットをオリジナルに反映
// BeanUtil.copyBean(targetModel, afterEditMemento, new ViewEditDialogMemento.ViewModelFilter());
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
// 編集前のスナップショットをオリジナルに反映
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,6 +48,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel
* @param relation
* @param newLocation
@@ -69,9 +70,6 @@
setShift(new JmPoint(shiftX, shiftY));
}
- /**
- * {@inheritDoc}
- */
@Override
public void execute() {
DiagramPresentations diagramPresentations = rootModel.getAdapter(DiagramPresentations.class);
@@ -80,9 +78,6 @@
shiftPosition(false);
}
- /**
- * {@inheritDoc}
- */
@Override
public void undo() {
shiftPosition(true);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/command/MovePositionCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -45,6 +45,7 @@
/**
* shiftを取得する。
+ *
* @return shift
*/
public JmPoint getShift() {
@@ -53,6 +54,7 @@
/**
* shiftを設定する。
+ *
* @param shift shift
*/
public void setShift(JmPoint shift) {
@@ -61,6 +63,7 @@
/**
* ダイアグラムを全体的に移動させる。
+ *
* @param negative 正方向に移動させる場合{@code true}、負方向の場合{@code false}
*/
protected void shiftPosition(boolean negative) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,6 +48,7 @@
import org.jiemamy.model.attribute.constraint.ForeignKeyModel.MatchType;
import org.jiemamy.model.attribute.constraint.ForeignKeyModel.ReferentialAction;
import org.jiemamy.model.entity.TableModel;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.AttributeUtil;
import org.jiemamy.utils.model.ForeignKeyUtil;
import org.jiemamy.utils.model.KeyConstraintUtil;
@@ -111,9 +112,6 @@
pkColumnLabels = new ArrayList<Label>(referenceKeys.size());
}
- /**
- * {@inheritDoc}
- */
@Override
public int open() {
int result = super.open();
@@ -225,7 +223,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
- logger.debug("cmbReferenceKey selected");
+ logger.debug(LogMarker.LIFECYCLE, "cmbReferenceKey selected");
// TODO
// Control[] children = group.getChildren();
// for (Control control : children) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDataSetTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDataSetTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDataSetTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -59,6 +59,7 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.dataset.DataSetModel;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
/**
* データベース編集ダイアログの「データセット」タブ。
@@ -109,7 +110,7 @@
public void commandExecuted(Command command) {
- logger.debug("DataSetContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "DataSetContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(TableModel.P_ENTITY_TABLE_CHECKS)) {
dataSetEditor.refreshTable();
// } else if (evt.getPropertyName().equals(CheckConstraintModel.P_CHECK_NAME)) {
@@ -130,7 +131,7 @@
@Override
public void dispose() {
- logger.debug("DataSetContentProvider: disposed");
+ logger.debug(LogMarker.LIFECYCLE, "DataSetContentProvider: disposed");
// tableModel.removePropertyChangeListener(this);
// for (CheckConstraintModel check : tableModel.getChecks()) {
// ((AbstractModel) check).removePropertyChangeListener(this);
@@ -144,7 +145,7 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("DataSetContentProvider: input changed");
+ logger.debug(LogMarker.LIFECYCLE, "DataSetContentProvider: input changed");
logger.trace("oldInput: " + oldInput);
logger.trace("newInput: " + newInput);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -76,6 +76,7 @@
import org.jiemamy.model.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.RootModelUtil;
/**
@@ -141,7 +142,7 @@
public void commandExecuted(Command command) {
- logger.debug("DomainContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "DomainContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(RootModel.P_DB_DOMAINS)) {
domainEditor.refreshTable(); // レコードの変更を反映させる。
// } else if (evt.getSource() instanceof DefinitionModel) {
@@ -158,7 +159,7 @@
@Override
public void dispose() {
- logger.debug("DomainContentProvider: disposed");
+ logger.debug(LogMarker.LIFECYCLE, "DomainContentProvider: disposed");
// rootModel.removePropertyChangeListener(this);
// for (DomainModel domain : rootModel.getDomains()) {
// domain.removePropertyChangeListener(this);
@@ -172,9 +173,9 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("DomainContentProvider: input changed");
- logger.trace("oldInput: " + oldInput);
- logger.trace("newInput: " + newInput);
+ logger.debug(LogMarker.LIFECYCLE, "DomainContentProvider: input changed");
+ logger.trace(LogMarker.LIFECYCLE, "oldInput: " + oldInput);
+ logger.trace(LogMarker.LIFECYCLE, "newInput: " + newInput);
this.viewer = viewer;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogCheckTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogCheckTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogCheckTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -57,6 +57,7 @@
import org.jiemamy.model.attribute.constraint.TableCheckModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.TableUtil;
/**
@@ -108,7 +109,7 @@
public void commandExecuted(Command command) {
- logger.debug("CheckContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "CheckContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(TableModel.P_ENTITY_TABLE_CHECKS)) {
checkEditor.refreshTable();
// } else if (evt.getPropertyName().equals(CheckConstraintModel.P_CHECK_NAME)) {
@@ -129,7 +130,7 @@
@Override
public void dispose() {
- logger.debug("CheckContentProvider: disposed");
+ logger.debug(LogMarker.LIFECYCLE, "CheckContentProvider: disposed");
// tableModel.removePropertyChangeListener(this);
// for (CheckConstraintModel check : tableModel.getChecks()) {
// ((AbstractModel) check).removePropertyChangeListener(this);
@@ -143,9 +144,9 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("CheckContentProvider: input changed");
- logger.trace("oldInput: " + oldInput);
- logger.trace("newInput: " + newInput);
+ logger.debug(LogMarker.LIFECYCLE, "CheckContentProvider: input changed");
+ logger.trace(LogMarker.LIFECYCLE, "oldInput: " + oldInput);
+ logger.trace(LogMarker.LIFECYCLE, "newInput: " + newInput);
this.viewer = viewer;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -81,6 +81,7 @@
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.ColumnUtil;
import org.jiemamy.utils.model.KeyConstraintUtil;
import org.jiemamy.utils.model.RootModelUtil;
@@ -153,7 +154,7 @@
public void commandExecuted(Command command) {
- logger.debug("ColumnContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "ColumnContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(TableModel.P_ENTITY_TABLE_COLUMNS)) {
columnEditor.refreshTable(); // レコードの変更を反映させる。
// } else if (evt.getSource() instanceof DefinitionModel) {
@@ -170,7 +171,7 @@
@Override
public void dispose() {
- logger.debug("ColumnContentProvider: disposed");
+ logger.debug(LogMarker.LIFECYCLE, "ColumnContentProvider: disposed");
// tableModel.removePropertyChangeListener(this);
// for (ColumnModel column : tableModel.getColumns()) {
// ((AbstractModel) column).removePropertyChangeListener(this);
@@ -184,9 +185,9 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("ColumnContentProvider: input changed");
- logger.trace("oldInput: " + oldInput);
- logger.trace("newInput: " + newInput);
+ logger.debug(LogMarker.LIFECYCLE, "ColumnContentProvider: input changed");
+ logger.trace(LogMarker.LIFECYCLE, "oldInput: " + oldInput);
+ logger.trace(LogMarker.LIFECYCLE, "newInput: " + newInput);
this.viewer = viewer;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -62,6 +62,7 @@
import org.jiemamy.model.index.IndexModel;
import org.jiemamy.model.index.IndexColumnModel.SortType;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.TableUtil;
/**
@@ -119,7 +120,7 @@
public void commandExecuted(Command command) {
- logger.debug("IndexColumnContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "IndexColumnContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(IndexModel.P_INDEX_COLUMNS)) {
indexColumnsTableEditor.refreshTable(); // インデックスカラムの変更を反映させる。
// } else if (evt.getSource() instanceof DefinitionModel) {
@@ -136,7 +137,7 @@
@Override
public void dispose() {
- logger.debug("IndexColumnContentProvider: dispose");
+ logger.debug(LogMarker.LIFECYCLE, "IndexColumnContentProvider: dispose");
/// tableModel.removePropertyChangeListener(this);
// int indexIndex = ((IndexTableEditor) indexesEditArea).getTable().getSelectionIndex();
// for (IndexColumnModel column : tableModel.getIndexes().get(indexIndex).getColumns()) {
@@ -151,9 +152,9 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("IndexColumnContentProvider: input changed");
- logger.trace("oldInput: " + oldInput);
- logger.trace("newInput: " + newInput);
+ logger.debug(LogMarker.LIFECYCLE, "IndexColumnContentProvider: input changed");
+ logger.trace(LogMarker.LIFECYCLE, "oldInput: " + oldInput);
+ logger.trace(LogMarker.LIFECYCLE, "newInput: " + newInput);
this.viewer = viewer;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogLocalKeyTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogLocalKeyTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogLocalKeyTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -68,6 +68,7 @@
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.ListUtils;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.TableUtil;
/**
@@ -119,7 +120,7 @@
public void commandExecuted(Command command) {
- logger.debug("LocalKeyContentProvider: commandExecuted");
+ logger.debug(LogMarker.LIFECYCLE, "LocalKeyContentProvider: commandExecuted");
// if (evt.getPropertyName().equals(TableModel.P_ENTITY_TABLE_UNIQUES)) {
localKeyEditor.refreshTable();
// } else if (evt.getPropertyName().equals(CheckConstraintModel.P_UNIQUE_NAME)) {
@@ -140,7 +141,7 @@
@Override
public void dispose() {
- logger.debug("LocalKeyContentProvider: dispose");
+ logger.debug(LogMarker.LIFECYCLE, "LocalKeyContentProvider: dispose");
// tableModel.removePropertyChangeListener(this);
// for (UniqueConstraintModel unique : tableModel.getUniques()) {
// ((AbstractModel) unique).removePropertyChangeListener(this);
@@ -154,9 +155,9 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- logger.debug("LocalKeyContentProvider: input changed");
- logger.trace("oldInput: " + oldInput);
- logger.trace("newInput: " + newInput);
+ logger.debug(LogMarker.LIFECYCLE, "LocalKeyContentProvider: input changed");
+ logger.trace(LogMarker.LIFECYCLE, "oldInput: " + oldInput);
+ logger.trace(LogMarker.LIFECYCLE, "newInput: " + newInput);
this.viewer = viewer;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogRecordTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogRecordTab.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogRecordTab.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -757,9 +757,6 @@
// super.dispose();
// }
//
-// /**
-// * {@inheritDoc}
-// */
// public JiemamyElement getTargetModel() {
// return (JiemamyElement) viewer.getInput();
// }
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DoubleClickSupport.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DoubleClickSupport.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DoubleClickSupport.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,13 @@
/**
* ダブルクリックをサポートするモデルのEditPartが実装するインターフェイス。
+ *
* @author daisuke
*/
public interface DoubleClickSupport {
/**
- * ダブルクリック時に呼び出されるメソッド
+ * ダブルクリック時に呼び出されるコールバックメソッド。
*/
void doubleClicked();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/EditDialogSupport.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/EditDialogSupport.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/EditDialogSupport.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* ダイアログによる編集をサポートするモデルのEditPartが実装するインターフェイス。
+ *
* @author daisuke
*/
public interface EditDialogSupport {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* アウトラインツリー用EditPartファクトリ。
+ *
* @author daisuke
*/
public class OutlineTreeEditPartFactory implements EditPartFactory {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractEntityEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,18 +44,12 @@
super(model);
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
NodeAdapter node = getModel();
EntityModel entity = node.unwrap();
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected DirectEditManager getDirectEditManager() {
EntityFigure figure = (EntityFigure) getFigure();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmConnectionEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -55,9 +55,6 @@
setModel(connection);
}
- /**
- * {@inheritDoc}
- */
@Override
public void activate() {
super.activate();
@@ -65,16 +62,10 @@
model.unwrap().getJiemamy().getEventBroker().addListener(this);
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
refreshVisuals();
}
- /**
- * {@inheritDoc}
- */
@Override
public void deactivate() {
ConnectionAdapter model = getModel();
@@ -82,26 +73,17 @@
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
@Override
public ConnectionAdapter getModel() {
return (ConnectionAdapter) super.getModel();
}
- /**
- * {@inheritDoc}
- */
@Override
public void refreshVisuals() {
super.refreshVisuals();
refreshBendpoints();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof ConnectionAdapter) {
@@ -111,9 +93,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.CONNECTION_ROLE, new JmRelationEditPolicy());
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractJmNodeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -45,6 +45,7 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.node.NodeAdapter;
+import org.jiemamy.utils.LogMarker;
/**
* {@link NodeAdapter}に対するDiagram用EditPart（コントローラ）の抽象クラス。
@@ -66,9 +67,6 @@
setModel(model);
}
- /**
- * {@inheritDoc}
- */
@Override
public void activate() {
super.activate();
@@ -77,16 +75,10 @@
// NodeAdapter nodeAdapter = (NodeAdapter) getModel();
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
refreshVisuals();
}
- /**
- * {@inheritDoc}
- */
@Override
public void deactivate() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
@@ -95,53 +87,32 @@
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
public void doubleClicked() {
- logger.info("doubleClicked");
+ logger.info(LogMarker.LIFECYCLE, "doubleClicked");
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
@Override
public NodeAdapter getModel() {
return (NodeAdapter) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) {
return new ChopboxAnchor(getFigure());
}
- /**
- * {@inheritDoc}
- */
public ConnectionAnchor getSourceConnectionAnchor(Request connection) {
return new ChopboxAnchor(getFigure());
}
- /**
- * {@inheritDoc}
- */
public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) {
return new ChopboxAnchor(getFigure());
}
- /**
- * {@inheritDoc}
- */
public ConnectionAnchor getTargetConnectionAnchor(Request connection) {
return new ChopboxAnchor(getFigure());
}
- /**
- * {@inheritDoc}
- */
@Override
public void performRequest(Request req) {
// Requestがモデル・プロパティの直接編集を要求するものかどうか
@@ -152,9 +123,6 @@
super.performRequest(req);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof NodeAdapter) {
@@ -164,9 +132,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.COMPONENT_ROLE, new JmComponentEditPolicy());
@@ -180,9 +145,6 @@
*/
protected abstract DirectEditManager getDirectEditManager();
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
// TODO キャスト安全性の根拠提示
@@ -191,9 +153,6 @@
return IteratorUtils.toList(connections.iterator());
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
// TODO キャスト安全性の根拠提示
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/EntityDirectEditManager.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/EntityDirectEditManager.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/EntityDirectEditManager.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,7 +37,7 @@
/**
- * コンストラクタ。
+ * インスタンスを生成する。
*
* @param source
* @param editorType
@@ -51,11 +51,6 @@
entity = node.unwrap();
}
- /**
- * Override method.
- *
- * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
- */
@Override
protected void initCellEditor() {
// CellEditorを表示する前に、現在モデルに設定されているテキストをCellEditorの初期値として設定する
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -40,6 +40,7 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.constraint.ForeignKeyModel;
import org.jiemamy.model.connection.ConnectionAdapter;
+import org.jiemamy.utils.LogMarker;
/**
* 外部キーモデルに対するDiagram用EditPart（コントローラ）。
@@ -61,27 +62,18 @@
super(connection);
}
- /**
- * {@inheritDoc}
- */
public void doubleClicked() {
openEditDialog();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
ConnectionAdapter connection = getModel();
ForeignKeyModel fkModel = connection.unwrap();
return fkModel;
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
- logger.debug("openEditDialog");
+ logger.debug(LogMarker.LIFECYCLE, "openEditDialog");
ConnectionAdapter connection = getModel();
ForeignKeyModel fkModel = connection.unwrap();
@@ -104,18 +96,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void refreshVisuals() {
super.refreshVisuals();
updateLabel();
}
- /**
- * {@inheritDoc}
- */
@Override
protected IFigure createFigure() {
PolylineConnection connection = new PolylineConnection();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,11 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.CollectionsUtil;
+import org.jiemamy.utils.LogMarker;
/**
* {@link RootModel}に対するDiagram用EditPart。
+ *
* @author daisuke
*/
public class RootEditPart extends AbstractGraphicalEditPart implements EditDialogSupport, IPropertyChangeListener,
@@ -68,12 +70,9 @@
setModel(rootModel);
}
- /**
- * {@inheritDoc}
- */
@Override
public void activate() {
- logger.debug("activated");
+ logger.debug(LogMarker.LIFECYCLE, "activated");
super.activate();
IPreferenceStore ps = JiemamyPlugin.getDefault().getPreferenceStore();
@@ -83,20 +82,14 @@
rootModel.getJiemamy().getEventBroker().addListener(this);
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
refreshChildren();
// JiemamyValidatorUtil.validate(getResource(), (RootModel) getModel());
}
- /**
- * {@inheritDoc}
- */
@Override
public void deactivate() {
- logger.debug("deactivate");
+ logger.debug(LogMarker.LIFECYCLE, "deactivate");
RootModel rootModel = getModel();
rootModel.getJiemamy().getEventBroker().removeListener(this);
@@ -106,27 +99,18 @@
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
@Override
public RootModel getModel() {
return (RootModel) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
RootModel rootModel = getModel();
return rootModel;
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
- logger.debug("openEditDialog");
+ logger.debug(LogMarker.LIFECYCLE, "openEditDialog");
RootModel rootModel = getModel();
RootEditDialog dialog = new RootEditDialog(getViewer().getControl().getShell(), rootModel);
@@ -147,16 +131,10 @@
}
}
- /**
- * {@inheritDoc}
- */
public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
setConnectionRouter(getFigure());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof RootModel) {
@@ -166,17 +144,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.LAYOUT_ROLE, new JmXYLayoutEditPolicy());
}
- /**
- * {@inheritDoc}
- */
@Override
protected IFigure createFigure() {
Layer figure = new Layer();
@@ -187,9 +159,6 @@
return figure;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<NodeAdapter> getModelChildren() {
RootModel rootModel = getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -42,6 +42,7 @@
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.StickyModel;
+import org.jiemamy.utils.LogMarker;
/**
* ビューモデルに対するDiagram用EditPart（コントローラ）。
@@ -62,19 +63,13 @@
super(model);
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
StickyModel stickyModel = (StickyModel) getModel();
return stickyModel;
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
- logger.debug("openEditDialog");
+ logger.debug(LogMarker.LIFECYCLE, "openEditDialog");
// TODO Dialog open!
// StickyModel stickyModel = (StickyModel) getModel();
@@ -97,9 +92,6 @@
// }
}
- /**
- * {@inheritDoc}
- */
@Override
protected IFigure createFigure() {
StickyFigure figure = new StickyFigure();
@@ -118,9 +110,6 @@
return figure;
}
- /**
- * {@inheritDoc}
- */
@Override
protected DirectEditManager getDirectEditManager() {
StickyFigure figure = (StickyFigure) getFigure();
@@ -128,9 +117,6 @@
return new StickyDirectEditManager(this, MultiLineTextCellEditor.class, locator);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
RootModel rootModel = (RootModel) getParent().getModel();
@@ -152,6 +138,7 @@
/**
* StickyFigureのアップデートを行う。
+ *
* @param figure
*/
@Override
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -52,6 +52,7 @@
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
+import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.TableUtil;
/**
@@ -72,11 +73,8 @@
super(model);
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
- logger.debug("openEditDialog");
+ logger.debug(LogMarker.LIFECYCLE, "openEditDialog");
RootModel rootModel = (RootModel) getParent().getModel();
NodeAdapter node = getModel();
@@ -100,9 +98,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected IFigure createFigure() {
TableFigure figure = new TableFigure();
@@ -122,9 +117,6 @@
return figure;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
super.refreshVisuals();
@@ -144,9 +136,6 @@
updateFigure(getFigure());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateFigure(IFigure figure) {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -44,6 +44,7 @@
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.NodeAdapter;
+import org.jiemamy.utils.LogMarker;
/**
* {@link ViewModel}に対するDiagram用EditPart（コントローラ）。
@@ -64,11 +65,8 @@
super(model);
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
- logger.debug("openEditDialog");
+ logger.debug(LogMarker.LIFECYCLE, "openEditDialog");
RootModel rootModel = (RootModel) getParent().getModel();
NodeAdapter node = getModel();
@@ -92,9 +90,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected IFigure createFigure() {
ViewFigure figure = new ViewFigure();
@@ -115,9 +110,6 @@
return figure;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
RootModel rootModel = (RootModel) getParent().getModel();
@@ -137,9 +129,6 @@
updateFigure(getFigure());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateFigure(IFigure figure) {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractEntityTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,9 +29,6 @@
public abstract class AbstractEntityTreeEditPart extends AbstractModelTreeEditPart implements EditDialogSupport,
DoubleClickSupport {
- /**
- * {@inheritDoc}
- */
public void doubleClicked() {
openEditDialog();
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AbstractModelTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,9 +30,6 @@
*/
public abstract class AbstractModelTreeEditPart extends AbstractTreeEditPart implements CommandListener {
- /**
- * {@inheritDoc}
- */
@Override
public void activate() {
super.activate();
@@ -41,16 +38,10 @@
rootModel.getJiemamy().getEventBroker().addListener(this);
}
- /**
- * {@inheritDoc}
- */
public void commandExecuted(Command command) {
refreshChildren();
}
- /**
- * {@inheritDoc}
- */
@Override
public void deactivate() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AttributeTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AttributeTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/AttributeTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -46,25 +46,16 @@
setModel(model);
}
- /**
- * {@inheritDoc}
- */
@Override
public AttributeModel getModel() {
return (AttributeModel) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
AttributeModel model = getModel();
return model;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof AttributeModel) {
@@ -74,17 +65,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.COMPONENT_ROLE, new JmTreeComponentEditPolicy());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/DomainTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/DomainTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/DomainTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,7 +32,8 @@
import org.jiemamy.model.datatype.DomainModel;
/**
- * DefinitionModelに対するTree用EditPart
+ * DefinitionModelに対するTree用EditPart。
+ *
* @author daisuke
*/
public class DomainTreeEditPart extends AbstractModelTreeEditPart {
@@ -46,25 +47,16 @@
setModel(domainModel);
}
- /**
- * {@inheritDoc}
- */
@Override
public DomainModel getModel() {
return (DomainModel) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
DomainModel model = getModel();
return model;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof DomainModel) {
@@ -74,17 +66,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.COMPONENT_ROLE, new JmTreeComponentEditPolicy());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ModelContainerEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -42,25 +42,16 @@
setModel(model);
}
- /**
- * {@inheritDoc}
- */
@Override
public ModelContainer getModel() {
return (ModelContainer) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
ModelContainer container = getModel();
return container;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof ModelContainer) {
@@ -70,9 +61,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<Object> getModelChildren() {
// ここで返された子モデルがツリーの子アイテムになる
@@ -80,9 +68,6 @@
return container.getChildren();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
ModelContainer model = getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/RootTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -32,6 +32,7 @@
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.entity.ViewModel;
import org.jiemamy.utils.CollectionsUtil;
+import org.jiemamy.utils.LogMarker;
/**
* RootModelに対するTree用EditPart
@@ -60,43 +61,28 @@
setModel(rootModel);
}
- /**
- * {@inheritDoc}
- */
@Override
public void activate() {
- logger.trace("activate");
+ logger.trace(LogMarker.LIFECYCLE, "activate");
super.activate();
}
- /**
- * {@inheritDoc}
- */
@Override
public void deactivate() {
- logger.trace("deactivate");
+ logger.trace(LogMarker.LIFECYCLE, "deactivate");
super.deactivate();
}
- /**
- * {@inheritDoc}
- */
@Override
public RootModel getModel() {
return (RootModel) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
RootModel rootModel = getModel();
return rootModel;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof RootModel) {
@@ -118,14 +104,11 @@
children.add(domainContainer);
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
// TODO キャスト安全性の根拠提示
protected List getModelChildren() {
- logger.trace("getModelChildren");
+ logger.trace(LogMarker.LIFECYCLE, "getModelChildren");
RootModel rootModel = getModel();
domainContainer.getChildren().clear();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,25 +49,16 @@
setModel(tableModel);
}
- /**
- * {@inheritDoc}
- */
@Override
public TableModel getModel() {
return (TableModel) super.getModel();
}
- /**
- * {@inheritDoc}
- */
public JiemamyElement getTargetModel() {
TableModel model = getModel();
return model;
}
- /**
- * {@inheritDoc}
- */
public void openEditDialog() {
TableModel tableModel = getModel();
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
@@ -88,9 +79,6 @@
// }
}
- /**
- * {@inheritDoc}
- */
@Override
public void setModel(Object model) {
if (model instanceof TableModel) {
@@ -100,17 +88,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createEditPolicies() {
installEditPolicy(EditPolicy.COMPONENT_ROLE, new JmTreeComponentEditPolicy());
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<AttributeModel> getModelChildren() {
// ここで返された子モデルがツリーの子アイテムになる
@@ -118,9 +100,6 @@
return tableModel.getAttributes();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void refreshVisuals() {
RootModel rootModel = (RootModel) getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmBendpointEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,9 +37,6 @@
*/
public class JmBendpointEditPolicy extends BendpointEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command getCreateBendpointCommand(BendpointRequest request) {
Point point = request.getLocation();
@@ -53,9 +50,6 @@
return command;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getDeleteBendpointCommand(BendpointRequest request) {
ConnectionAdapter connection = (ConnectionAdapter) getHost().getModel();
@@ -66,9 +60,6 @@
return command;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getMoveBendpointCommand(BendpointRequest request) {
RootModel rootModel = (RootModel) getHost().getParent().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmComponentEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,15 +27,12 @@
import org.jiemamy.model.node.NodeAdapter;
/**
- * エンティティののEditPolicy
+ * エンティティののEditPolicy。
*
* @author daisuke
*/
public class JmComponentEditPolicy extends ComponentEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command createDeleteCommand(GroupRequest deleteRequest) {
RootModel rootModel = (RootModel) getHost().getParent().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmDirectEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,9 +33,6 @@
*/
public class JmDirectEditPolicy extends DirectEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command getDirectEditCommand(DirectEditRequest request) {
RootModel rootModel = (RootModel) getHost().getRoot().getContents().getModel();
@@ -49,9 +46,6 @@
return command;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void showCurrentEditValue(DirectEditRequest request) {
// nothing to do
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmGraphicalNodeEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,15 +30,12 @@
import org.jiemamy.model.node.NodeAdapter;
/**
- * GraphicalNodeののEditPolicy
+ * GraphicalNodeののEditPolicy。
*
* @author daisuke
*/
public class JmGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
CreateConnectionCommand command = (CreateConnectionCommand) request.getStartCommand();
@@ -46,9 +43,6 @@
return command;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
JiemamyElement model = (JiemamyElement) request.getNewObject();
@@ -62,17 +56,11 @@
return command;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getReconnectSourceCommand(ReconnectRequest request) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getReconnectTargetCommand(ReconnectRequest request) {
return null;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmRelationEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,13 +28,11 @@
/**
* {@link ConnectionAdapter}のEditPolicy。
+ *
* @author daisuke
*/
public class JmRelationEditPolicy extends ConnectionEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command getDeleteCommand(GroupRequest request) {
RootModel rootModel = (RootModel) getHost().getRoot().getContents().getModel();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmTreeComponentEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,7 +30,7 @@
import org.jiemamy.model.node.NodeAdapter;
/**
- * アウトラインツリー用のEditPolicy
+ * アウトラインツリー用のEditPolicy。
*
* @author daisuke
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpolicy/JmXYLayoutEditPolicy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,23 +35,17 @@
import org.jiemamy.utils.model.EntityUtil;
/**
- * グラフィックXYレイアウトのEditPolicy
+ * グラフィックXYレイアウトのEditPolicy。
*
* @author daisuke
*/
public class JmXYLayoutEditPolicy extends XYLayoutEditPolicy {
- /**
- * {@inheritDoc}
- */
@Override
protected Command createAddCommand(EditPart child, Object constraint) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command createChangeConstraintCommand(EditPart child, Object constraint) {
RootModel rootModel = (RootModel) getHost().getModel();
@@ -60,9 +54,6 @@
return new ChangeNodeConstraintCommand(rootModel, nodeAdapter, rectangle, child.getViewer());
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getCreateCommand(CreateRequest request) {
JiemamyElement model = (JiemamyElement) request.getNewObject();
@@ -79,9 +70,6 @@
return new CreateNodeCommand(rootModel, model, (Rectangle) getConstraintFor(request));
}
- /**
- * {@inheritDoc}
- */
@Override
protected Command getDeleteDependantCommand(Request request) {
return null;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ColumnFigure.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* {@link ColumnModel}用Figure（ビュー）。
+ *
* @author daisuke
*/
public class ColumnFigure extends Label {
@@ -42,7 +43,7 @@
/**
- * コンストラクタ
+ * インスタンスを生成する。
*/
public ColumnFigure() {
super();
@@ -51,15 +52,13 @@
/**
* アンダーラインを引くかどうかを設定する。
+ *
* @param underline アンダーラインを引くかどうか
*/
public void setUnderline(boolean underline) {
this.underline = underline;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void paintFigure(Graphics graphics) {
super.paintFigure(graphics);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/CompartmentFigureBorder.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/CompartmentFigureBorder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/CompartmentFigureBorder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,20 +25,15 @@
/**
* {@link CompartmentFigure}用ボーダー。
+ *
* @author daisuke
*/
public class CompartmentFigureBorder extends AbstractBorder {
- /**
- * {@inheritDoc}
- */
public Insets getInsets(IFigure figure) {
return new Insets(1, 0, 2, 0);
}
- /**
- * {@inheritDoc}
- */
public void paint(IFigure figure, Graphics graphics, Insets insets) {
graphics.drawLine(getPaintRectangle(figure, insets).getTopLeft(), tempRect.getTopRight());
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/EntityFigure.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* {@link EntityModel}のFigure（ビュー）。
+ *
* @author daisuke
*/
public class EntityFigure extends Figure {
@@ -45,11 +46,10 @@
/**
* インスタンスを生成する。
+ *
* @param defaultColor デフォルト背景色
*/
public EntityFigure(Color defaultColor) {
- super();
-
entityNameLabel = new Label();
entityNameLabel.setBorder(new MarginBorder(2, 2, 0, 2));
@@ -61,6 +61,7 @@
/**
* カラム表示部分Figureを取得する。
+ *
* @return カラム表示部分Figure
*/
public CompartmentFigure getColumnFigure() {
@@ -69,6 +70,7 @@
/**
* デフォルト背景色を取得する。
+ *
* @return デフォルト背景色
*/
public Color getDefaultColor() {
@@ -77,6 +79,7 @@
/**
* エンティティ名表示部分Figureを取得する。
+ *
* @return エンティティ名表示部分Figure
*/
public Label getEntityNameLabel() {
@@ -85,6 +88,7 @@
/**
* 背景色を設定する。
+ *
* @param bgColor 背景色 {@code null}の場合、デフォルトの色を設定する。
*/
public void setBgColor(Color bgColor) {
@@ -100,6 +104,7 @@
/**
* エンティティ名を設定する。
+ *
* @param entityName エンティティ名
*/
public void setEntityName(String entityName) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -34,6 +34,7 @@
/**
* {@link StickyModel}用Figure（ビュー）。
+ *
* @author daisuke
*/
public class StickyFigure extends RoundedRectangle {
@@ -58,6 +59,7 @@
/**
* 内容文用Figureを取得する。
+ *
* @return 内容文用Figure
*/
public Label getContentsLabel() {
@@ -66,6 +68,7 @@
/**
* 背景色を設定する。
+ *
* @param bgColor 背景色
*/
public void setBgColor(Color bgColor) {
@@ -79,15 +82,13 @@
/**
* 付箋の内容文を設定する。
+ *
* @param contents 内容文
*/
public void setContents(String contents) {
contentsLabel.setText(contents);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void outlineShape(Graphics graphics) {
super.outlineShape(graphics);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure2.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure2.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/StickyFigure2.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,7 +27,7 @@
import org.jiemamy.eclipse.utils.SwtColorUtil;
/**
- * 付箋Figure2（候補）
+ * 付箋Figure2（候補）。
*
* @author daisuke
*/
@@ -39,7 +39,6 @@
/**
* インスタンスを生成する。
- *
*/
public StickyFigure2() {
setLayoutManager(new BorderLayout());
@@ -50,7 +49,7 @@
/**
* ラベルを取得する。
*
- * StickyFigureとインターフェイスを揃える為の…。
+ * <p>StickyFigureとインターフェイスを揃える為の…。</p>
*
* @return ラベル
*/
@@ -60,6 +59,7 @@
/**
* 背景色を設定する。
+ *
* @param bgColor 背景色
*/
public void setBgColor(Color bgColor) {
@@ -73,6 +73,7 @@
/**
* 付箋の内容文を設定する。
+ *
* @param contents 内容文
*/
public void setContents(String contents) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/TableFigure.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/TableFigure.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/TableFigure.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,7 +31,8 @@
import org.jiemamy.eclipse.utils.SwtColorUtil;
/**
- * TableのFigure
+ * TableのFigure。
+ *
* @author daisuke
*/
public class TableFigure extends EntityFigure {
@@ -46,7 +47,7 @@
/**
- * コンストラクタ
+ * インスタンスを生成する。
*/
public TableFigure() {
super(ColorConstants.tooltipBackground);
@@ -73,7 +74,7 @@
/**
* フィギュアを追加する。
*
- * 配列0に左（カラム名）、配列1に右（型）のFigureを渡す。
+ *<p> 配列0に左（カラム名）、配列1に右（型）のFigureを渡す。</p>
*
* @param figures 追加するフィギュアの配列
*/
@@ -86,9 +87,6 @@
add(figures[1]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void add(IFigure figure, Object constraint, int index) {
if (figure instanceof ColumnFigure) {
@@ -104,9 +102,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void remove(IFigure figure) {
if (figure instanceof ColumnFigure) {
@@ -145,6 +140,7 @@
/**
* テーブル名を設定する。
+ *
* @param tableName テーブル名
*/
public void setTableName(String tableName) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ViewFigure.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ViewFigure.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/figure/ViewFigure.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,7 +30,7 @@
import org.jiemamy.eclipse.utils.SwtColorUtil;
/**
- * ViewのFigure
+ * ViewのFigure。
*
* @author daisuke
*/
@@ -40,7 +40,7 @@
/**
- * コンストラクタ
+ * インスタンスを生成する。
*/
public ViewFigure() {
super(DEFAULT);
@@ -57,9 +57,6 @@
add(getColumnFigure());
}
- /**
- * {@inheritDoc}
- */
@Override
public void add(IFigure figure, Object constraint, int index) {
if (figure instanceof ColumnFigure) {
@@ -69,9 +66,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void remove(IFigure figure) {
if (figure instanceof ColumnFigure) {
@@ -91,7 +85,7 @@
/**
* 背景色を設定する。
*
- * 背景色に合わせて、文字色も調整する。
+ * <p>背景色に合わせて、文字色も調整する。</p>
*
* @param bgColor 背景色 {@code null}の場合、デフォルトの色を設定する。
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/MultiLineTextCellEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/MultiLineTextCellEditor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/MultiLineTextCellEditor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,14 +24,16 @@
import org.eclipse.swt.widgets.Composite;
/**
- * multi-lineテキスト用セルエディタ。 編集中に、CTRL+Enterで改行が入力できる。
+ * multi-lineテキスト用セルエディタ。
*
+ * <p>編集中に、CTRL+Enterで改行が入力できる。</p>
+ *
* @author daisuke
*/
public class MultiLineTextCellEditor extends TextCellEditor {
/**
- * コンストラクタ。
+ * インスタンスを生成する。
*
* @param parent
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/NodeCellEditorLocator.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/NodeCellEditorLocator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/tools/NodeCellEditorLocator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -35,7 +35,7 @@
/**
- * コンストラクタ。
+ * インスタンスを生成する。
*
* @param figure
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/ExtensionResolver.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/ExtensionResolver.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/ExtensionResolver.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,8 +33,8 @@
/**
* 拡張ポイントに設定された項目の読み出しを行うクラス。
*
+ * @param <T> 拡張クラスが実装すべきインターフェイス
* @author daisuke
- * @param <T> 拡張クラスが実装すべきインターフェイス
*/
public class ExtensionResolver<T> {
@@ -46,7 +46,9 @@
/**
* リゾルバを初期化する。 以前読み込んだ情報を全て破棄し、拡張ポイントを読み込み直す。
- * 識別子には id 属性を使用する。
+ *
+ * <p>識別子には id 属性を使用する。</p>
+ *
* @param pluginId プラグインID
* @param extensionPointName 拡張ポイント名
* @param extensionElementName 要素名
@@ -57,6 +59,7 @@
/**
* リゾルバを初期化する。 以前読み込んだ情報を全て破棄し、拡張ポイントを読み込み直す。
+ *
* @param pluginId プラグインID
* @param extensionPointName 拡張ポイント名
* @param extensionElementName 要素名
@@ -78,6 +81,7 @@
/**
* 拡張ポイントのclass属性に設定された全ての実装クラスのインスタンスをリストで取得する。
+ *
* @return 実装クラスのインスタンスリスト
*/
public List<T> getAllInstance() {
@@ -86,6 +90,7 @@
/**
* 拡張ポイントに設定された全ての実装クラスのインスタンスをリストで取得する。
+ *
* @param classAttributeName 拡張ポイント定義の属性名
* @return 実装クラスのインスタンスリスト
*/
@@ -107,6 +112,7 @@
/**
* 拡張のMapを取得する。
+ *
* @return フィルタのファクトリ
*/
public Map<String, IConfigurationElement> getExtensionConfigurationElements() {
@@ -115,6 +121,7 @@
/**
* 拡張定義のclass属性に設定されたクラスのインスタンスを取得する。
+ *
* @param identifier 拡張識別子
* @return インスタンス
* @throws CoreException
@@ -125,6 +132,7 @@
/**
* 拡張定義に設定されたクラスのインスタンスを取得する。
+ *
* @param identifier 拡張識別子
* @param classAttributeName クラス名が記述されている属性名
* @return インスタンス
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/extension/validator/ModelValidator.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,12 +24,14 @@
/**
* 検証ロジックインターフェイス。
+ *
* @author daisuke
*/
public interface ModelValidator {
/**
* モデルの検証を行う。
+ *
* @param resource
* @param rootModel
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/ConnectionRouters.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* コネクションルータの種類。
+ *
* @author daisuke
*/
public enum ConnectionRouters {
@@ -78,6 +79,7 @@
/**
* ラベルからenumインスタンスを取得する。
+ *
* @param label ラベル
* @return enumインスタンス
* @throws IllegalArgumentException 該当するenumインスタンスが見つからない場合
@@ -93,6 +95,7 @@
/**
* labelsを取得する。
+ *
* @return LABELS
*/
public static String[] getLabels() {
@@ -116,6 +119,7 @@
/**
* ラベル文字列を取得する。
+ *
* @return ラベル文字列
*/
public String getLabel() {
@@ -124,6 +128,7 @@
/**
* コネクションルータを取得する。
+ *
* @param figure
* @return コネクションルータ
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreference.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreference.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreference.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,18 +28,21 @@
/**
* コネクションルータの種類を取得する。
+ *
* @return コネクションルータの種類
*/
ConnectionRouters getConnectionRouter();
/**
* プリファレンスストアを取得する。
+ *
* @return プリファレンスストア
*/
IPreferenceStore getPreferenceStore();
/**
* 外部キー接続時に、参照側テーブルに被参照テーブルの主キーと同名のカラムを作成するかどうかを取得する。
+ *
* @return 外部キー接続時に、参照側テーブルに被参照テーブルの主キーと同名のカラムを作成するかどうか
*/
boolean isCreateColumnWithFk();
@@ -51,12 +54,14 @@
/**
* コネクションルータの種類を設定する。
+ *
* @param connectionRouters コネクションルータの種類
*/
void setConnectionRouter(ConnectionRouters connectionRouters);
/**
* 外部キー接続時に、参照側テーブルに被参照テーブルの主キーと同名のカラムを作成するかどうかを設定する。
+ *
* @param createColumnWithFk 外部キー接続時に、参照側テーブルに被参照テーブルの主キーと同名のカラムを作成するかどうか
*/
void setCreateColumnWithFk(boolean createColumnWithFk);
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceImpl.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceImpl.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceImpl.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* 設定の読み書き実装クラス。
+ *
* @author daisuke
*/
public class JiemamyPreferenceImpl implements JiemamyPreference {
@@ -32,53 +33,32 @@
private IPreferenceStore ps = JiemamyPlugin.getDefault().getPreferenceStore();
- /**
- * {@inheritDoc}
- */
public ConnectionRouters getConnectionRouter() {
return ConnectionRouters.valueOf(ps.getString(PreferenceKey.CONNECTION_ROUTER.toString()));
}
- /**
- * {@inheritDoc}
- */
public IPreferenceStore getPreferenceStore() {
return ps;
}
- /**
- * {@inheritDoc}
- */
public boolean isCreateColumnWithFk() {
return ps.getBoolean(PreferenceKey.CREATE_COLUMNS_WITH_FK.toString());
}
- /**
- * {@inheritDoc}
- */
public void loadDefaultValues() {
ps.setValue(PreferenceKey.CREATE_COLUMNS_WITH_FK.toString(), PreferenceKey.CREATE_COLUMNS_WITH_FK
.getDefaultBoolean());
ps.setValue(PreferenceKey.CONNECTION_ROUTER.toString(), PreferenceKey.CONNECTION_ROUTER.getDefaultString());
}
- /**
- * {@inheritDoc}
- */
public void setConnectionRouter(ConnectionRouters connectionRouters) {
ps.setValue(PreferenceKey.CONNECTION_ROUTER.toString(), connectionRouters.name());
}
- /**
- * {@inheritDoc}
- */
public void setCreateColumnWithFk(boolean createColumnOnFk) {
ps.setValue(PreferenceKey.CREATE_COLUMNS_WITH_FK.toString(), createColumnOnFk);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StrBuilder sb = new StrBuilder();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceInitializer.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceInitializer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferenceInitializer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,13 +25,11 @@
/**
* Jiemamy Eclipse Plugin のプリファレンス値に対するデフォルト情報を与える。
+ *
* @author daisuke
*/
public class JiemamyPreferenceInitializer extends AbstractPreferenceInitializer {
- /**
- * {@inheritDoc}
- */
@Override
public void initializeDefaultPreferences() {
// String workspacePath = ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toOSString();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferencePage.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferencePage.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/JiemamyPreferencePage.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -51,16 +51,10 @@
private JiemamyPreference pref = JiemamyPlugin.getPreference();
- /**
- * {@inheritDoc}
- */
public void init(IWorkbench workbench) {
// nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean performOk() {
storeValues();
@@ -68,9 +62,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Control createContents(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
@@ -99,9 +90,6 @@
return composite;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void performDefaults() {
super.performDefaults();
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/preference/PreferenceKey.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* Preferenceのキーリスト。
+ *
* @author daisuke
*/
public enum PreferenceKey {
@@ -51,6 +52,7 @@
/**
* インスタンスを生成する。
+ *
* @param key 保存キー
*/
PreferenceKey(String key) {
@@ -59,6 +61,7 @@
/**
* インスタンスを生成する。
+ *
* @param key 保存キー
* @param defaultValue デフォルト値
*/
@@ -69,6 +72,7 @@
/**
* デフォルト値をbooleanとして取得する。
+ *
* @return デフォルト値
*/
public boolean getDefaultBoolean() {
@@ -77,6 +81,7 @@
/**
* デフォルト値をdoubleとして取得する。
+ *
* @return デフォルト値
*/
public double getDefaultDouble() {
@@ -85,22 +90,27 @@
/**
* デフォルト値をfloatとして取得する。
+ *
* @return デフォルト値
*/
public float getDefaultFloat() {
+
return this.<Float> getDefault();
}
/**
* デフォルト値をintとして取得する。
+ *
* @return デフォルト値
*/
public int getDefaultInt() {
+
return this.<Integer> getDefault();
}
/**
* デフォルト値をlongとして取得する。
+ *
* @return デフォルト値
*/
public long getDefaultLong() {
@@ -109,15 +119,13 @@
/**
* デフォルト値をStringとして取得する。
+ *
* @return デフォルト値
*/
public String getDefaultString() {
return getDefault();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return key;
@@ -125,6 +133,7 @@
/**
* デフォルト値を取得する。
+ *
* @param <T>
* @return デフォルト値
*/
Deleted: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/ControlArea.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/ControlArea.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/ControlArea.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -1,40 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/16
- *
- * 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.eclipse.ui;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * ダイアログ用コントロールエリアインターフェイス。
- *
- * @param <T>
- * @author daisuke
- */
-public interface ControlArea<T extends Composite> {
-
- /**
- * コントロールエリアを生成します。
- *
- * @param parent 親
- * @return 生成されたコントロールエリア
- */
- Control createControlArea(T parent);
-
-}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/FolderSelectWizardPage.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -49,7 +49,8 @@
import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
- * フォルダー選択ウィザードのページクラス
+ * フォルダー選択ウィザードのページクラス。
+ *
* @author daisuke
*/
public class FolderSelectWizardPage extends WizardPage {
@@ -63,6 +64,7 @@
/**
* インスタンスを生成する。
+ *
* @param project
* @param pageName
*/
@@ -72,6 +74,7 @@
/**
* インスタンスを生成する。
+ *
* @param project
* @param pageName
* @param defaultFolder
@@ -83,9 +86,6 @@
this.defaultFolder = defaultFolder;
}
- /**
- * {@inheritDoc}
- */
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout(3, false));
@@ -113,6 +113,7 @@
/**
* 出力先フォルダを取得する。
+ *
* @return 出力先フォルダ
*/
public File getOutputFolder() {
@@ -125,6 +126,7 @@
/**
* 出力先フォルダをリソースとして取得する。
+ *
* @return 出力先フォルダ
*/
public IResource getOutputFolderResource() {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/helper/TextSelectionAdapter.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/helper/TextSelectionAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/ui/helper/TextSelectionAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,7 +33,7 @@
/**
- * コンストラクタ。
+ * インスタンスを生成する。
*
* @param target
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/ConvertUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,13 +29,16 @@
/**
* JiemamyモデルのインスタンスとSWT/Draw2Dのインスタンスを相互変換する。
+ *
* @author daisuke
*/
public class ConvertUtil {
/**
* {@link Color}を{@link JmColor}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param color 変換元
* @return {@link JmColor}のインスタンス
*/
@@ -45,7 +48,9 @@
/**
* {@link JmPoint}を{@link Point}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param point 変換元
* @return {@link Point}のインスタンス
*/
@@ -55,7 +60,9 @@
/**
* {@link JmRectangle}を{@link Rectangle}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param rect 変換元
* @return {@link Rectangle}のインスタンス
*/
@@ -65,7 +72,9 @@
/**
* {@link Point}を{@link JmPoint}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param point 変換元
* @return {@link JmPoint}のインスタンス
*/
@@ -75,7 +84,9 @@
/**
* {@link Rectangle}を{@link JmRectangle}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param rect 変換元
* @return {@link JmRectangle}のインスタンス
*/
@@ -85,7 +96,9 @@
/**
* {@link RGB}を{@link JmColor}に変換する。
- * {@code null}を与えた場合、{@code null}を返す。
+ *
+ * <p>{@code null}を与えた場合、{@code null}を返す。</p>
+ *
* @param rgb 変換元
* @return {@link JmColor}のインスタンス
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/EditorUtil.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/EditorUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/EditorUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,12 +26,14 @@
/**
* EclipseのEditorに関連するユーティリティクラス。
+ *
* @author daisuke
*/
public final class EditorUtil {
/**
* 現在アクティブなEditorPartを取得する。
+ *
* @return EditorPart
*/
public static IEditorPart getActiveEditor() {
@@ -41,9 +43,6 @@
return page.getActiveEditor();
}
- /**
- * ユーティリティクラス。
- */
private EditorUtil() {
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/SwtColorUtil.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/SwtColorUtil.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/utils/SwtColorUtil.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* {@link Color}に対するユーティリティクラス。
+ *
* @author daisuke
*/
public class SwtColorUtil {
@@ -31,6 +32,7 @@
/**
* 色の明度を調べる。
+ *
* @param color 調査対象の色
* @return 明度が低い場合はtrue
*/
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -40,7 +40,8 @@
import org.jiemamy.model.RootModel;
/**
- * 新規ダイアグラムファイル作成ウィザード
+ * 新規ダイアグラムファイル作成ウィザード。
+ *
* @author daisuke
*/
public final class NewDiagramWizard extends Wizard implements INewWizard {
@@ -61,26 +62,17 @@
setWindowTitle("New Jiemamy Database Diagram"); // RESOURCE
}
- /**
- * {@inheritDoc}
- */
@Override
public void addPages() {
page = new NewDiagramWizardPage((IStructuredSelection) selection);
addPage(page);
}
- /**
- * {@inheritDoc}
- */
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.selection = selection;
this.workbench = workbench;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean performFinish() {
try {
@@ -125,17 +117,11 @@
// setFileName("jiemamy.jer");
}
- /**
- * {@inheritDoc}
- */
@Override
protected void createLinkTarget() {
// nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
protected InputStream getInitialContents() {
Jiemamy jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()));
@@ -154,9 +140,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validatePage() {
if (getFileExtension() == null) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -120,6 +120,7 @@
/**
* デフォルトの{@link JiemamyImplementation}実装のインスタンスを取得する。
+ *
* @return デフォルトのJiemamy実装
*/
private static JiemamyImplementation getDefaultImplementation() {
@@ -145,6 +146,7 @@
/**
* インスタンスを生成する。
+ *
* @param defaultImplementation デフォルトで使用するJiemamy実装
* @param dialectProvider デフォルトで使用する{@link Dialect}取得戦略
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
@@ -159,6 +161,7 @@
/**
* {@link RootModel}を{@link SqlStatement}のリストに変換する。
+ *
* @param rootModel 変換対象
* @param config
* @return {@link SqlStatement}のリスト
@@ -181,6 +184,7 @@
/**
* イベントブローカを取得する。
+ *
* @return イベントブローカ
*/
public EventBroker getEventBroker() {
@@ -201,6 +205,7 @@
/**
* 参照リゾルバを取得する。
+ *
* @return 参照リゾルバ
*/
public ReferenceResolver getReferenceResolver() {
@@ -209,6 +214,7 @@
/**
* シリアライザを取得する。
+ *
* @return シリアライザ
*/
public JiemamySerializer getSerializer() {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -45,12 +45,14 @@
/**
* Jiemamy実装を取得する。
+ *
* @return Jiemamy実装
*/
JiemamyImplementation getImplementation();
/**
* インスタンス空間に属する唯一の{@link RootModel}を取得する。存在しない場合は生成する。
+ *
* @return {@link RootModel}
*/
RootModel getRootModel();
@@ -73,18 +75,21 @@
/**
* 追加仕様のサポート状態を取得する。
+ *
* @return サポートされている追加仕様の{@link Set}
*/
Set<OptionalSpec> getSupportedSpecs();
/**
* インスタンス空間に属する唯一の{@link RootModel}が生成済みであるかどうか調べる。
+ *
* @return 生成済みであれば{@code true}
*/
boolean hasRootModel();
/**
* 新しいモデルビルダを生成する。
+ *
* @param <M> モデルの型
* @param <B> モデルビルダの型
* @param clazz 生成したいモデルの型
@@ -105,8 +110,6 @@
*
* <p>{@code null}を返してはならない。</p>
*
- * THINK 生成するのはモデルだけじゃない。BuiltinDataTypeとかも生成してる。
- *
* @param <T> 生成するモデルの種類を表す型
* @param clazz 生成するモデルの種類を表す型
* @return 生成されたモデル
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/ReferenceResolver.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/ReferenceResolver.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/ReferenceResolver.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,6 +23,7 @@
/**
* 参照オブジェクト({@link ElementReference})から実体({@link JiemamyElement})を解決する、参照リゾルバクラス。
+ *
* @author daisuke
* @see ElementReference
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* コマンドストリームの終了を表すコマンド。
+ *
* @author daisuke
*/
public interface CloseCommand extends JiemamyCommand {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* コマンド実行状況（どのタグが開いているか、など）を保持するクラス。
+ *
* @author daisuke
*/
public interface CommandContext {
/**
* {@link OpenCommand}を記録する。
+ *
* @param command {@link OpenCommand}
* @throws JiemamyCommandException
*/
@@ -33,6 +35,7 @@
/**
* {@link StartElementCommand}を記録する。
+ *
* @param command {@link StartElementCommand}
* @throws JiemamyCommandException
*/
@@ -40,6 +43,7 @@
/**
* {@link CloseCommand}を記録する。
+ *
* @param command {@link CloseCommand}
* @throws JiemamyCommandException
*/
@@ -47,6 +51,7 @@
/**
* {@link EndElementCommand}を記録する。
+ *
* @param command {@link EndElementCommand}
* @return この終了コマンドに対応する開始コマンド
* @throws JiemamyCommandException
@@ -55,12 +60,14 @@
/**
* コマンドストリームが開いている（OpenCommandを受け、CloseCommandを受けていない状態）かどうか調べる。
+ *
* @return コマンドストリームが開いていれば{@code true}
*/
boolean isOpen();
/**
* 直前に記録した{@link DataCommand}を取得する。
+ *
* @return 直前に記録した{@link DataCommand}
* @throws JiemamyCommandException
*/
@@ -68,6 +75,7 @@
/**
* {@link DataCommand}を記録する。
+ *
* @param command {@link DataCommand}
* @throws JiemamyCommandException
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* {@link JiemamyCommand}を適用する、行き先リソース。
+ *
* @author daisuke
*/
public interface CommandDestination {
/**
* オブジェクトに対してcommandを実行する。
+ *
* @param command 実行するコマンド
* @throws JiemamyCommandException
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* {@link JiemamyCommand}インスタンスを生成する元となるリソース。
+ *
* @author daisuke
*/
public interface CommandSource {
/**
* コマンドを取得する。
+ *
* @return コマンド
*/
JiemamyCommand getCommand();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* モデル操作の内容を表すコマンド。
+ *
* @author daisuke
*/
public interface DataCommand extends JiemamyCommand {
/**
* 操作内容を示す文字列を取得する。
+ *
* @return 文字列
*/
String getData();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,12 +22,14 @@
/**
* モデル操作の終了を表すコマンド。
+ *
* @author daisuke
*/
public interface EndElementCommand extends JiemamyCommand {
/**
* 完全修飾名を取得する。
+ *
* @return 完全修飾名
*/
QName getQName();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* Jiemamyのモデル操作をあらわすコマンドオブジェクト。
+ *
* @author daisuke
*/
public interface JiemamyCommand {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* コマンドの読み出し・書き出しに失敗した場合。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -34,6 +35,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public JiemamyCommandException(String message) {
@@ -42,6 +44,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
@@ -51,6 +54,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public JiemamyCommandException(Throwable cause) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,12 +22,14 @@
/**
* JiemamyModelの各種表現をcommand streamとして読み出す為のインターフェイス。
+ *
* @author daisuke
*/
public interface JiemamyCommandInputStream {
/**
* Command streamをcloseし、リソースを破棄する。
+ *
* @throws JiemamyCommandException
* @throws IllegalStateException Writerが既にcloseされていた場合
*/
@@ -35,6 +37,7 @@
/**
* 読み出せる次のコマンドがあるかどうか調べる。
+ *
* @return 次のコマンドがある場合{@code true}、無い場合{@code false}を返す
* @throws JiemamyCommandException
* @throws IllegalStateException Command streamが既にcloseされていた場合
@@ -43,6 +46,7 @@
/**
* 読み出せる次のコマンドを取得する。
+ *
* @return コマンド
* @throws JiemamyCommandException
* @throws NoSuchElementException 読み出せる次のコマンドが存在しない場合
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* Command streamをcloseし、リソースを破棄する。
+ *
* @throws JiemamyCommandException
* @throws IllegalStateException Command streamが既にcloseされていた場合
*/
@@ -36,6 +37,7 @@
/**
* コマンドの内容をモデルに書き出す。
+ *
* @param command コマンド
* @throws JiemamyCommandException
* @throws IllegalStateException コマンドの順番が規約に従っていなかった場合。
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* コマンドストリームの開始を表すコマンド。
+ *
* @author daisuke
*/
public interface OpenCommand extends JiemamyCommand {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,18 +24,21 @@
/**
* モデル操作の開始を表すコマンド。
+ *
* @author daisuke
*/
public interface StartElementCommand extends JiemamyCommand {
/**
* 属性マップを取得する。
+ *
* @return 属性マップ
*/
Map<QName, String> getAttributes();
/**
* 完全修飾名を取得する。
+ *
* @return 完全修飾名
*/
QName getQName();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportContext.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportContext.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportContext.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* エクスポートに関するコンテキスト情報。
+ *
* @author daisuke
*/
public interface ExportContext extends Context {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ExportException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* {@link Exporter}実行時に問題が発生した場合にスローされる例外。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -35,6 +36,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public ExportException(Exception cause) {
@@ -43,6 +45,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public ExportException(String message) {
@@ -51,6 +54,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* Jiemamyモデルから外部リソースに出力を行うインターフェイス。
+ *
* @author daisuke
*/
public interface Exporter {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportContext.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportContext.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportContext.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* インポートに関するコンテキスト情報インターフェイス。
+ *
* @author daisuke
*/
public interface ImportContext extends Context {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/ImportException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* {@link Importer}実行時に問題が発生した場合にスローされる例外。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -35,6 +36,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public ImportException(String message) {
@@ -43,6 +45,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
@@ -52,6 +55,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public ImportException(Throwable cause) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Importer.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Importer.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Importer.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* 外部リソースからJiemamyモデルに入力を行うインターフェイス。
+ *
* @author daisuke
*/
public interface Importer {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* DBメタデータの読み出し前後に行うべき処理を司るインターフェイス。
+ *
* @author daisuke
*/
public interface ConnectionAdvisor {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,12 +28,14 @@
/**
* データ型同士の対応関係（マッピング）を表現するクラス。
+ *
* @author daisuke
*/
public interface DataTypeResolver {
/**
* 型記述子からデータ型を解決する。
+ *
* @param dataType 型記述子
* @param resolver 参照リゾルバ
* @return 型名
@@ -43,6 +45,7 @@
/**
* 型名から型記述子を解決する。
+ *
* @param factory
* @param sqlType
* @param typeName 型名
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/Quoter.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/Quoter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/Quoter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* SQL文中の引用符処理を行うインターフェイス。
+ *
* @author daisuke
*/
public interface Quoter {
@@ -41,6 +42,7 @@
/**
* 引用の種類。
+ *
* @author daisuke
*/
public static enum QuoteKind {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,7 +23,7 @@
import org.jiemamy.model.JiemamyElement;
/**
- * モデルを編集するためのコマンドのインターフェース
+ * モデルを編集するためのコマンドのインターフェース。
*
* @author daisuke
* @author shin1ogawa
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/DriverNotFoundException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/DriverNotFoundException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/DriverNotFoundException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* JDBCドライバクラスが、JARファイル内から見つからなかった時にスローされる例外。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -31,6 +32,7 @@
/**
* インスタンスを生成する。
+ *
* @param className 見つからなかったドライバクラス名
*/
public DriverNotFoundException(String className) {
@@ -39,6 +41,7 @@
/**
* 見つからなかったドライバクラス名を取得する。
+ *
* @return ドライバクラス名
*/
public String getClassName() {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ElementNotFoundException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ElementNotFoundException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ElementNotFoundException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* 指定された名前の要素が見つからない時スローされる例外。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -32,6 +33,7 @@
/**
* インスタンスを生成する。
+ *
* @param fkModel 外部キーモデル
* @param referenceColumn 参照カラム
*/
@@ -41,6 +43,7 @@
/**
* インスタンスを生成する。
+ *
* @param rootModel ルートモデル
* @param entityName エンティティ名
*/
@@ -60,6 +63,7 @@
/**
* インスタンスを生成する。
+ *
* @param tableModel 検索対象親テーブル
* @param columnName カラム名
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/GenericModelingModeException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/GenericModelingModeException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/GenericModelingModeException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -21,7 +21,7 @@
/**
* Genericモデリング時に、SQLを取得しようとした時にスローされる例外。
*
- * @author daisuke
+ * @author daisuke
*/
@SuppressWarnings("serial")
public class GenericModelingModeException extends JiemamyException {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* SQL方言の実装が不正である時にスローされる例外。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -33,6 +34,7 @@
/**
* インスタンスを生成する。
+ *
* @param dialectClass
* @param message 例外メッセージ
*/
@@ -43,6 +45,7 @@
/**
* インスタンスを生成する。
+ *
* @param dialectClass
* @param cause 起因例外
*/
@@ -53,6 +56,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public IllegalDialectImplementationException(String message) {
@@ -61,6 +65,7 @@
/**
* 不正実装と判定されたSQL方言クラスを取得する。
+ *
* @return 不正実装と判定されたSQL方言クラス
*/
public Class<? extends Dialect> getDialectClass() {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalImplementationException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalImplementationException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/IllegalImplementationException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* 不正実装と判断された場合。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -31,6 +32,7 @@
/**
* インスタンスを生成する。
+ *
* @param target 不正実装だと考えられるオブジェクト
*/
public IllegalImplementationException(Object target) {
@@ -40,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param target
* @param message 例外メッセージ
*/
@@ -50,6 +53,7 @@
/**
* インスタンスを生成する。
+ *
* @param target 不正実装だと考えられるオブジェクト
* @param cause 起因例外
*/
@@ -59,6 +63,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ（不正実装されたオブジェクトを特定するための文字列）
*/
public IllegalImplementationException(String message) {
@@ -67,6 +72,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ（不正実装されたオブジェクトを特定するための文字列）
* @param cause 起因例外
*/
@@ -76,6 +82,7 @@
/**
* 不正実装と判定されたクラスを表すオブジェクトを取得する。
+ *
* @return 不正実装と判定されたクラスを表すオブジェクト
*/
public Object getTarget() {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public JiemamyException(String message) {
@@ -46,6 +47,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
@@ -55,6 +57,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public JiemamyException(Throwable cause) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyRuntimeException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyRuntimeException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/JiemamyRuntimeException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public JiemamyRuntimeException(String message) {
@@ -46,6 +47,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
@@ -55,6 +57,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public JiemamyRuntimeException(Throwable cause) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ModelConsistenceException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ModelConsistenceException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/ModelConsistenceException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* モデル整合性が崩れる操作を行った場合。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -34,6 +35,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public ModelConsistenceException(String message) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/TooManyElementsException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/TooManyElementsException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/TooManyElementsException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -37,6 +37,7 @@
/**
* インスタンスを生成する。
+ *
* @param <T> 条件とした型
* @param parent 検索対象親モデル
* @param clazz 条件クラス
@@ -48,6 +49,7 @@
/**
* インスタンスを生成する。
+ *
* @param parent 検索対象親モデル
* @param name 名前
* @param elements 見つかった同名要素のリスト
@@ -59,6 +61,7 @@
/**
* 見つかった同名要素のリストを取得する。
+ *
* @return 見つかった同名要素のリスト
*/
public Collection<?> getElements() {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/UnexpectedConditionError.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/UnexpectedConditionError.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/exception/UnexpectedConditionError.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -33,6 +33,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ（エラーが発生した状況、考えられる原因など、なるべく詳細に記載すること）
*/
public UnexpectedConditionError(String message) {
@@ -41,6 +42,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ（エラーが発生した状況、考えられる原因など、なるべく詳細に記載すること）
* @param cause 起因例外
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/JiemamyElement.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/JiemamyElement.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/JiemamyElement.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -67,6 +67,7 @@
/**
* この要素が属するインスタンス空間を表すオブジェクトを取得する。
+ *
* @return この要素が属するインスタンス空間を表すオブジェクト
*/
Jiemamy getJiemamy();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -36,6 +36,7 @@
/**
* モデルのクローンを生成する。
+ *
* @return モデルのクローン
*/
RootModel clone();
@@ -51,6 +52,7 @@
/**
* INSERTデータセットのリストを取得する。
+ *
* @return INSERTデータセットのリスト
*/
List<DataSetModel> getDataSets();
@@ -66,12 +68,14 @@
/**
* SQL方言IDを取得する。
+ *
* @return SQL方言クラスのFQCN
*/
String getDialectClassName();
/**
* ドメイン定義のリストを取得する。
+ *
* @return ドメインのリスト
*/
List<DomainModel> getDomains();
@@ -87,6 +91,7 @@
/**
* エンティティ定義のセットを取得する。
+ *
* @return エンティティのセット
*/
SortedSet<EntityModel> getEntities();
@@ -102,18 +107,21 @@
/**
* 開始スクリプトを設定する。
+ *
* @param beginScript 開始スクリプト
*/
void setBeginScript(String beginScript);
/**
* 説明文を設定する。
+ *
* @param description 説明文
*/
void setDescription(String description);
/**
* SQL方言を設定する。
+ *
* @param dialectClassName SQL方言クラス名
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -121,12 +129,14 @@
/**
* 終了スクリプトを設定する。
+ *
* @param endScript 終了スクリプト
*/
void setEndScript(String endScript);
/**
* スキーマ名を設定する。
+ *
* @param schemaName スキーマ名
*/
void setSchemaName(String schemaName);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/AttributeModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/AttributeModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/AttributeModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,36 +31,42 @@
/**
* 説明文を取得する。
+ *
* @return 説明文
*/
String getDescription();
/**
* 論理名を取得する。
+ *
* @return 論理名
*/
String getLogicalName();
/**
* 物理名を取得する。
+ *
* @return 物理名
*/
String getName();
/**
* 説明文を設定する。
+ *
* @param description 説明文
*/
void setDescription(String description);
/**
* 論理名を設定する。
+ *
* @param logicalName 論理名
*/
void setLogicalName(String logicalName);
/**
* 物理名を設定する。
+ *
* @param name 物理名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/ColumnModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/ColumnModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/ColumnModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* リレーショナルデータベースにおける「カラム」を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface ColumnModel extends AttributeModel {
@@ -39,12 +40,14 @@
/**
* 型記述子を取得する。
+ *
* @return 型記述子
*/
DataType getDataType();
/**
* デフォルト値を取得する。
+ *
* @return デフォルト値
*/
String getDefaultValue();
@@ -79,12 +82,14 @@
/**
* 型記述子を設定する。
+ *
* @param dataType 型記述子
*/
void setDataType(DataType dataType);
/**
* デフォルト値を設定する。
+ *
* @param defaultValue デフォルト値
*/
void setDefaultValue(String defaultValue);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/CheckConstraintModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/CheckConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/CheckConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,18 +20,21 @@
/**
* チェック制約を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface CheckConstraintModel extends ValueConstraintModel {
/**
* CHEKC制約定義式を取得する。
+ *
* @return CHEKC制約定義式
*/
String getExpression();
/**
* CHEKC制約定義式を設定する。
+ *
* @param expression CHEKC制約定義式
* @throws UnsupportedOperationException 制約式の設定をサポートしない場合
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ConstraintModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,18 +22,21 @@
/**
* 制約を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface ConstraintModel extends JiemamyElement {
/**
* 物理名を取得する。
+ *
* @return 物理名
*/
String getName();
/**
* 物理名を設定する。
+ *
* @param name 物理名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/Deferrability.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/Deferrability.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/Deferrability.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -29,6 +29,7 @@
/**
* 遅延評価の初期状態を取得する。
+ *
* @return 遅延評価の初期状態。
*/
InitiallyCheckTime getInitiallyCheckTime();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ForeignKeyModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -31,48 +31,56 @@
/**
* マッチ型を取得する。
+ *
* @return マッチ型
*/
MatchType getMatchType();
/**
* 削除時アクションを取得する。
+ *
* @return 削除時アクション
*/
ReferentialAction getOnDelete();
/**
* 更新時アクションを取得する。
+ *
* @return 更新時アクション
*/
ReferentialAction getOnUpdate();
/**
* 参照カラムのリストを取得する。
+ *
* @return 参照カラムのリスト
*/
List<ColumnRef> getReferenceColumns();
/**
* 参照先カラムのリストを設定する。
+ *
* @param referenceColumns 参照先カラムのリスト
*/
void setKeyColumns(List<ColumnRef> referenceColumns);
/**
* マッチ型を設定する。
+ *
* @param matchType マッチ型
*/
void setMatchType(MatchType matchType);
/**
* 削除時アクションを設定する。
+ *
* @param onDelete 削除時アクション
*/
void setOnDelete(ReferentialAction onDelete);
/**
* 更新時アクションを設定する。
+ *
* @param onUpdate 更新時アクション
*/
void setOnUpdate(ReferentialAction onUpdate);
@@ -80,7 +88,9 @@
/**
* 参照列に挿入された値は、被参照テーブルと被参照列の値に対して、指定した照合型で照会される。
- * 照合型には3種類があり、デフォルトはSIMPLE照合型。
+ *
+ * <p>照合型には3種類があり、デフォルトはSIMPLE照合型。</p>
+ *
* @author daisuke
*/
public enum MatchType {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/KeyConstraintModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/KeyConstraintModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/KeyConstraintModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -38,6 +38,7 @@
/**
* キーを構成するカラムのリストを取得する。
+ *
* @return キーを構成するカラムのリスト
*/
List<ColumnRef> getKeyColumns();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/PrimaryKeyModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -21,9 +21,6 @@
/**
* 主キー制約を表すモデルインターフェイス。
*
- * <p>主キー制約は、ユニークキー制約の一種であるため、{@link UniqueKeyModel}の
- * サブインターフェイスである。</p>
- *
* @author daisuke
*/
public interface PrimaryKeyModel extends LocalKeyModel {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/DataSetModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/DataSetModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/DataSetModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,24 +26,28 @@
/**
* INSERT用データセットを表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface DataSetModel extends JiemamyElement {
/**
* データセット名を取得する。
+ *
* @return データセット名
*/
String getName();
/**
* レコード情報を取得する。
+ *
* @return レコード情報
*/
Map<TableRef, List<RecordModel>> getRecords();
/**
* データセット名を設定する。
+ *
* @param name データセット名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/RecordModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/RecordModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/dataset/RecordModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,12 +25,14 @@
/**
* DB上のデータの各レコード（Row）を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface RecordModel extends JiemamyElement {
/**
* カラムに対応するデータを取得する。
+ *
* @return カラムに対応するデータ
*/
Map<ColumnRef, String> getValues();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/BuiltinDataType.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,30 +22,35 @@
/**
* DBに本来組み込まれているデータ型を表すインターフェイス。つまり、Domain型ではないプリミティブなデータ型。
+ *
* @author daisuke
*/
public interface BuiltinDataType extends DataType, Adaptable {
/**
* 型カテゴリを取得する。
+ *
* @return 型カテゴリ
*/
DataTypeCategory getCategory();
/**
* データ型名を取得する。
+ *
* @return データ型名
*/
String getTypeName();
/**
* 型カテゴリを設定する。
+ *
* @param category 型カテゴリ
*/
void setCategory(DataTypeCategory category);
/**
* データ型名を設定する。
+ *
* @param typeName データ型名
*/
void setTypeName(String typeName);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataType.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataType.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataType.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* 型記述子。
+ *
* @author daisuke
*/
public interface DataType {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataTypeAdapter.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataTypeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DataTypeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,12 +20,14 @@
/**
* {@link DataType}用のアダプタ。
+ *
* @author daisuke
*/
public interface DataTypeAdapter {
/**
* 渡されたアダプタが持つ型に対する追加情報を、自クラスにコピーする。
+ *
* @param src コピー元アダプタ
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
* @throws IllegalArgumentException 引数に自分と同じクラスのインスタンス以外を与えた場合
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,6 +26,7 @@
/**
* ドメインを表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface DomainModel extends JiemamyElement {
@@ -51,24 +52,28 @@
/**
* ドメインとして定義された型記述子を取得する。
+ *
* @return ドメインとして定義された型記述子
*/
BuiltinDataType getDataType();
/**
* 説明文を取得する。
+ *
* @return 説明文
*/
String getDescription();
/**
* 論理名を取得する。
+ *
* @return 論理名
*/
String getLogicalName();
/**
* ドメイン名を取得する。
+ *
* @return ドメイン名
*/
String getName();
@@ -101,24 +106,28 @@
/**
* ドメインとして定義された型記述子を設定する。
+ *
* @param dataType ドメインとして定義された型記述子
*/
void setDataType(BuiltinDataType dataType);
/**
* 説明文を設定する。
+ *
* @param description 説明文
*/
void setDescription(String description);
/**
* 論理名を設定する。
+ *
* @param logicalName 論理名
*/
void setLogicalName(String logicalName);
/**
* ドメイン名を設定する。
+ *
* @param name ドメイン名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/LiteralType.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/LiteralType.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/LiteralType.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
* @author daisuke
*/
public enum LiteralType {
+
/** 文字（列）リテラル */
CHARACTER {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,66 +22,77 @@
/**
* リレーショナルデータベースモデルにおける「実体」を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface EntityModel extends JiemamyElement {
/**
* 開始スクリプトを取得する。
+ *
* @return 開始スクリプト
*/
String getBeginScript();
/**
* 説明文を取得する。
+ *
* @return 説明文
*/
String getDescription();
/**
* 終了スクリプトを取得する。
+ *
* @return 終了スクリプト
*/
String getEndScript();
/**
* 論理名を取得する。
+ *
* @return 論理名
*/
String getLogicalName();
/**
* エンティティ名を取得する。
+ *
* @return エンティティ名
*/
String getName();
/**
* 開始スクリプトを設定する。
+ *
* @param beginScript 開始スクリプト
*/
void setBeginScript(String beginScript);
/**
* 説明文を設定する。
+ *
* @param description 説明文
*/
void setDescription(String description);
/**
* 終了スクリプトを設定する。
+ *
* @param endScript 終了スクリプト
*/
void setEndScript(String endScript);
/**
* 論理名を設定する。
+ *
* @param logicalName 論理名
*/
void setLogicalName(String logicalName);
/**
* エンティティ名を設定する。
+ *
* @param name エンティティ名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/TableModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/TableModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/TableModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,18 +25,21 @@
/**
* リレーショナルデータベースにおける「テーブル」を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface TableModel extends EntityModel {
/**
* カラムのリストを取得する。
+ *
* @return カラムのリスト
*/
List<AttributeModel> getAttributes();
/**
* インデックスのリストを取得する。
+ *
* @return インデックスのリスト
*/
List<IndexModel> getIndexes();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/ViewModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/ViewModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/ViewModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -26,12 +26,14 @@
/**
* VIEW定義SELECT文を取得する。
+ *
* @return VIEW定義SELECT文
*/
String getDefinition();
/**
* VIEW定義SELECT文を設定する。
+ *
* @param definition VIEW定義SELECT文
*/
void setDefinition(String definition);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexColumnModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexColumnModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexColumnModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,30 +23,35 @@
/**
* インデックス対象のカラムを表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface IndexColumnModel extends JiemamyElement {
/**
* インデックス対象カラムを取得する。
+ *
* @return インデックス対象カラム
*/
ColumnRef getColumn();
/**
* カラムソート方式を取得する。
+ *
* @return カラムソート方式
*/
SortType getSortType();
/**
* インデックス対象カラムを設定する。
+ *
* @param column インデックス対象カラム
*/
void setColumn(ColumnRef column);
/**
* カラムソート方式を設定する。
+ *
* @param sortType カラムソート方式
*/
void setSortType(SortType sortType);
@@ -54,9 +59,11 @@
/**
* ソート方式。
+ *
* @author daisuke
*/
public static enum SortType {
+
/** ソートなし */
NONE,
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/index/IndexModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,36 +24,42 @@
/**
* インデックスを表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface IndexModel extends JiemamyElement {
/**
* インデックスカラムのリストを取得する。
+ *
* @return インデックスカラムのリスト
*/
List<IndexColumnModel> getColumns();
/**
* インデックス名を取得する。
+ *
* @return インデックス名
*/
String getName();
/**
* ユニークインデックスか否かを取得する。
+ *
* @return ユニークインデックスか否か
*/
boolean isUnique();
/**
* インデックス名を設定する。
+ *
* @param name インデックス名
*/
void setName(String name);
/**
* ユニークインデックスか否かを設定する。
+ *
* @param unique ユニークインデックスか否か
*/
void setUnique(boolean unique);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/serializer/SerializationException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/serializer/SerializationException.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/serializer/SerializationException.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* シリアライズ・デシリアライズに失敗した時にスローされる。
+ *
* @author daisuke
*/
@SuppressWarnings("serial")
@@ -36,6 +37,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
*/
public SerializationException(String message) {
@@ -44,6 +46,7 @@
/**
* インスタンスを生成する。
+ *
* @param message 例外メッセージ
* @param cause 起因例外
*/
@@ -53,6 +56,7 @@
/**
* インスタンスを生成する。
+ *
* @param cause 起因例外
*/
public SerializationException(Throwable cause) {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -57,6 +57,7 @@
/**
* 指定したアダプタを持つ（取得可能）かどうか調べる。
+ *
* @param adapterClass アダプタクラス
* @return 適用可能の場合{@code true}
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Context.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Context.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Context.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,18 +22,21 @@
/**
* コンテキスト情報インターフェイス。
+ *
* @author daisuke
*/
public interface Context {
/**
* コンテキスト値のマップを取得する。
+ *
* @return コンテキスト値のマップ
*/
Map<String, Object> getProperties();
/**
* コンテキスト値を取得する。
+ *
* @param <T> コンテキスト値の型
* @param key キー
* @return コンテキスト値
@@ -42,12 +45,14 @@
/**
* コンテキスト値のマップを設定する。
+ *
* @param properties コンテキスト値のマップ
*/
void setProperties(Map<String, Object> properties);
/**
* コンテキスト値を設定する。
+ *
* @param <T> コンテキスト値の型
* @param key キー
* @param value コンテキスト値
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Disablable.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Disablable.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Disablable.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
/**
* {@link Exporter}に対する非処理指示可能を表すアダプタインターフェイス。
+ *
* @author daisuke
*/
@Adapter(AdapterType.MODEL)
@@ -31,12 +32,14 @@
/**
* エクスポート対象として無効かどうかを取得する。
+ *
* @return エクスポート対象として無効かどうか
*/
Boolean isDisabled();
/**
* エクスポート対象として無効かどうかを設定する。
+ *
* @param disabled エクスポート対象として無効かどうか
*/
void setDisabled(Boolean disabled);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* TODO for daisuke
+ *
* @param <T>
* @author daisuke
*/
@@ -27,6 +28,7 @@
/**
* モデルを構築する。
+ *
* @return model 構築されたモデル
*/
T build();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedTableBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedTableBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/MaturedTableBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,6 +23,7 @@
/**
* TODO for daisuke
+ *
* @author daisuke
*/
public interface MaturedTableBuilder extends MaturedBuilder<TableModel> {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -22,6 +22,7 @@
/**
* TODO for daisuke
+ *
* @param <T>
* @author daisuke
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureTableBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureTableBuilder.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/PrematureTableBuilder.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -23,6 +23,7 @@
/**
* TODO for daisuke
+ *
* @author daisuke
*/
public interface PrematureTableBuilder extends PrematureBuilder<TableModel> {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreNamespace.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreNamespace.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreNamespace.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -20,6 +20,7 @@
/**
* XML名前空間定数クラス。
+ *
* @author daisuke
*/
public enum CoreNamespace implements JiemamyNamespace {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreQName.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreQName.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/CoreQName.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -21,7 +21,8 @@
import javax.xml.namespace.QName;
/**
- * Jiemamy XML Modelにおける、XMLのノード（要素や属性）の完全修飾名を保持する定数クラス。
+ * Jiemamy XML Modelにおける、XMLのノード（要素や属性）の完全修飾名を保持する列挙型。
+ *
* @author daisuke
*/
public enum CoreQName implements JiemamyQName {
@@ -195,16 +196,10 @@
qName = new QName(namespace.getNamespaceURI(), localPart, namespace.getPrefix());
}
- /**
- * {@inheritDoc}
- */
public QName getQName() {
return qName;
}
- /**
- * {@inheritDoc}
- */
public String getQNameString() {
String prefix = isEmpty(qName.getPrefix()) ? "" : qName.getPrefix() + ":";
return prefix + qName.getLocalPart();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/JiemamyNamespace.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/JiemamyNamespace.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/xml/JiemamyNamespace.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* 名前空間URLを取得する。
+ *
* @return the namespaceURI
*/
String getNamespaceURI();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,36 +27,42 @@
/**
* ダイアグラム表現を表すモデルインターフェイス。
+ *
* @author daisuke
*/
public interface DiagramPresentationModel extends JiemamyElement {
/**
* コネクションのベンドポイント情報を取得する。
+ *
* @return コネクションのベンドポイント情報
*/
Map<ConnectionAdapter, List<JmPoint>> getConnectionLayouts();
/**
* ノードのレイアウト情報を取得する。
+ *
* @return ノードのレイアウト情報
*/
Map<NodeAdapter, NodeProfile> getFigureProfiles();
/**
* 表示レベルを取得する。
+ *
* @return 表示レベル
*/
Level getLevel();
/**
* 物理/論理モードを取得する。
+ *
* @return 物理/論理モード
*/
Mode getMode();
/**
* プレゼンテーション名を取得する。
+ *
* @return プレゼンテーション名
*/
String getName();
@@ -88,18 +94,21 @@
/**
* 表示レベルを取得する。
+ *
* @param level 表示レベル
*/
void setLevel(Level level);
/**
* 物理/論理モードを取得する。
+ *
* @param mode 物理/論理モード
*/
void setMode(Mode mode);
/**
* プレゼンテーション名を設定する。
+ *
* @param name プレゼンテーション名
*/
void setName(String name);
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentations.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentations.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentations.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -28,6 +28,7 @@
/**
* ダイアグラム表現を追加する。
+ *
* @param presentation 追加するダイアグラム表現
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -35,6 +36,7 @@
/**
* ダイアグラム表現を取得する。
+ *
* @param diagramIndex
* @return ダイアグラム表現
* @throws IndexOutOfBoundsException diagramIndexが範囲外(index < 0 || index >= size())だった場合
@@ -43,6 +45,7 @@
/**
* ダイアグラム表現を削除する。
+ *
* @param presentation 削除するダイアグラム表現
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
@@ -50,6 +53,7 @@
/**
* 保持しているダイアグラム表現の総数を取得する。
+ *
* @return ダイアグラム表現の総数
*/
int size();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/Level.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/Level.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/Level.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -24,6 +24,7 @@
* @author daisuke
*/
public enum Level {
+
/** エンティティレベル */
ENTITY,
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/NodeProfile.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/NodeProfile.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/NodeProfile.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -30,12 +30,14 @@
/**
* ノードの色情報を取得する。
+ *
* @return ノードの色情報
*/
JmColor getColor();
/**
* ノードのレイアウト情報を取得する。
+ *
* @return ノードのレイアウト情報
*/
JmRectangle getLayout();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapter.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/connection/ConnectionAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -25,6 +25,7 @@
/**
* ダイアグラムにおける「結合」を表すアダプタインターフェイス。
+ *
* @author daisuke
*/
@Adapter(AdapterType.LOGIC)
@@ -32,18 +33,21 @@
/**
* 接続元ノードを取得する。
+ *
* @return 接続元ノード
*/
NodeAdapter getSource();
/**
* 接続先ノードを取得する。
+ *
* @return 接続先ノード
*/
NodeAdapter getTarget();
/**
* 自分同士を繋ぐコネクションであるかどうかを調べる。
+ *
* @return 自己コネクションである場合{@code true}
*/
boolean isSelfConnection();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmPoint.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmPoint.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmPoint.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -48,9 +48,6 @@
this.y = y;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -72,9 +69,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public int hashCode() {
final int prime = 31;
@@ -84,9 +78,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "Point(" + x + ", " + y + ")";
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmRectangle.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmRectangle.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/geometory/JmRectangle.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -58,6 +58,7 @@
/**
* インスタンスを生成する。
+ *
* @param x X座標
* @param y Y座標
*/
@@ -67,6 +68,7 @@
/**
* インスタンスを生成する。
+ *
* @param x X座標
* @param y Y座標
* @param width 幅
@@ -79,9 +81,6 @@
this.y = y;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "Rect(" + x + ", " + y + ":" + width + ", " + height + ")";
@@ -89,6 +88,7 @@
/**
* 値の範囲をチェックの後、正規化する。
+ *
* @param name
* @param element
* @return 正規化された値
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/node/NodeAdapter.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/node/NodeAdapter.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/node/NodeAdapter.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -27,6 +27,7 @@
/**
* ダイアグラムにおける「節点」を表すアダプタインターフェイス。
+ *
* @author daisuke
*/
@Adapter(AdapterType.LOGIC)
@@ -34,12 +35,14 @@
/**
* このモデルを接続元とするコネクションのリストを取得する。
+ *
* @return コネクションのリスト
*/
Collection<ConnectionAdapter> getSourceConnections();
/**
* このモデルを接続先とするコネクションのリストを取得する。
+ *
* @return コネクションのリスト
*/
Collection<ConnectionAdapter> getTargetConnections();
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/xml/ViewQName.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/xml/ViewQName.java 2009-02-22 17:00:34 UTC (rev 2712)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/xml/ViewQName.java 2009-02-22 18:25:43 UTC (rev 2713)
@@ -80,16 +80,10 @@
qName = new QName(namespace.getNamespaceURI(), localPart, namespace.getPrefix());
}
- /**
- * {@inheritDoc}
- */
public QName getQName() {
return qName;
}
- /**
- * {@inheritDoc}
- */
public String getQNameString() {
String prefix = isEmpty(qName.getPrefix()) ? "" : qName.getPrefix() + ":";
return prefix + qName.getLocalPart();