Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-06 06:25:06 -0400
committerEike Stepper2016-10-06 06:25:06 -0400
commit2ffd84347afa6f75edf142245c2ca618750b6889 (patch)
treeff9080cdcae918b351042cab14de4c1481680cca
parentf4016b630a3ce191d51ed4cd1bf5fe93b5027864 (diff)
downloadcdo-2ffd84347afa6f75edf142245c2ca618750b6889.tar.gz
cdo-2ffd84347afa6f75edf142245c2ca618750b6889.tar.xz
cdo-2ffd84347afa6f75edf142245c2ca618750b6889.zip
[Releng] Source Clean-Up for all projects
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.codegen.gmf-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn.tests-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/feature.xml2
-rw-r--r--features/org.gastro-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java74
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsSwitch.java114
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java124
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java134
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java121
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/BaseFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/BasePackage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseClassImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseFactoryImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseAdapterFactory.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedFactory.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedPackage.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedAdapterFactory.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/interface_/IInterface.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceAdapterFactory.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/Reference.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/ReferenceFactory.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/ReferencePackage.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceAdapterFactory.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java48
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditEMapTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java226
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_FetchRuleAnalyzerTest_DISABLED_.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248052_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_338884_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339461_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_342130_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343471_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350027_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352303_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359669_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381395_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417825_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417844_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_418267_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bundle/OM.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IModelConfig.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTests.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletePerformanceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/IPerformanceRecordAnalyzer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/Session.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener2.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOElementTester.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java12
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java10
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java38
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java22
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java10
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java188
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java118
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java18
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java26
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java14
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java66
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Message.java486
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java56
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java150
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java18
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java26
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java6
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java26
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java44
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java30
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java12
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java334
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java146
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java10
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java40
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java22
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java22
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java106
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java10
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java22
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java22
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java188
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java118
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java18
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java26
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java14
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java66
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/Message.java486
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java56
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java150
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java8
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java8
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java18
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java26
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java6
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java26
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java44
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java30
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java12
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java334
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java146
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java10
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java8
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java40
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java22
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java22
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java106
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java10
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java22
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java22
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java12
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java24
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java4
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/GrowingRandomAccessList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java30
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java28
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java8
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Acceptor.java2
-rw-r--r--plugins/org.gastro.business.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java2
-rw-r--r--plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java2
-rw-r--r--plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java2
-rw-r--r--plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java2
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java10
-rw-r--r--plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java2
474 files changed, 3911 insertions, 3516 deletions
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index 8b6e972556..f40f35df47 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn"
label="%featureName"
- version="2.1.300.qualifier"
+ version="2.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml
index 67869d9282..c19cc3031a 100644
--- a/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.codegen"
label="%featureName"
- version="2.1.300.qualifier"
+ version="2.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.codegen.gmf-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.codegen.gmf-feature/feature.xml
index f6f8798192..ce8b2f889d 100644
--- a/features/org.eclipse.emf.cdo.dawn.codegen.gmf-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.codegen.gmf-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.codegen.gmf"
label="%featureName"
- version="2.1.300.qualifier"
+ version="2.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
index a76598c057..55ff43b9b0 100644
--- a/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.ecore.editor.dawn"
label="%featureName"
- version="1.1.300.qualifier"
+ version="1.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
index b86e03528e..8371b735c3 100644
--- a/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn"
label="%featureName"
- version="1.1.300.qualifier"
+ version="1.1.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml
index 47117e6fb0..756c8c2c09 100644
--- a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.examples"
label="%featureName"
- version="2.1.300.qualifier"
+ version="2.1.400.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.dawn.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.tests-feature/feature.xml
index dbb81fff49..fd17275a50 100644
--- a/features/org.eclipse.emf.cdo.dawn.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn.tests"
label="%featureName"
- version="2.2.200.qualifier"
+ version="2.2.300.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
index 0b6d2b216f..59d850e317 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.postgresql"
label="%featureName"
- version="4.2.300.qualifier"
+ version="4.2.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.gastro-feature/feature.xml b/features/org.gastro-feature/feature.xml
index dd8b27688c..c96038a9ec 100644
--- a/features/org.gastro-feature/feature.xml
+++ b/features/org.gastro-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.gastro"
label="%featureName"
- version="4.2.300.qualifier"
+ version="4.2.400.qualifier"
provider-name="%providerName"
plugin="org.gastro.rcp"
image="eclipse_update_120.jpg"
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
index d51d24563c..8f4e198d6e 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ExecutorService;
/**
* @author Eike Stepper
*/
-public class CDOAdminClientManagerImpl extends SetContainer<CDOAdminClient>implements CDOAdminClientManager
+public class CDOAdminClientManagerImpl extends SetContainer<CDOAdminClient> implements CDOAdminClientManager
{
private final IManagedContainer container;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
index 197b2b1c6d..4cf7d377be 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.net4j.util.concurrent.QueueWorker;
* @author Eike Stepper
* @since 4.0
*/
-public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo>implements CDOCommitInfoHandler
+public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo> implements CDOCommitInfoHandler
{
private CDOCommitInfoHandler delegate;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
index e432a3ac79..be677a8582 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
@@ -35,7 +35,7 @@ import java.util.List;
/**
* @author Eike Stepper
*/
-public class CDOBranchImpl extends Container<CDOBranch>implements InternalCDOBranch
+public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBranch
{
private static final InternalCDOBranch[] NO_BRANCHES = new InternalCDOBranch[0];
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index 5c8bb5475d..16efd459e8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
/**
* @author Eike Stepper
*/
-public class CDOBranchManagerImpl extends Container<CDOBranch>implements InternalCDOBranchManager
+public class CDOBranchManagerImpl extends Container<CDOBranch> implements InternalCDOBranchManager
{
private CDOCommonRepository repository;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
index 9c08f6767b..5ae6e221d2 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
@@ -77,7 +77,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID
public String toURIFragment()
{
return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
- + CDOClassifierRef.URI_SEPARATOR + value;
+ + CDOClassifierRef.URI_SEPARATOR + value;
}
public Type getType()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
index 9c65e9ee10..c3aed3737d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
@@ -77,7 +77,7 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID
public String toURIFragment()
{
return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
- + CDOClassifierRef.URI_SEPARATOR + value;
+ + CDOClassifierRef.URI_SEPARATOR + value;
}
public Type getType()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
index 8ae662e7db..0d697d5f01 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
@@ -204,7 +204,7 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
/**
* @author Eike Stepper
*/
- private static final class CacheSoftReference extends SoftReference<InternalCDORevision>implements CDORevisionKey
+ private static final class CacheSoftReference extends SoftReference<InternalCDORevision> implements CDORevisionKey
{
private CDOID id;
@@ -245,7 +245,7 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
/**
* @author Eike Stepper
*/
- private static final class CacheStrongReference extends SoftReference<InternalCDORevision>implements CDORevisionKey
+ private static final class CacheStrongReference extends SoftReference<InternalCDORevision> implements CDORevisionKey
{
private CDOID id;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
index 5eecd319e4..ad8cf66e02 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
@@ -27,7 +27,7 @@ import java.util.Collection;
/**
* @author Simon McDuff
*/
-public class CDOListImpl extends BasicEList<Object>implements InternalCDOList.ConfigurableEquality
+public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.ConfigurableEquality
{
public static final CDOListFactory FACTORY = new CDOListFactory()
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index f23979da32..c2fe2613b2 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -306,10 +306,10 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
if (infosToLoad != null)
{
List<? extends CDORevision> additionalLoadedRevisions //
- = loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
+ = loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
List<? extends CDORevision> primaryLoadedRevisions //
- = getResultsAndSynthetics(infosToLoad.toArray(new RevisionInfo[0]), null);
+ = getResultsAndSynthetics(infosToLoad.toArray(new RevisionInfo[0]), null);
if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty()
|| additionalLoadedRevisions != null && !additionalLoadedRevisions.isEmpty())
@@ -428,7 +428,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
List<InternalCDORevision> additionalRevisions = null;
List<RevisionInfo> additionalRevisionInfos = //
- revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
+ revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
if (additionalRevisionInfos != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
index 210d33518f..2f940855b9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
@@ -186,7 +186,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
cachedSources = new ListTargetAdding[initialCapacity];
}
else
- // i.e. unprocessedFeatureDeltas != null
+ // i.e. unprocessedFeatureDeltas != null
{
int requiredCapacity = 1 + cachedIndices[0] + unprocessedFeatureDeltas.size();
if (cachedIndices.length < requiredCapacity)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
index 9bb3ba1db1..2875f6d7eb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
@@ -28,7 +28,7 @@ import java.util.Map;
* @author Eike Stepper
* @since 4.1
*/
-public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>implements CDOAdmin
+public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository> implements CDOAdmin
{
private final long timeout;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
index fcd058cb38..f34b2eb515 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
@@ -26,7 +26,7 @@ import java.util.List;
* @author Eike Stepper
* @since 4.0
*/
-public class CDOChangeKindCache extends HashMap<CDOID, CDOChangeKind>implements CDOChangeKindProvider
+public class CDOChangeKindCache extends HashMap<CDOID, CDOChangeKind> implements CDOChangeKindProvider
{
private static final long serialVersionUID = 1L;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
index fefb2b9548..e0c78c0d1b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
@@ -584,7 +584,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
if (revised != UNSPECIFIED_DATE && revised < Math.max(0, created))
{
throw new IllegalArgumentException("revision=" + this + ", created=" + CDOCommonUtil.formatTimeStamp(created)
- + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
+ + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
}
if (TRACER.isEnabled())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
index 2f49ce0520..1ffa0b30fc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.provider.DawnCodeGenEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
index ca8fee7f90..c8e1478f39 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
@@ -198,8 +198,8 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature"),
getString("_UI_PropertyDescriptor_description",
"_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
- DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false,
+ false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
index 3f1c2f6a98..455697e89b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.util;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.util;version="1.0.400",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.util;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.util;version="1.0.500",
templates;version="1.0.0",
workflow;version="1.0.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
index ae6909d449..6eedf73ee9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
@@ -650,28 +650,28 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
{
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME:
return DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnDocumentProviderClassName != null
- : !DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnDocumentProviderClassName);
+ : !DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnDocumentProviderClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME:
return DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT == null ? dawnEditorUtilClassName != null
- : !DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT.equals(dawnEditorUtilClassName);
+ : !DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT.equals(dawnEditorUtilClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME:
return DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT == null ? dawnCreationWizardClassName != null
- : !DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT.equals(dawnCreationWizardClassName);
+ : !DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT.equals(dawnCreationWizardClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME:
return DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT == null ? dawnCanonicalEditingPolicyClassName != null
- : !DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT.equals(dawnCanonicalEditingPolicyClassName);
+ : !DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT.equals(dawnCanonicalEditingPolicyClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME:
return DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT == null ? dawnDiagramEditPartClassName != null
- : !DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT.equals(dawnDiagramEditPartClassName);
+ : !DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT.equals(dawnDiagramEditPartClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME:
return DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT == null ? dawnEditPartFactoryClassName != null
- : !DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT.equals(dawnEditPartFactoryClassName);
+ : !DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT.equals(dawnEditPartFactoryClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME:
return DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnEditPartProviderClassName != null
- : !DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPartProviderClassName);
+ : !DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPartProviderClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME:
return DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnEditPolicyProviderClassName != null
- : !DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPolicyProviderClassName);
+ : !DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPolicyProviderClassName);
case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR:
return gmfGenEditorGenerator != null;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
index 744a0ac5ae..db8f4a32a8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen;singleton:=true
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.600.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.DawnCodeGenPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
@@ -24,12 +24,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: metamodel;version="1.0.100",
- org.eclipse.emf.cdo.dawn.codegen;version="1.0.500",
- org.eclipse.emf.cdo.dawn.codegen.actions;version="1.0.500",
- org.eclipse.emf.cdo.dawn.codegen.creators;version="1.0.500",
- org.eclipse.emf.cdo.dawn.codegen.creators.impl;version="1.0.500",
- org.eclipse.emf.cdo.dawn.codegen.messages;version="1.0.500",
- org.eclipse.emf.cdo.dawn.codegen.util;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen;version="1.0.600",
+ org.eclipse.emf.cdo.dawn.codegen.actions;version="1.0.600",
+ org.eclipse.emf.cdo.dawn.codegen.creators;version="1.0.600",
+ org.eclipse.emf.cdo.dawn.codegen.creators.impl;version="1.0.600",
+ org.eclipse.emf.cdo.dawn.codegen.messages;version="1.0.600",
+ org.eclipse.emf.cdo.dawn.codegen.util;version="1.0.600",
template;version="1.0.100"
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
index d2e5b4409d..3be69e6d00 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
@@ -62,7 +62,7 @@ public abstract class AbstractFragmentCreator implements Creator
ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
- .put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
+ .put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
Resource dawnGenModelResource = resourceSet
.getResource(URI.createURI(dawnGenModelFile.getRawLocationURI().toString()), true);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
index 4e9121d4af..4d496146cf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecore.editor.dawn;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Fragment-Host: org.eclipse.emf.ecore.editor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
index f586ebc20d..516288b8fd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
@@ -96,7 +96,7 @@ public class DawnEcoreEditor extends EcoreEditor implements IDawnEditor
selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
((DawnEditorInput)getEditorInput()).getResource()));
selectionViewer
- .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+ .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
// parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
// dawnEditorSupport.getView(), selectionViewer));
// listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
index 7731a722e4..e16041e678 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Fragment-Host: org.eclipse.emf.ecoretools.diagram;bundle-version="[0.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
index 0cff54b55e..7f09d07a53 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
@@ -215,7 +215,7 @@ public class DawnEcoreDocumentProvider extends EcoreDocumentProvider
NLS.bind(Messages.EcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
index a5e6e297d1..e7c3e0d09b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn;singleton:=true
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.600.qualifier
Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="1.0.0.qualifier"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: fragment
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
index 9b925c103e..24fa0acb65 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
@@ -213,7 +213,7 @@ public class DawnAcoreDocumentProvider extends AcoreDocumentProvider
NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
index f5b43f72f4..c8e715c6df 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram; singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.400"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.500"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
index 95900906d5..b5d48f5642 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
@@ -357,7 +357,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
{
parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, getParserElement(),
AcoreVisualIDRegistry
- .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
+ .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
index dd1d1d03e6..b8e5aed86e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
@@ -357,7 +357,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
{
parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, getParserElement(),
AcoreVisualIDRegistry
- .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
+ .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
index aa42fdbe5c..ca3d813ca7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
@@ -370,7 +370,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
{
parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, getParserElement(),
AcoreVisualIDRegistry
- .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
+ .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
index 5303f4c591..4227838028 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
@@ -357,7 +357,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
{
parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, getParserElement(),
AcoreVisualIDRegistry
- .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
+ .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
index 6424f9a7e3..ac343f4e94 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
@@ -357,7 +357,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
{
parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, getParserElement(),
AcoreVisualIDRegistry
- .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
+ .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
index 9e7a8e4518..d5c1a11fde 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
@@ -243,7 +243,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -263,7 +263,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -299,7 +299,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -335,7 +335,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -355,7 +355,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -400,7 +400,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
{
IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002,
view.getElement() != null ? view.getElement() : view,
- AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
+ AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
if (parser != null)
{
return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
index 51cd68ee4b..ddfb75e9fb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
@@ -84,7 +84,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
IEditorInput editorInput = (IEditorInput)element;
IDiagramDocument document = (IDiagramDocument)createDocument(editorInput);
@@ -107,7 +107,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
IDocument document = createEmptyDocument();
setDocumentContent(document, (IEditorInput)element);
@@ -298,7 +298,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
}
@@ -710,16 +710,15 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
- null));
+ null));
}
if (false == document instanceof IDiagramDocument)
{
fireElementStateChangeFailed(element);
- throw new CoreException(
- new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
- "Incorrect document used: " + document //$NON-NLS-1$
- + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$
- null));
+ throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+ "Incorrect document used: " + document //$NON-NLS-1$
+ + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$
+ null));
}
IDiagramDocument diagramDocument = (IDiagramDocument)document;
final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
index e1ec109114..867a3e0148 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
@@ -184,7 +184,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
case AAttribute2EditPart.VISUAL_ID:
case AOperation2EditPart.VISUAL_ID:
if (domainElement == null
- || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
+ || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
{
return false; // visual id in semantic hint should match visual id for domain element
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
index fa50101356..0e15e0f2b5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.edit;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.provider.AcoreEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
index 7bd0108491..8d1c852dea 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
@@ -32,7 +32,7 @@ import java.util.List;
* @generated
*/
public class AAttributeItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
index a96e583bba..5364def1dc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class ABasicClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
index 1f55ee45ab..52e7f2262f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
* @generated
*/
public class AClassChildItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
index 66960b5bab..f6d68c69b0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
@@ -34,7 +34,7 @@ import java.util.List;
* @generated
*/
public class AClassItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
index fce612648f..af0a98128f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
index f028486a83..f6a54a60e3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
@@ -32,7 +32,7 @@ import java.util.List;
* @generated
*/
public class AInterfaceItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
index 7a9d570032..cda4c93da7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
@@ -36,7 +36,7 @@ import java.util.List;
* @generated
*/
public class AOperationItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
index 31e447dd2d..350725c9ff 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
* @generated
*/
public class AParameterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
index 7095266b08..5c0274fca8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-Localization: fragment
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
index 4d12b6b727..7844bad1e5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
@@ -101,7 +101,7 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
((DawnEditorInput)getEditorInput()).getResource()));
selectionViewer
- .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+ .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
treeViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
index 6e60f22599..794e991460 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.presentation.AcoreEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
index 72bc7f298b..76d1d6090d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
@@ -1682,7 +1682,7 @@ public class AcoreEditor extends MultiPageEditorPart
setPartName(editorInput.getName());
IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
- doSave(progressMonitor);
+ doSave(progressMonitor);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF
index 71b9599d0d..3dee894704 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.gmf;singleton:=true
-Bundle-Version: 2.1.300.qualifier
+Bundle-Version: 2.1.400.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.gmf.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -23,15 +23,15 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.resources;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.1.300",
- org.eclipse.emf.cdo.dawn.gmf.util;version="2.1.300",
+Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.resources;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.1.400",
+ org.eclipse.emf.cdo.dawn.gmf.util;version="2.1.400",
org.eclipse.emf.cdo.dawn.transaction;version="2.1.0"
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
index 6b610d60f7..3b462bcdb2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
@@ -134,7 +134,7 @@ public class DawnChangeHelper
ViewAndElementDescriptor viewAndElementDescriptor = new ViewAndElementDescriptor(createElementRequestAdapter,
Node.class, ((IHintedType)elementType).getSemanticHint(),
- parentEditpart.getDiagramPreferencesHint());
+ parentEditpart.getDiagramPreferencesHint());
CreateViewAndElementRequest createViewRequest = new CreateViewAndElementRequest(viewAndElementDescriptor);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
index bbaea0b450..e99ad9b8cf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
@@ -598,7 +598,7 @@ public class DawnResourceHelper
updateEObject(leftChild, rightChild); // removes it
}
else
- // child must be created
+ // child must be created
{
if (o instanceof View)
{
@@ -731,7 +731,7 @@ public class DawnResourceHelper
}
}
else
- // create
+ // create
{
if (rightReferenceObject != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
index 4da7965671..8e5755c960 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.tests
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.tests.bundle.OM$Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
@@ -40,13 +40,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bundle;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.common;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.1.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.1.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bundle;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.common;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.1.300";x-internal:=true
Import-Package: org.antlr.runtime;version="[3.0.0,4.0.0)"
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
index 92adb7be5d..abe79d046d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
@@ -133,7 +133,7 @@ public class DawnAcoreTestUtil
try
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
- .openEditor(editorInput, editorID);
+ .openEditor(editorInput, editorID);
}
catch (PartInitException ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
index 91754768a6..1ed500bcb0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
@@ -100,7 +100,7 @@ public class DawnEcoreTestUtil
try
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
- .openEditor(editorInput, editorID);
+ .openEditor(editorInput, editorID);
}
catch (PartInitException ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
index a8558c504c..0bdbd23286 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
@@ -167,7 +167,7 @@ public class DawnSWTBotEMFEditor extends SWTBotEditor
}
protected void setActivePage(final MultiPageEditorPart editor, final int i) throws SecurityException,
- NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
+ NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
{
editor.getSite().getShell().getDisplay().syncExec(new Runnable()
{
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
index e4c701537e..c79fec11aa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ui;singleton:=true
-Bundle-Version: 2.0.300.qualifier
+Bundle-Version: 2.0.400.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.ui.bundle.OM$Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,14 +14,14 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.300";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.300";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.views;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.300",
- org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.300"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.views;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.400"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
index 01d380388b..569f4af7be 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
@@ -35,6 +35,6 @@ public class DawnCreateNewDiagramResourceWizardPage extends DawnCreateNewResourc
{
// TODO check why the dawn resource must be connected this way
return URI.createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath()
- + "/" + chooserComposite.getResourceName());
+ + "/" + chooserComposite.getResourceName());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index af80cf126a..6193a0f49a 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -257,7 +257,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -330,20 +330,28 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
{
if (cdoResourceFolderItemProvider != null)
+ {
cdoResourceFolderItemProvider.dispose();
+ }
if (cdoResourceItemProvider != null)
+ {
cdoResourceItemProvider.dispose();
+ }
if (cdoBinaryResourceItemProvider != null)
+ {
cdoBinaryResourceItemProvider.dispose();
+ }
if (cdoTextResourceItemProvider != null)
+ {
cdoTextResourceItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index d9e6c54e52..0a6e099fc8 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -182,7 +182,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -255,14 +255,16 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
{
if (annotationItemProvider != null)
+ {
annotationItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index 8cb293d6b4..a3404837d2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.300";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.300";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.400";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.400";x-internal:=true,
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index 86e6a91874..c2606a5f67 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -95,7 +95,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
try
{
PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
- .openURL(new URL("http://localhost:" + port));
+ .openURL(new URL("http://localhost:" + port));
}
catch (Exception ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 8125a4f56a..b102b18d33 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -85,7 +85,7 @@ import java.util.Properties;
/**
* @author Eike Stepper
*/
-public abstract class NodeType extends SetContainer<Node>implements IElement
+public abstract class NodeType extends SetContainer<Node> implements IElement
{
public static final String TYPE_PROPERTY = "Type";
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index 318fb72d1b..c16160fbbd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index b85b8568f5..25b7a5b1e8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
{
System.out.println();
System.out.println(repository.getName() + ": " + repository.getType()
- + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+ + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
}
else if ("0".equals(command))
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
index 99ad78afc4..1db546d44a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company.edit; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index ff35b3c8db..c6a00d6a50 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -143,11 +143,11 @@ public class ProductItemProvider extends CDOItemProviderAdapter
protected void addPricePropertyDescriptor(Object object)
{
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
- null));
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Product_price_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+ null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 926c037cb9..873e0e8e09 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -85,10 +85,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
protected void addSupplierPropertyDescriptor(Object object)
{
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
- "_UI_PurchaseOrder_type"),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
+ "_UI_PurchaseOrder_type"),
CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index 8cb293d6b4..a3404837d2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.300";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.300";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.400";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.400";x-internal:=true,
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index 86e6a91874..c2606a5f67 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -95,7 +95,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
try
{
PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
- .openURL(new URL("http://localhost:" + port));
+ .openURL(new URL("http://localhost:" + port));
}
catch (Exception ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 8125a4f56a..b102b18d33 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -85,7 +85,7 @@ import java.util.Properties;
/**
* @author Eike Stepper
*/
-public abstract class NodeType extends SetContainer<Node>implements IElement
+public abstract class NodeType extends SetContainer<Node> implements IElement
{
public static final String TYPE_PROPERTY = "Type";
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index 318fb72d1b..c16160fbbd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index b85b8568f5..25b7a5b1e8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
{
System.out.println();
System.out.println(repository.getName() + ": " + repository.getType()
- + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+ + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
}
else if ("0".equals(command))
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
index 99ad78afc4..1db546d44a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company.edit; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index ff35b3c8db..c6a00d6a50 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -143,11 +143,11 @@ public class ProductItemProvider extends CDOItemProviderAdapter
protected void addPricePropertyDescriptor(Object object)
{
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_Product_price_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
- CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
- null));
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Product_price_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+ CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+ null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 926c037cb9..873e0e8e09 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -85,10 +85,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
protected void addSupplierPropertyDescriptor(Object object)
{
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
- "_UI_PurchaseOrder_type"),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
+ "_UI_PurchaseOrder_type"),
CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
index 5d724d0948..7d63eb8c53 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gastro.business.edit;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.gastro.business.provider.BusinessEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index fa96eb65a2..6ed5249fed 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -43,7 +43,7 @@ import java.util.List;
* @generated
*/
public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 37db90ed46..866f1ac584 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index 062f23b9fa..57482a3381 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -42,7 +42,7 @@ import java.util.List;
* @generated
*/
public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index 90be932e1e..d108c09739 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
index b239ef8ab1..d9b233ed19 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 89c4fb747e..84429271f4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
* @generated
*/
public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index 76af5858b1..17739155e6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 048e4f0db9..47263a0c6f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 3c9662eb6e..67bf336330 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -42,7 +42,7 @@ import java.util.List;
* @generated
*/
public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 10cb51e326..0aee60e852 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index a2a66e02db..f676dd3475 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 862cc521a6..99966c527f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index a20b90f985..8df3223e09 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -42,7 +42,7 @@ import java.util.List;
* @generated
*/
public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 2f05b6ad14..1bfbce1a21 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -42,7 +42,7 @@ import java.util.List;
* @generated
*/
public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index 8685b5cc97..aa36005f76 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* @generated
*/
public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index 2e18d4e2ee..30d4d27fcc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -42,7 +42,7 @@ import java.util.List;
* @generated
*/
public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index d4bb0852f7..2a8f4ff5c8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
* @generated
*/
public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -110,10 +110,10 @@ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, II
protected void addOrderLimitPropertyDescriptor(Object object)
{
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
- "_UI_StockProduct_type"),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
+ "_UI_StockProduct_type"),
InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index a81c1948bd..efec05d89c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
* @generated
*/
public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
index 1e9592340d..d039b7e2cd 100644
--- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples;version="4.0.500";x-internal:=true,
- org.eclipse.emf.cdo.examples.server;version="4.0.500";x-internal:=true,
- org.eclipse.emf.cdo.examples.server.offline;version="4.0.500";x-internal:=true,
- org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.500";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.examples;version="4.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server;version="4.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server.offline;version="4.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.600";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
index dadebb2d3e..054ce6f474 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
@@ -34,7 +34,7 @@ public class Webinar20090129
{
ResourceSet rs = new ResourceSetImpl();
rs.getResourceFactoryRegistry().getExtensionToFactoryMap() //
- .put("xml", new XMLResourceFactoryImpl()); //$NON-NLS-1$
+ .put("xml", new XMLResourceFactoryImpl()); //$NON-NLS-1$
rs.getPackageRegistry().put(MODEL.getNsURI(), MODEL);
URI uri = URI.createFileURI("C:/business/company.xml"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index b85b8568f5..25b7a5b1e8 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
{
System.out.println();
System.out.println(repository.getName() + ": " + repository.getType()
- + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+ + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
}
else if ("0".equals(command))
{
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java
index 809ae6ef03..b8708584d5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java
@@ -46,13 +46,13 @@ public abstract class OM
public static final OMPreferences PREFS = BUNDLE.preferences();
public static final OMPreference<Integer> PREF_REPOSITORY_TIMEOUT_MINUTES = //
- PREFS.init("PREF_REPOSITORY_TIMEOUT_MINUTES", 5); //$NON-NLS-1$
+ PREFS.init("PREF_REPOSITORY_TIMEOUT_MINUTES", 5); //$NON-NLS-1$
public static final OMPreference<Boolean> PREF_REPOSITORY_TIMEOUT_DISABLED = //
- PREFS.init("PREF_REPOSITORY_TIMEOUT_DISABLED", false); //$NON-NLS-1$
+ PREFS.init("PREF_REPOSITORY_TIMEOUT_DISABLED", false); //$NON-NLS-1$
public static final OMPreference<Integer> PREF_DASHBOARD_HEIGHT = //
- PREFS.init("PREF_DASHBOARD_HEIGHT", 0); //$NON-NLS-1$
+ PREFS.init("PREF_DASHBOARD_HEIGHT", 0); //$NON-NLS-1$
public static Image getOverlayImage(Object image, Object overlayImage, int x, int y)
{
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
index a0007378d5..3dc74f0422 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.net4j.util.AdapterUtil;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.collection.Pair;
+import org.eclipse.net4j.util.om.monitor.SubProgressMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -43,7 +44,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.net4j.util.om.monitor.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelection;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
index 191f45bdb5..03ba2826fe 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
@@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* @author Eike Stepper
*/
-public class CDORepositoryItemProvider extends ContainerItemProvider<IContainer<Object>>implements ITableLabelProvider
+public class CDORepositoryItemProvider extends ContainerItemProvider<IContainer<Object>> implements ITableLabelProvider
{
public static final Image REPOSITORY_IMAGE = SharedIcons.getImage(SharedIcons.OBJ_REPO);
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index 4593ae40f8..d4fbf72cd7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.5.100.qualifier
Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
@@ -24,11 +24,11 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional,
org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional,
org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.explorer;version="4.5.0",
- org.eclipse.emf.cdo.explorer.checkouts;version="4.5.0",
- org.eclipse.emf.cdo.explorer.repositories;version="4.5.0",
- org.eclipse.emf.cdo.internal.explorer;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.5.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.repositories;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui"
+Export-Package: org.eclipse.emf.cdo.explorer;version="4.5.100",
+ org.eclipse.emf.cdo.explorer.checkouts;version="4.5.100",
+ org.eclipse.emf.cdo.explorer.repositories;version="4.5.100",
+ org.eclipse.emf.cdo.internal.explorer;version="4.5.100";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.5.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.100";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.repositories;version="4.5.100";x-friends:="org.eclipse.emf.cdo.explorer.ui"
Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
index f8c7e0dcf0..cea378f369 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* @author Eike Stepper
*/
-public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout>implements CDOCheckoutManager
+public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> implements CDOCheckoutManager
{
private static final String PROPERTIES_FILE = "checkout.properties";
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
index 58c24519db..b41a0f4f70 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
@@ -629,25 +629,25 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe
CDOView view = CDOUtil.getView(object);
view.getSession().getRevisionManager().handleRevisions(null, null, false, CDOBranchPoint.UNSPECIFIED_DATE,
false, new CDORevisionHandler()
- {
- public boolean handleRevision(CDORevision revision)
- {
- EClass eClass = revision.getEClass();
- AtomicInteger counter = getCounter(eClass);
-
- String id = revision.getID().toString();
- id = id.substring(0, id.length() - "A".length());
- id = id.substring(id.lastIndexOf('_') + 1);
-
- int counterValue = Integer.parseInt(id);
- if (counterValue > counter.get())
{
- counter.set(counterValue);
- }
-
- return true;
- }
- });
+ public boolean handleRevision(CDORevision revision)
+ {
+ EClass eClass = revision.getEClass();
+ AtomicInteger counter = getCounter(eClass);
+
+ String id = revision.getID().toString();
+ id = id.substring(0, id.length() - "A".length());
+ id = id.substring(id.lastIndexOf('_') + 1);
+
+ int counterValue = Integer.parseInt(id);
+ if (counterValue > counter.get())
+ {
+ counter.set(counterValue);
+ }
+
+ return true;
+ }
+ });
}
EClass eClass = object.eClass();
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
index f6e3399a03..68b32aa8da 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.expressions.provider;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
index ddfba8684f..e47c935b32 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
@@ -612,7 +612,7 @@ public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFac
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -690,7 +690,7 @@ public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFac
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -698,41 +698,77 @@ public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFac
public void dispose()
{
if (booleanValueItemProvider != null)
+ {
booleanValueItemProvider.dispose();
+ }
if (byteValueItemProvider != null)
+ {
byteValueItemProvider.dispose();
+ }
if (shortValueItemProvider != null)
+ {
shortValueItemProvider.dispose();
+ }
if (intValueItemProvider != null)
+ {
intValueItemProvider.dispose();
+ }
if (longValueItemProvider != null)
+ {
longValueItemProvider.dispose();
+ }
if (floatValueItemProvider != null)
+ {
floatValueItemProvider.dispose();
+ }
if (doubleValueItemProvider != null)
+ {
doubleValueItemProvider.dispose();
+ }
if (charValueItemProvider != null)
+ {
charValueItemProvider.dispose();
+ }
if (stringValueItemProvider != null)
+ {
stringValueItemProvider.dispose();
+ }
if (functionInvocationItemProvider != null)
+ {
functionInvocationItemProvider.dispose();
+ }
if (memberInvocationItemProvider != null)
+ {
memberInvocationItemProvider.dispose();
+ }
if (staticAccessItemProvider != null)
+ {
staticAccessItemProvider.dispose();
+ }
if (memberAccessItemProvider != null)
+ {
memberAccessItemProvider.dispose();
+ }
if (contextAccessItemProvider != null)
+ {
contextAccessItemProvider.dispose();
+ }
if (containedObjectItemProvider != null)
+ {
containedObjectItemProvider.dispose();
+ }
if (linkedObjectItemProvider != null)
+ {
linkedObjectItemProvider.dispose();
+ }
if (linkedExpressionItemProvider != null)
+ {
linkedExpressionItemProvider.dispose();
+ }
if (listConstructionItemProvider != null)
+ {
listConstructionItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
index 0c00fe02ef..d089b6a630 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.expressions.ExpressionsPackage;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
index cc36ffe607..c6c6123795 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.expressions.provider;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
index 1b47efc662..26a765aeff 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.expressions.presentation;
import org.eclipse.emf.cdo.expressions.provider.ExpressionsItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CommandStack;
@@ -25,6 +24,7 @@ import org.eclipse.emf.common.ui.viewer.IViewerProvider;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EContentAdapter;
@@ -1444,7 +1444,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
*/
protected void doSaveAs(URI uri, IEditorInput editorInput)
{
- (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+ editingDomain.getResourceSet().getResources().get(0).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
index 55f1013ab5..5a99a4ad89 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
*
* @author Eike Stepper
*/
-public class EvaluationContextImpl extends HashMap<String, Object>implements EvaluationContext
+public class EvaluationContextImpl extends HashMap<String, Object> implements EvaluationContext
{
private static final long serialVersionUID = 1L;
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
index c82761cbcf..3760b30666 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
@@ -92,41 +92,41 @@ public class ExpressionsFactoryImpl extends EFactoryImpl implements ExpressionsF
switch (eClass.getClassifierID())
{
case ExpressionsPackage.BOOLEAN_VALUE:
- return (EObject)createBooleanValue();
+ return createBooleanValue();
case ExpressionsPackage.BYTE_VALUE:
- return (EObject)createByteValue();
+ return createByteValue();
case ExpressionsPackage.SHORT_VALUE:
- return (EObject)createShortValue();
+ return createShortValue();
case ExpressionsPackage.INT_VALUE:
- return (EObject)createIntValue();
+ return createIntValue();
case ExpressionsPackage.LONG_VALUE:
- return (EObject)createLongValue();
+ return createLongValue();
case ExpressionsPackage.FLOAT_VALUE:
- return (EObject)createFloatValue();
+ return createFloatValue();
case ExpressionsPackage.DOUBLE_VALUE:
- return (EObject)createDoubleValue();
+ return createDoubleValue();
case ExpressionsPackage.CHAR_VALUE:
- return (EObject)createCharValue();
+ return createCharValue();
case ExpressionsPackage.STRING_VALUE:
- return (EObject)createStringValue();
+ return createStringValue();
case ExpressionsPackage.FUNCTION_INVOCATION:
- return (EObject)createFunctionInvocation();
+ return createFunctionInvocation();
case ExpressionsPackage.MEMBER_INVOCATION:
- return (EObject)createMemberInvocation();
+ return createMemberInvocation();
case ExpressionsPackage.STATIC_ACCESS:
- return (EObject)createStaticAccess();
+ return createStaticAccess();
case ExpressionsPackage.MEMBER_ACCESS:
- return (EObject)createMemberAccess();
+ return createMemberAccess();
case ExpressionsPackage.CONTEXT_ACCESS:
- return (EObject)createContextAccess();
+ return createContextAccess();
case ExpressionsPackage.CONTAINED_OBJECT:
- return (EObject)createContainedObject();
+ return createContainedObject();
case ExpressionsPackage.LINKED_OBJECT:
- return (EObject)createLinkedObject();
+ return createLinkedObject();
case ExpressionsPackage.LINKED_EXPRESSION:
- return (EObject)createLinkedExpression();
+ return createLinkedExpression();
case ExpressionsPackage.LIST_CONSTRUCTION:
- return (EObject)createListConstruction();
+ return createListConstruction();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
index 6cc0b0a636..2ee088d5db 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
@@ -243,7 +243,7 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link ExpressionsPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -256,7 +256,9 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
public static ExpressionsPackage init()
{
if (isInited)
+ {
return (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
+ }
// Obtain or create and register package
ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE
@@ -739,7 +741,9 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
public void createPackageContents()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -828,7 +832,9 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
public void initializePackageContents()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -844,27 +850,27 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
// Set bounds for type parameters
// Add supertypes to classes
- valueEClass.getESuperTypes().add(this.getExpression());
- booleanValueEClass.getESuperTypes().add(this.getValue());
- byteValueEClass.getESuperTypes().add(this.getValue());
- shortValueEClass.getESuperTypes().add(this.getValue());
- intValueEClass.getESuperTypes().add(this.getValue());
- longValueEClass.getESuperTypes().add(this.getValue());
- floatValueEClass.getESuperTypes().add(this.getValue());
- doubleValueEClass.getESuperTypes().add(this.getValue());
- charValueEClass.getESuperTypes().add(this.getValue());
- stringValueEClass.getESuperTypes().add(this.getValue());
- invocationEClass.getESuperTypes().add(this.getExpression());
- functionInvocationEClass.getESuperTypes().add(this.getInvocation());
- memberInvocationEClass.getESuperTypes().add(this.getInvocation());
- accessEClass.getESuperTypes().add(this.getExpression());
- staticAccessEClass.getESuperTypes().add(this.getAccess());
- memberAccessEClass.getESuperTypes().add(this.getAccess());
- contextAccessEClass.getESuperTypes().add(this.getAccess());
- containedObjectEClass.getESuperTypes().add(this.getExpression());
- linkedObjectEClass.getESuperTypes().add(this.getExpression());
- linkedExpressionEClass.getESuperTypes().add(this.getExpression());
- listConstructionEClass.getESuperTypes().add(this.getExpression());
+ valueEClass.getESuperTypes().add(getExpression());
+ booleanValueEClass.getESuperTypes().add(getValue());
+ byteValueEClass.getESuperTypes().add(getValue());
+ shortValueEClass.getESuperTypes().add(getValue());
+ intValueEClass.getESuperTypes().add(getValue());
+ longValueEClass.getESuperTypes().add(getValue());
+ floatValueEClass.getESuperTypes().add(getValue());
+ doubleValueEClass.getESuperTypes().add(getValue());
+ charValueEClass.getESuperTypes().add(getValue());
+ stringValueEClass.getESuperTypes().add(getValue());
+ invocationEClass.getESuperTypes().add(getExpression());
+ functionInvocationEClass.getESuperTypes().add(getInvocation());
+ memberInvocationEClass.getESuperTypes().add(getInvocation());
+ accessEClass.getESuperTypes().add(getExpression());
+ staticAccessEClass.getESuperTypes().add(getAccess());
+ memberAccessEClass.getESuperTypes().add(getAccess());
+ contextAccessEClass.getESuperTypes().add(getAccess());
+ containedObjectEClass.getESuperTypes().add(getExpression());
+ linkedObjectEClass.getESuperTypes().add(getExpression());
+ linkedExpressionEClass.getESuperTypes().add(getExpression());
+ listConstructionEClass.getESuperTypes().add(getExpression());
// Initialize classes, features, and operations; add parameters
initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE,
@@ -872,7 +878,7 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
EOperation op = initEOperation(getExpression__Evaluate__EvaluationContext(), ecorePackage.getEJavaObject(),
"evaluate", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, this.getEvaluationContext(), "context", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, getEvaluationContext(), "context", 0, 1, IS_UNIQUE, IS_ORDERED);
initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -921,24 +927,24 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
initEClass(invocationEClass, Invocation.class, "Invocation", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getInvocation_Arguments(), this.getExpression(), null, "arguments", null, 0, -1, Invocation.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getInvocation_Name(), this.getExpression(), null, "name", null, 1, 1, Invocation.class,
+ initEReference(getInvocation_Arguments(), getExpression(), null, "arguments", null, 0, -1, Invocation.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
+ initEReference(getInvocation_Name(), getExpression(), null, "name", null, 1, 1, Invocation.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
initEClass(functionInvocationEClass, FunctionInvocation.class, "FunctionInvocation", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEClass(memberInvocationEClass, MemberInvocation.class, "MemberInvocation", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getMemberInvocation_Object(), this.getExpression(), null, "object", null, 1, 1,
- MemberInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMemberInvocation_Object(), getExpression(), null, "object", null, 1, 1, MemberInvocation.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(accessEClass, Access.class, "Access", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getAccess_Name(), this.getExpression(), null, "name", null, 1, 1, Access.class, !IS_TRANSIENT,
+ initEReference(getAccess_Name(), getExpression(), null, "name", null, 1, 1, Access.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
@@ -947,7 +953,7 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
initEClass(memberAccessEClass, MemberAccess.class, "MemberAccess", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getMemberAccess_Object(), this.getExpression(), null, "object", null, 1, 1, MemberAccess.class,
+ initEReference(getMemberAccess_Object(), getExpression(), null, "object", null, 1, 1, MemberAccess.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
@@ -968,13 +974,13 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
initEClass(linkedExpressionEClass, LinkedExpression.class, "LinkedExpression", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getLinkedExpression_Expression(), this.getExpression(), null, "expression", null, 1, 1,
+ initEReference(getLinkedExpression_Expression(), getExpression(), null, "expression", null, 1, 1,
LinkedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(listConstructionEClass, ListConstruction.class, "ListConstruction", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getListConstruction_Elements(), this.getExpression(), null, "elements", null, 0, -1,
+ initEReference(getListConstruction_Elements(), getExpression(), null, "elements", null, 0, -1,
ListConstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
index f9d9a508cb..66307240e3 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
@@ -125,7 +125,9 @@ public class LinkedExpressionImpl extends CDOObjectImpl implements LinkedExpress
{
case ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION:
if (resolve)
+ {
return getExpression();
+ }
return basicGetExpression();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
index 9cf1459ce6..c1d8bc29a8 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
@@ -123,7 +123,9 @@ public class LinkedObjectImpl extends CDOObjectImpl implements LinkedObject
{
case ExpressionsPackage.LINKED_OBJECT__OBJECT:
if (resolve)
+ {
return getObject();
+ }
return basicGetObject();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsSwitch.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsSwitch.java
index 7c0ae83dc4..4022f6fb32 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsSwitch.java
@@ -106,7 +106,9 @@ public class ExpressionsSwitch<T> extends Switch<T>
Expression expression = (Expression)theEObject;
T result = caseExpression(expression);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.VALUE:
@@ -114,9 +116,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
Value value = (Value)theEObject;
T result = caseValue(value);
if (result == null)
+ {
result = caseExpression(value);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.BOOLEAN_VALUE:
@@ -124,11 +130,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
BooleanValue booleanValue = (BooleanValue)theEObject;
T result = caseBooleanValue(booleanValue);
if (result == null)
+ {
result = caseValue(booleanValue);
+ }
if (result == null)
+ {
result = caseExpression(booleanValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.BYTE_VALUE:
@@ -136,11 +148,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
ByteValue byteValue = (ByteValue)theEObject;
T result = caseByteValue(byteValue);
if (result == null)
+ {
result = caseValue(byteValue);
+ }
if (result == null)
+ {
result = caseExpression(byteValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.SHORT_VALUE:
@@ -148,11 +166,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
ShortValue shortValue = (ShortValue)theEObject;
T result = caseShortValue(shortValue);
if (result == null)
+ {
result = caseValue(shortValue);
+ }
if (result == null)
+ {
result = caseExpression(shortValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.INT_VALUE:
@@ -160,11 +184,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
IntValue intValue = (IntValue)theEObject;
T result = caseIntValue(intValue);
if (result == null)
+ {
result = caseValue(intValue);
+ }
if (result == null)
+ {
result = caseExpression(intValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.LONG_VALUE:
@@ -172,11 +202,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
LongValue longValue = (LongValue)theEObject;
T result = caseLongValue(longValue);
if (result == null)
+ {
result = caseValue(longValue);
+ }
if (result == null)
+ {
result = caseExpression(longValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.FLOAT_VALUE:
@@ -184,11 +220,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
FloatValue floatValue = (FloatValue)theEObject;
T result = caseFloatValue(floatValue);
if (result == null)
+ {
result = caseValue(floatValue);
+ }
if (result == null)
+ {
result = caseExpression(floatValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.DOUBLE_VALUE:
@@ -196,11 +238,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
DoubleValue doubleValue = (DoubleValue)theEObject;
T result = caseDoubleValue(doubleValue);
if (result == null)
+ {
result = caseValue(doubleValue);
+ }
if (result == null)
+ {
result = caseExpression(doubleValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.CHAR_VALUE:
@@ -208,11 +256,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
CharValue charValue = (CharValue)theEObject;
T result = caseCharValue(charValue);
if (result == null)
+ {
result = caseValue(charValue);
+ }
if (result == null)
+ {
result = caseExpression(charValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.STRING_VALUE:
@@ -220,11 +274,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
StringValue stringValue = (StringValue)theEObject;
T result = caseStringValue(stringValue);
if (result == null)
+ {
result = caseValue(stringValue);
+ }
if (result == null)
+ {
result = caseExpression(stringValue);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.INVOCATION:
@@ -232,9 +292,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
Invocation invocation = (Invocation)theEObject;
T result = caseInvocation(invocation);
if (result == null)
+ {
result = caseExpression(invocation);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.FUNCTION_INVOCATION:
@@ -242,11 +306,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
FunctionInvocation functionInvocation = (FunctionInvocation)theEObject;
T result = caseFunctionInvocation(functionInvocation);
if (result == null)
+ {
result = caseInvocation(functionInvocation);
+ }
if (result == null)
+ {
result = caseExpression(functionInvocation);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.MEMBER_INVOCATION:
@@ -254,11 +324,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
MemberInvocation memberInvocation = (MemberInvocation)theEObject;
T result = caseMemberInvocation(memberInvocation);
if (result == null)
+ {
result = caseInvocation(memberInvocation);
+ }
if (result == null)
+ {
result = caseExpression(memberInvocation);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.ACCESS:
@@ -266,9 +342,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
Access access = (Access)theEObject;
T result = caseAccess(access);
if (result == null)
+ {
result = caseExpression(access);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.STATIC_ACCESS:
@@ -276,11 +356,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
StaticAccess staticAccess = (StaticAccess)theEObject;
T result = caseStaticAccess(staticAccess);
if (result == null)
+ {
result = caseAccess(staticAccess);
+ }
if (result == null)
+ {
result = caseExpression(staticAccess);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.MEMBER_ACCESS:
@@ -288,11 +374,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
MemberAccess memberAccess = (MemberAccess)theEObject;
T result = caseMemberAccess(memberAccess);
if (result == null)
+ {
result = caseAccess(memberAccess);
+ }
if (result == null)
+ {
result = caseExpression(memberAccess);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.CONTEXT_ACCESS:
@@ -300,11 +392,17 @@ public class ExpressionsSwitch<T> extends Switch<T>
ContextAccess contextAccess = (ContextAccess)theEObject;
T result = caseContextAccess(contextAccess);
if (result == null)
+ {
result = caseAccess(contextAccess);
+ }
if (result == null)
+ {
result = caseExpression(contextAccess);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.CONTAINED_OBJECT:
@@ -312,9 +410,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
ContainedObject containedObject = (ContainedObject)theEObject;
T result = caseContainedObject(containedObject);
if (result == null)
+ {
result = caseExpression(containedObject);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.LINKED_OBJECT:
@@ -322,9 +424,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
LinkedObject linkedObject = (LinkedObject)theEObject;
T result = caseLinkedObject(linkedObject);
if (result == null)
+ {
result = caseExpression(linkedObject);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.LINKED_EXPRESSION:
@@ -332,9 +438,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
LinkedExpression linkedExpression = (LinkedExpression)theEObject;
T result = caseLinkedExpression(linkedExpression);
if (result == null)
+ {
result = caseExpression(linkedExpression);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case ExpressionsPackage.LIST_CONSTRUCTION:
@@ -342,9 +452,13 @@ public class ExpressionsSwitch<T> extends Switch<T>
ListConstruction listConstruction = (ListConstruction)theEObject;
T result = caseListConstruction(listConstruction);
if (result == null)
+ {
result = caseExpression(listConstruction);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
index 3d3b6560cc..b59fdd8d14 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
@@ -83,7 +83,7 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest
{
throw new IllegalStateException(
MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.1"), entry //$NON-NLS-1$
- .getValue()));
+ .getValue()));
}
CDOID newID = commitContext.getResult().getIDMappings().get(oldCDOID);
@@ -91,7 +91,7 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest
{
throw new IllegalStateException(
MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.2"), oldCDOID //$NON-NLS-1$
- .toURIFragment()));
+ .toURIFragment()));
}
CDOID newIDExternal = CDOURIUtil.convertExternalCDOID(oldURIExternal, newID);
diff --git a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
index 87f793fa36..f3c9db6727 100644
--- a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Release Engineering
Bundle-SymbolicName: org.eclipse.emf.cdo.releng
-Bundle-Version: 4.2.200.qualifier
+Bundle-Version: 4.2.300.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.releng;version="4.2.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng;version="4.2.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
index 507f0e27d2..362eba0d48 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
@@ -379,7 +379,7 @@ public class Api2Html extends DefaultHandler
{
// Just for local testing!
args = new String[] { "/develop", "R20120918-0947", "/develop/git/cdo/plugins",
- "/develop/ws/cdo/.buckminster/tp/plugins" };
+ "/develop/ws/cdo/.buckminster/tp/plugins" };
}
new Api2Html(new File(args[0]), args[1], new File(args[2]), new File(args[3]));
@@ -477,7 +477,7 @@ public class Api2Html extends DefaultHandler
{
String href = getHref();
out.print(indent + getIcon() + " " + (href != null ? "<a href='" + href + "' target='_blank'>" : "") + getText()
- + (href != null ? "</a>" : ""));
+ + (href != null ? "</a>" : ""));
}
protected String getHref() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
index aa8b1a28c7..ee4f559af2 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
@@ -636,7 +636,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -714,7 +714,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -722,41 +722,77 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory
public void dispose()
{
if (realmItemProvider != null)
+ {
realmItemProvider.dispose();
+ }
if (directoryItemProvider != null)
+ {
directoryItemProvider.dispose();
+ }
if (roleItemProvider != null)
+ {
roleItemProvider.dispose();
+ }
if (groupItemProvider != null)
+ {
groupItemProvider.dispose();
+ }
if (userItemProvider != null)
+ {
userItemProvider.dispose();
+ }
if (userPasswordItemProvider != null)
+ {
userPasswordItemProvider.dispose();
+ }
if (classPermissionItemProvider != null)
+ {
classPermissionItemProvider.dispose();
+ }
if (packagePermissionItemProvider != null)
+ {
packagePermissionItemProvider.dispose();
+ }
if (resourcePermissionItemProvider != null)
+ {
resourcePermissionItemProvider.dispose();
+ }
if (filterPermissionItemProvider != null)
+ {
filterPermissionItemProvider.dispose();
+ }
if (linkedFilterItemProvider != null)
+ {
linkedFilterItemProvider.dispose();
+ }
if (packageFilterItemProvider != null)
+ {
packageFilterItemProvider.dispose();
+ }
if (classFilterItemProvider != null)
+ {
classFilterItemProvider.dispose();
+ }
if (resourceFilterItemProvider != null)
+ {
resourceFilterItemProvider.dispose();
+ }
if (expressionFilterItemProvider != null)
+ {
expressionFilterItemProvider.dispose();
+ }
if (notFilterItemProvider != null)
+ {
notFilterItemProvider.dispose();
+ }
if (andFilterItemProvider != null)
+ {
andFilterItemProvider.dispose();
+ }
if (orFilterItemProvider != null)
+ {
orFilterItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
index bea4b5359e..9787339e8d 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
@@ -1446,7 +1446,7 @@ public class SecurityEditor extends MultiPageEditorPart
*/
protected void doSaveAs(URI uri, IEditorInput editorInput)
{
- (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+ editingDomain.getResourceSet().getResources().get(0).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.security.ui/META-INF/MANIFEST.MF
index 0e3889af3e..a198b61fec 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.security.ui/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.security.ui;singleton:=true
-Bundle-Version: 4.3.200.qualifier
+Bundle-Version: 4.3.300.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.security.internal.ui.bundle;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.internal.ui.dialogs;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.internal.ui.editor;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.internal.ui.handlers;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.internal.ui.messages;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.internal.ui.util;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.security.ui;version="4.3.200"
+Export-Package: org.eclipse.emf.cdo.security.internal.ui.bundle;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.internal.ui.dialogs;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.internal.ui.editor;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.internal.ui.handlers;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.internal.ui.messages;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.internal.ui.util;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.security.ui;version="4.3.300"
Require-Bundle: org.eclipse.emf.cdo.security;bundle-version="[4.3.0,5.0.0)",
org.eclipse.emf.cdo.security.edit;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.ui;bundle-version="[4.3.0,5.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
index ad2f034384..edaa6c7e35 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
@@ -61,7 +61,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
*
* @author Christian W. Damus (CEA LIST)
*/
-public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSectionPart<T>implements IDetailsPage
+public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSectionPart<T> implements IDetailsPage
{
public AbstractDetailsPage(Class<T> elementType, EClass elementEClass, EditingDomain domain,
AdapterFactory adapterFactory)
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
index cefcb8e8ae..f8c58a3ecf 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
@@ -339,7 +339,7 @@ public class CDOSecurityPage extends FormPage
{
return new Action(Messages.CDOSecurityPage_0, ExtendedImageRegistry.getInstance()
.getImageDescriptor(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/advanced.gif", true))) //$NON-NLS-1$
- {
+ {
@Override
public void run()
{
@@ -355,6 +355,6 @@ public class CDOSecurityPage extends FormPage
OM.LOG.error(e);
}
}
- };
+ };
}
}
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
index 773defc302..df66956fbd 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
@@ -105,41 +105,41 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
switch (eClass.getClassifierID())
{
case SecurityPackage.REALM:
- return (EObject)createRealm();
+ return createRealm();
case SecurityPackage.DIRECTORY:
- return (EObject)createDirectory();
+ return createDirectory();
case SecurityPackage.ROLE:
- return (EObject)createRole();
+ return createRole();
case SecurityPackage.GROUP:
- return (EObject)createGroup();
+ return createGroup();
case SecurityPackage.USER:
- return (EObject)createUser();
+ return createUser();
case SecurityPackage.USER_PASSWORD:
- return (EObject)createUserPassword();
+ return createUserPassword();
case SecurityPackage.CLASS_PERMISSION:
- return (EObject)createClassPermission();
+ return createClassPermission();
case SecurityPackage.PACKAGE_PERMISSION:
- return (EObject)createPackagePermission();
+ return createPackagePermission();
case SecurityPackage.RESOURCE_PERMISSION:
- return (EObject)createResourcePermission();
+ return createResourcePermission();
case SecurityPackage.FILTER_PERMISSION:
- return (EObject)createFilterPermission();
+ return createFilterPermission();
case SecurityPackage.LINKED_FILTER:
- return (EObject)createLinkedFilter();
+ return createLinkedFilter();
case SecurityPackage.PACKAGE_FILTER:
- return (EObject)createPackageFilter();
+ return createPackageFilter();
case SecurityPackage.CLASS_FILTER:
- return (EObject)createClassFilter();
+ return createClassFilter();
case SecurityPackage.RESOURCE_FILTER:
- return (EObject)createResourceFilter();
+ return createResourceFilter();
case SecurityPackage.EXPRESSION_FILTER:
- return (EObject)createExpressionFilter();
+ return createExpressionFilter();
case SecurityPackage.NOT_FILTER:
- return (EObject)createNotFilter();
+ return createNotFilter();
case SecurityPackage.AND_FILTER:
- return (EObject)createAndFilter();
+ return createAndFilter();
case SecurityPackage.OR_FILTER:
- return (EObject)createOrFilter();
+ return createOrFilter();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -577,8 +577,10 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
{
PatternStyle result = PatternStyle.get(initialValue);
if (result == null)
+ {
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result;
}
@@ -612,8 +614,10 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
{
Access result = Access.get(initialValue);
if (result == null)
+ {
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
index 959fd329ff..68efc25cdc 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
@@ -296,7 +296,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link SecurityPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -309,7 +309,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
public static SecurityPackage init()
{
if (isInited)
+ {
return (SecurityPackage)EPackage.Registry.INSTANCE.getEPackage(SecurityPackage.eNS_URI);
+ }
// Obtain or create and register package
SecurityPackageImpl theSecurityPackage = (SecurityPackageImpl)(EPackage.Registry.INSTANCE
@@ -1275,7 +1277,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
public void createPackageContents()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -1414,7 +1418,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
public void initializePackageContents()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -1434,70 +1440,70 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
// Add supertypes to classes
securityElementEClass.getESuperTypes().add(theEtypesPackage.getModelElement());
- securityItemEClass.getESuperTypes().add(this.getSecurityElement());
- realmEClass.getESuperTypes().add(this.getSecurityElement());
- directoryEClass.getESuperTypes().add(this.getSecurityItem());
- roleEClass.getESuperTypes().add(this.getSecurityItem());
- assigneeEClass.getESuperTypes().add(this.getSecurityItem());
- groupEClass.getESuperTypes().add(this.getAssignee());
- userEClass.getESuperTypes().add(this.getAssignee());
- classPermissionEClass.getESuperTypes().add(this.getPermission());
- packagePermissionEClass.getESuperTypes().add(this.getPermission());
- resourcePermissionEClass.getESuperTypes().add(this.getPermission());
- objectPermissionEClass.getESuperTypes().add(this.getPermission());
- filterPermissionEClass.getESuperTypes().add(this.getPermission());
- linkedFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- packageFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- classFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- resourceFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- objectFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- expressionFilterEClass.getESuperTypes().add(this.getObjectFilter());
- combinedFilterEClass.getESuperTypes().add(this.getPermissionFilter());
- notFilterEClass.getESuperTypes().add(this.getCombinedFilter());
- andFilterEClass.getESuperTypes().add(this.getCombinedFilter());
- orFilterEClass.getESuperTypes().add(this.getCombinedFilter());
+ securityItemEClass.getESuperTypes().add(getSecurityElement());
+ realmEClass.getESuperTypes().add(getSecurityElement());
+ directoryEClass.getESuperTypes().add(getSecurityItem());
+ roleEClass.getESuperTypes().add(getSecurityItem());
+ assigneeEClass.getESuperTypes().add(getSecurityItem());
+ groupEClass.getESuperTypes().add(getAssignee());
+ userEClass.getESuperTypes().add(getAssignee());
+ classPermissionEClass.getESuperTypes().add(getPermission());
+ packagePermissionEClass.getESuperTypes().add(getPermission());
+ resourcePermissionEClass.getESuperTypes().add(getPermission());
+ objectPermissionEClass.getESuperTypes().add(getPermission());
+ filterPermissionEClass.getESuperTypes().add(getPermission());
+ linkedFilterEClass.getESuperTypes().add(getPermissionFilter());
+ packageFilterEClass.getESuperTypes().add(getPermissionFilter());
+ classFilterEClass.getESuperTypes().add(getPermissionFilter());
+ resourceFilterEClass.getESuperTypes().add(getPermissionFilter());
+ objectFilterEClass.getESuperTypes().add(getPermissionFilter());
+ expressionFilterEClass.getESuperTypes().add(getObjectFilter());
+ combinedFilterEClass.getESuperTypes().add(getPermissionFilter());
+ notFilterEClass.getESuperTypes().add(getCombinedFilter());
+ andFilterEClass.getESuperTypes().add(getCombinedFilter());
+ orFilterEClass.getESuperTypes().add(getCombinedFilter());
// Initialize classes and features; add operations and parameters
initEClass(securityElementEClass, SecurityElement.class, "SecurityElement", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- addEOperation(securityElementEClass, this.getRealm(), "getRealm", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ addEOperation(securityElementEClass, getRealm(), "getRealm", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
initEClass(securityItemEClass, SecurityItem.class, "SecurityItem", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
initEClass(realmEClass, Realm.class, "Realm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRealm_Items(), this.getSecurityItem(), null, "items", null, 0, -1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getRealm_Items(), getSecurityItem(), null, "items", null, 0, -1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
- initEReference(getRealm_AllUsers(), this.getUser(), null, "allUsers", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getRealm_AllUsers(), getUser(), null, "allUsers", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
- initEReference(getRealm_AllGroups(), this.getGroup(), null, "allGroups", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getRealm_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
- initEReference(getRealm_AllRoles(), this.getRole(), null, "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getRealm_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
- initEReference(getRealm_AllPermissions(), this.getPermission(), null, "allPermissions", null, 0, -1, Realm.class, //$NON-NLS-1$
+ initEReference(getRealm_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, Realm.class, //$NON-NLS-1$
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
IS_DERIVED, IS_ORDERED);
initEAttribute(getRealm_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRealm_DefaultAccess(), this.getAccessObject(), "defaultAccess", null, 0, 1, Realm.class, //$NON-NLS-1$
+ initEAttribute(getRealm_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, Realm.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRealm_DefaultUserDirectory(), this.getDirectory(), null, "defaultUserDirectory", null, 0, 1, //$NON-NLS-1$
+ initEReference(getRealm_DefaultUserDirectory(), getDirectory(), null, "defaultUserDirectory", null, 0, 1, //$NON-NLS-1$
Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRealm_DefaultGroupDirectory(), this.getDirectory(), null, "defaultGroupDirectory", null, 0, 1, //$NON-NLS-1$
+ initEReference(getRealm_DefaultGroupDirectory(), getDirectory(), null, "defaultGroupDirectory", null, 0, 1, //$NON-NLS-1$
Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRealm_DefaultRoleDirectory(), this.getDirectory(), null, "defaultRoleDirectory", null, 0, 1, //$NON-NLS-1$
+ initEReference(getRealm_DefaultRoleDirectory(), getDirectory(), null, "defaultRoleDirectory", null, 0, 1, //$NON-NLS-1$
Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(directoryEClass, Directory.class, "Directory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getDirectory_Items(), this.getSecurityItem(), null, "items", null, 0, -1, Directory.class, //$NON-NLS-1$
+ initEReference(getDirectory_Items(), getSecurityItem(), null, "items", null, 0, -1, Directory.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getDirectory_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Directory.class, //$NON-NLS-1$
@@ -1506,42 +1512,42 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
initEClass(roleEClass, Role.class, "Role", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getRole_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Role.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRole_Permissions(), this.getPermission(), this.getPermission_Role(), "permissions", null, 0, -1, //$NON-NLS-1$
+ initEReference(getRole_Permissions(), getPermission(), getPermission_Role(), "permissions", null, 0, -1, //$NON-NLS-1$
Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRole_Assignees(), this.getAssignee(), this.getAssignee_Roles(), "assignees", null, 0, -1, //$NON-NLS-1$
+ initEReference(getRole_Assignees(), getAssignee(), getAssignee_Roles(), "assignees", null, 0, -1, //$NON-NLS-1$
Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(assigneeEClass, Assignee.class, "Assignee", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getAssignee_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Assignee.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getAssignee_Roles(), this.getRole(), this.getRole_Assignees(), "roles", null, 0, -1, Assignee.class, //$NON-NLS-1$
+ initEReference(getAssignee_Roles(), getRole(), getRole_Assignees(), "roles", null, 0, -1, Assignee.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getGroup_Users(), this.getUser(), this.getUser_Groups(), "users", null, 0, -1, Group.class, //$NON-NLS-1$
+ initEReference(getGroup_Users(), getUser(), getUser_Groups(), "users", null, 0, -1, Group.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getGroup_InheritedGroups(), this.getGroup(), this.getGroup_InheritingGroups(), "inheritedGroups", //$NON-NLS-1$
+ initEReference(getGroup_InheritedGroups(), getGroup(), getGroup_InheritingGroups(), "inheritedGroups", //$NON-NLS-1$
null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGroup_InheritingGroups(), this.getGroup(), this.getGroup_InheritedGroups(), "inheritingGroups", //$NON-NLS-1$
+ initEReference(getGroup_InheritingGroups(), getGroup(), getGroup_InheritedGroups(), "inheritingGroups", //$NON-NLS-1$
null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGroup_AllInheritedGroups(), this.getGroup(), null, "allInheritedGroups", null, 0, -1, Group.class, //$NON-NLS-1$
+ initEReference(getGroup_AllInheritedGroups(), getGroup(), null, "allInheritedGroups", null, 0, -1, Group.class, //$NON-NLS-1$
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
IS_DERIVED, IS_ORDERED);
- initEReference(getGroup_AllInheritingGroups(), this.getGroup(), null, "allInheritingGroups", null, 0, -1, //$NON-NLS-1$
+ initEReference(getGroup_AllInheritingGroups(), getGroup(), null, "allInheritingGroups", null, 0, -1, //$NON-NLS-1$
Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEReference(getGroup_AllRoles(), this.getRole(), null, "allRoles", null, 0, -1, Group.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getGroup_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Group.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getUser_Groups(), this.getGroup(), this.getGroup_Users(), "groups", null, 0, -1, User.class, //$NON-NLS-1$
+ initEReference(getUser_Groups(), getGroup(), getGroup_Users(), "groups", null, 0, -1, User.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getUser_Label(), theEcorePackage.getEString(), "label", null, 0, 1, User.class, IS_TRANSIENT, //$NON-NLS-1$
@@ -1552,26 +1558,26 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getUser_Email(), theEcorePackage.getEString(), "email", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getUser_DefaultAccessOverride(), this.getAccessObject(), "defaultAccessOverride", null, 0, 1, //$NON-NLS-1$
+ initEAttribute(getUser_DefaultAccessOverride(), getAccessObject(), "defaultAccessOverride", null, 0, 1, //$NON-NLS-1$
User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
- initEAttribute(getUser_DefaultAccess(), this.getAccessObject(), "defaultAccess", null, 0, 1, User.class, //$NON-NLS-1$
+ initEAttribute(getUser_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, User.class, //$NON-NLS-1$
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getUser_Locked(), theEcorePackage.getEBoolean(), "locked", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getUser_Password(), this.getUserPassword(), null, "password", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getUser_Password(), getUserPassword(), null, "password", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
- initEReference(getUser_AllGroups(), this.getGroup(), null, "allGroups", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getUser_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
- initEReference(getUser_AllRoles(), this.getRole(), null, "allRoles", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+ initEReference(getUser_AllRoles(), getRole(), null, "allRoles", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
- initEReference(getUser_AllPermissions(), this.getPermission(), null, "allPermissions", null, 0, -1, User.class, //$NON-NLS-1$
+ initEReference(getUser_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, User.class, //$NON-NLS-1$
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
IS_DERIVED, IS_ORDERED);
- initEReference(getUser_UnassignedRoles(), this.getRole(), null, "unassignedRoles", null, 0, -1, User.class, //$NON-NLS-1$
+ initEReference(getUser_UnassignedRoles(), getRole(), null, "unassignedRoles", null, 0, -1, User.class, //$NON-NLS-1$
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
IS_DERIVED, IS_ORDERED);
@@ -1583,10 +1589,10 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
initEClass(permissionEClass, Permission.class, "Permission", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPermission_Role(), this.getRole(), this.getRole_Permissions(), "role", null, 1, 1, //$NON-NLS-1$
+ initEReference(getPermission_Role(), getRole(), getRole_Permissions(), "role", null, 1, 1, //$NON-NLS-1$
Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPermission_Access(), this.getAccess(), "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, //$NON-NLS-1$//$NON-NLS-2$
+ initEAttribute(getPermission_Access(), getAccess(), "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, //$NON-NLS-1$//$NON-NLS-2$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(classPermissionEClass, ClassPermission.class, "ClassPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -1612,7 +1618,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
initEClass(filterPermissionEClass, FilterPermission.class, "FilterPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getFilterPermission_Filters(), this.getPermissionFilter(), null, "filters", null, 1, -1, //$NON-NLS-1$
+ initEReference(getFilterPermission_Filters(), getPermissionFilter(), null, "filters", null, 1, -1, //$NON-NLS-1$
FilterPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1621,7 +1627,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
initEClass(linkedFilterEClass, LinkedFilter.class, "LinkedFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getLinkedFilter_Filter(), this.getPermissionFilter(), null, "filter", null, 1, 1, LinkedFilter.class, //$NON-NLS-1$
+ initEReference(getLinkedFilter_Filter(), getPermissionFilter(), null, "filter", null, 1, 1, LinkedFilter.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
@@ -1644,7 +1650,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getResourceFilter_Path(), theEcorePackage.getEString(), "path", null, 0, 1, ResourceFilter.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getResourceFilter_PatternStyle(), this.getPatternStyle(), "patternStyle", "TREE", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+ initEAttribute(getResourceFilter_PatternStyle(), getPatternStyle(), "patternStyle", "TREE", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getResourceFilter_Folders(), theEcorePackage.getEBoolean(), "folders", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
@@ -1680,7 +1686,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
initEClass(combinedFilterEClass, CombinedFilter.class, "CombinedFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCombinedFilter_Operands(), this.getPermissionFilter(), null, "operands", null, 1, -1, //$NON-NLS-1$
+ initEReference(getCombinedFilter_Operands(), getPermissionFilter(), null, "operands", null, 1, -1, //$NON-NLS-1$
CombinedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1723,7 +1729,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
*/
protected void createEcoreAnnotations()
{
- String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
+ String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
addAnnotation(realmEClass, source, new String[] { "constraints", "HasAdministrator" //$NON-NLS-1$ //$NON-NLS-2$
});
addAnnotation(groupEClass, source, new String[] { "constraints", "AcyclicInheritance" //$NON-NLS-1$ //$NON-NLS-2$
@@ -1738,7 +1744,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
addAnnotation(accessObjectEDataType, source, new String[] { "name", "Access:Object", //$NON-NLS-1$ //$NON-NLS-2$
"baseType", "Access" //$NON-NLS-1$ //$NON-NLS-2$
});
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
index ec20d359d4..24f84367ca 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
@@ -132,9 +132,13 @@ public class SecuritySwitch<T>
SecurityElement securityElement = (SecurityElement)theEObject;
T result = caseSecurityElement(securityElement);
if (result == null)
+ {
result = caseModelElement(securityElement);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.SECURITY_ITEM:
@@ -142,11 +146,17 @@ public class SecuritySwitch<T>
SecurityItem securityItem = (SecurityItem)theEObject;
T result = caseSecurityItem(securityItem);
if (result == null)
+ {
result = caseSecurityElement(securityItem);
+ }
if (result == null)
+ {
result = caseModelElement(securityItem);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.REALM:
@@ -154,11 +164,17 @@ public class SecuritySwitch<T>
Realm realm = (Realm)theEObject;
T result = caseRealm(realm);
if (result == null)
+ {
result = caseSecurityElement(realm);
+ }
if (result == null)
+ {
result = caseModelElement(realm);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.DIRECTORY:
@@ -166,13 +182,21 @@ public class SecuritySwitch<T>
Directory directory = (Directory)theEObject;
T result = caseDirectory(directory);
if (result == null)
+ {
result = caseSecurityItem(directory);
+ }
if (result == null)
+ {
result = caseSecurityElement(directory);
+ }
if (result == null)
+ {
result = caseModelElement(directory);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.ROLE:
@@ -180,13 +204,21 @@ public class SecuritySwitch<T>
Role role = (Role)theEObject;
T result = caseRole(role);
if (result == null)
+ {
result = caseSecurityItem(role);
+ }
if (result == null)
+ {
result = caseSecurityElement(role);
+ }
if (result == null)
+ {
result = caseModelElement(role);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.ASSIGNEE:
@@ -194,13 +226,21 @@ public class SecuritySwitch<T>
Assignee assignee = (Assignee)theEObject;
T result = caseAssignee(assignee);
if (result == null)
+ {
result = caseSecurityItem(assignee);
+ }
if (result == null)
+ {
result = caseSecurityElement(assignee);
+ }
if (result == null)
+ {
result = caseModelElement(assignee);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.GROUP:
@@ -208,15 +248,25 @@ public class SecuritySwitch<T>
Group group = (Group)theEObject;
T result = caseGroup(group);
if (result == null)
+ {
result = caseAssignee(group);
+ }
if (result == null)
+ {
result = caseSecurityItem(group);
+ }
if (result == null)
+ {
result = caseSecurityElement(group);
+ }
if (result == null)
+ {
result = caseModelElement(group);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.USER:
@@ -224,15 +274,25 @@ public class SecuritySwitch<T>
User user = (User)theEObject;
T result = caseUser(user);
if (result == null)
+ {
result = caseAssignee(user);
+ }
if (result == null)
+ {
result = caseSecurityItem(user);
+ }
if (result == null)
+ {
result = caseSecurityElement(user);
+ }
if (result == null)
+ {
result = caseModelElement(user);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.USER_PASSWORD:
@@ -240,7 +300,9 @@ public class SecuritySwitch<T>
UserPassword userPassword = (UserPassword)theEObject;
T result = caseUserPassword(userPassword);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.PERMISSION:
@@ -248,7 +310,9 @@ public class SecuritySwitch<T>
Permission permission = (Permission)theEObject;
T result = casePermission(permission);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.CLASS_PERMISSION:
@@ -256,9 +320,13 @@ public class SecuritySwitch<T>
ClassPermission classPermission = (ClassPermission)theEObject;
T result = caseClassPermission(classPermission);
if (result == null)
+ {
result = casePermission(classPermission);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.PACKAGE_PERMISSION:
@@ -266,9 +334,13 @@ public class SecuritySwitch<T>
PackagePermission packagePermission = (PackagePermission)theEObject;
T result = casePackagePermission(packagePermission);
if (result == null)
+ {
result = casePermission(packagePermission);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.RESOURCE_PERMISSION:
@@ -276,9 +348,13 @@ public class SecuritySwitch<T>
ResourcePermission resourcePermission = (ResourcePermission)theEObject;
T result = caseResourcePermission(resourcePermission);
if (result == null)
+ {
result = casePermission(resourcePermission);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.OBJECT_PERMISSION:
@@ -286,9 +362,13 @@ public class SecuritySwitch<T>
ObjectPermission objectPermission = (ObjectPermission)theEObject;
T result = caseObjectPermission(objectPermission);
if (result == null)
+ {
result = casePermission(objectPermission);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.FILTER_PERMISSION:
@@ -296,9 +376,13 @@ public class SecuritySwitch<T>
FilterPermission filterPermission = (FilterPermission)theEObject;
T result = caseFilterPermission(filterPermission);
if (result == null)
+ {
result = casePermission(filterPermission);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.PERMISSION_FILTER:
@@ -306,7 +390,9 @@ public class SecuritySwitch<T>
PermissionFilter permissionFilter = (PermissionFilter)theEObject;
T result = casePermissionFilter(permissionFilter);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.LINKED_FILTER:
@@ -314,9 +400,13 @@ public class SecuritySwitch<T>
LinkedFilter linkedFilter = (LinkedFilter)theEObject;
T result = caseLinkedFilter(linkedFilter);
if (result == null)
+ {
result = casePermissionFilter(linkedFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.PACKAGE_FILTER:
@@ -324,9 +414,13 @@ public class SecuritySwitch<T>
PackageFilter packageFilter = (PackageFilter)theEObject;
T result = casePackageFilter(packageFilter);
if (result == null)
+ {
result = casePermissionFilter(packageFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.CLASS_FILTER:
@@ -334,9 +428,13 @@ public class SecuritySwitch<T>
ClassFilter classFilter = (ClassFilter)theEObject;
T result = caseClassFilter(classFilter);
if (result == null)
+ {
result = casePermissionFilter(classFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.RESOURCE_FILTER:
@@ -344,9 +442,13 @@ public class SecuritySwitch<T>
ResourceFilter resourceFilter = (ResourceFilter)theEObject;
T result = caseResourceFilter(resourceFilter);
if (result == null)
+ {
result = casePermissionFilter(resourceFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.OBJECT_FILTER:
@@ -354,9 +456,13 @@ public class SecuritySwitch<T>
ObjectFilter objectFilter = (ObjectFilter)theEObject;
T result = caseObjectFilter(objectFilter);
if (result == null)
+ {
result = casePermissionFilter(objectFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.EXPRESSION_FILTER:
@@ -364,11 +470,17 @@ public class SecuritySwitch<T>
ExpressionFilter expressionFilter = (ExpressionFilter)theEObject;
T result = caseExpressionFilter(expressionFilter);
if (result == null)
+ {
result = caseObjectFilter(expressionFilter);
+ }
if (result == null)
+ {
result = casePermissionFilter(expressionFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.COMBINED_FILTER:
@@ -376,9 +488,13 @@ public class SecuritySwitch<T>
CombinedFilter combinedFilter = (CombinedFilter)theEObject;
T result = caseCombinedFilter(combinedFilter);
if (result == null)
+ {
result = casePermissionFilter(combinedFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.NOT_FILTER:
@@ -386,11 +502,17 @@ public class SecuritySwitch<T>
NotFilter notFilter = (NotFilter)theEObject;
T result = caseNotFilter(notFilter);
if (result == null)
+ {
result = caseCombinedFilter(notFilter);
+ }
if (result == null)
+ {
result = casePermissionFilter(notFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.AND_FILTER:
@@ -398,11 +520,17 @@ public class SecuritySwitch<T>
AndFilter andFilter = (AndFilter)theEObject;
T result = caseAndFilter(andFilter);
if (result == null)
+ {
result = caseCombinedFilter(andFilter);
+ }
if (result == null)
+ {
result = casePermissionFilter(andFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case SecurityPackage.OR_FILTER:
@@ -410,11 +538,17 @@ public class SecuritySwitch<T>
OrFilter orFilter = (OrFilter)theEObject;
T result = caseOrFilter(orFilter);
if (result == null)
+ {
result = caseCombinedFilter(orFilter);
+ }
if (result == null)
+ {
result = casePermissionFilter(orFilter);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
index 13148db829..37c0ab8cb8 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
@@ -47,7 +47,6 @@ import org.eclipse.emf.cdo.security.UserPassword;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EObjectValidator;
@@ -205,7 +204,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateSecurityElement(SecurityElement securityElement, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)securityElement, diagnostics, context);
+ return validate_EveryDefaultConstraint(securityElement, diagnostics, context);
}
/**
@@ -216,7 +215,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateSecurityItem(SecurityItem securityItem, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)securityItem, diagnostics, context);
+ return validate_EveryDefaultConstraint(securityItem, diagnostics, context);
}
/**
@@ -226,25 +225,43 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateRealm(Realm realm, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- if (!validate_NoCircularContainment((EObject)realm, diagnostics, context))
+ if (!validate_NoCircularContainment(realm, diagnostics, context))
+ {
return false;
- boolean result = validate_EveryMultiplicityConforms((EObject)realm, diagnostics, context);
+ }
+ boolean result = validate_EveryMultiplicityConforms(realm, diagnostics, context);
if (result || diagnostics != null)
- result &= validate_EveryDataValueConforms((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryDataValueConforms(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryReferenceIsContained((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryReferenceIsContained(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryBidirectionalReferenceIsPaired((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryBidirectionalReferenceIsPaired(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryProxyResolves((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryProxyResolves(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_UniqueID((EObject)realm, diagnostics, context);
+ {
+ result &= validate_UniqueID(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryKeyUnique((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryKeyUnique(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryMapEntryUnique((EObject)realm, diagnostics, context);
+ {
+ result &= validate_EveryMapEntryUnique(realm, diagnostics, context);
+ }
if (result || diagnostics != null)
+ {
result &= validateRealm_HasAdministrator(realm, diagnostics, context);
+ }
return result;
}
@@ -318,7 +335,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateDirectory(Directory directory, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)directory, diagnostics, context);
+ return validate_EveryDefaultConstraint(directory, diagnostics, context);
}
/**
@@ -328,7 +345,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateRole(Role role, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)role, diagnostics, context);
+ return validate_EveryDefaultConstraint(role, diagnostics, context);
}
/**
@@ -338,7 +355,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateAssignee(Assignee assignee, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)assignee, diagnostics, context);
+ return validate_EveryDefaultConstraint(assignee, diagnostics, context);
}
/**
@@ -348,25 +365,43 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateGroup(Group group, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- if (!validate_NoCircularContainment((EObject)group, diagnostics, context))
+ if (!validate_NoCircularContainment(group, diagnostics, context))
+ {
return false;
- boolean result = validate_EveryMultiplicityConforms((EObject)group, diagnostics, context);
+ }
+ boolean result = validate_EveryMultiplicityConforms(group, diagnostics, context);
if (result || diagnostics != null)
- result &= validate_EveryDataValueConforms((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryDataValueConforms(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryReferenceIsContained((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryReferenceIsContained(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryBidirectionalReferenceIsPaired((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryProxyResolves((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryProxyResolves(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_UniqueID((EObject)group, diagnostics, context);
+ {
+ result &= validate_UniqueID(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryKeyUnique((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryKeyUnique(group, diagnostics, context);
+ }
if (result || diagnostics != null)
- result &= validate_EveryMapEntryUnique((EObject)group, diagnostics, context);
+ {
+ result &= validate_EveryMapEntryUnique(group, diagnostics, context);
+ }
if (result || diagnostics != null)
+ {
result &= validateGroup_AcyclicInheritance(group, diagnostics, context);
+ }
return result;
}
@@ -412,7 +447,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateUser(User user, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)user, diagnostics, context);
+ return validate_EveryDefaultConstraint(user, diagnostics, context);
}
/**
@@ -423,7 +458,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateUserPasswordGen(UserPassword userPassword, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)userPassword, diagnostics, context);
+ return validate_EveryDefaultConstraint(userPassword, diagnostics, context);
}
/**
@@ -443,7 +478,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validatePermission(Permission permission, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)permission, diagnostics, context);
+ return validate_EveryDefaultConstraint(permission, diagnostics, context);
}
/**
@@ -454,7 +489,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateClassPermission(ClassPermission classPermission, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)classPermission, diagnostics, context);
+ return validate_EveryDefaultConstraint(classPermission, diagnostics, context);
}
/**
@@ -465,7 +500,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validatePackagePermission(PackagePermission packagePermission, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)packagePermission, diagnostics, context);
+ return validate_EveryDefaultConstraint(packagePermission, diagnostics, context);
}
/**
@@ -476,7 +511,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateResourcePermission(ResourcePermission resourcePermission, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)resourcePermission, diagnostics, context);
+ return validate_EveryDefaultConstraint(resourcePermission, diagnostics, context);
}
/**
@@ -487,7 +522,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateObjectPermission(ObjectPermission objectPermission, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)objectPermission, diagnostics, context);
+ return validate_EveryDefaultConstraint(objectPermission, diagnostics, context);
}
/**
@@ -498,7 +533,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateFilterPermission(FilterPermission filterPermission, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)filterPermission, diagnostics, context);
+ return validate_EveryDefaultConstraint(filterPermission, diagnostics, context);
}
/**
@@ -509,7 +544,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validatePermissionFilter(PermissionFilter permissionFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)permissionFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(permissionFilter, diagnostics, context);
}
/**
@@ -520,7 +555,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateLinkedFilter(LinkedFilter linkedFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)linkedFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(linkedFilter, diagnostics, context);
}
/**
@@ -531,7 +566,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validatePackageFilter(PackageFilter packageFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)packageFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(packageFilter, diagnostics, context);
}
/**
@@ -541,7 +576,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateClassFilter(ClassFilter classFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)classFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(classFilter, diagnostics, context);
}
/**
@@ -552,7 +587,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateResourceFilter(ResourceFilter resourceFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)resourceFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(resourceFilter, diagnostics, context);
}
/**
@@ -563,7 +598,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateObjectFilter(ObjectFilter objectFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)objectFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(objectFilter, diagnostics, context);
}
/**
@@ -574,7 +609,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateExpressionFilter(ExpressionFilter expressionFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)expressionFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(expressionFilter, diagnostics, context);
}
/**
@@ -585,7 +620,7 @@ public class SecurityValidator extends EObjectValidator
public boolean validateCombinedFilter(CombinedFilter combinedFilter, DiagnosticChain diagnostics,
Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)combinedFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(combinedFilter, diagnostics, context);
}
/**
@@ -595,7 +630,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateNotFilter(NotFilter notFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)notFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(notFilter, diagnostics, context);
}
/**
@@ -605,7 +640,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateAndFilter(AndFilter andFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)andFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(andFilter, diagnostics, context);
}
/**
@@ -615,7 +650,7 @@ public class SecurityValidator extends EObjectValidator
*/
public boolean validateOrFilter(OrFilter orFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- return validate_EveryDefaultConstraint((EObject)orFilter, diagnostics, context);
+ return validate_EveryDefaultConstraint(orFilter, diagnostics, context);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
index 0ef01fb0fb..e4e3946197 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
@@ -986,7 +986,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
}
break;
- // no entry for current revision there.
+ // no entry for current revision there.
case 0:
Object value = getValue(accessor, id, branchId, index, false);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index d0f4ca670b..bd47766f2c 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -240,7 +240,7 @@ public class HibernateStore extends Store implements IHibernateStore
if (entityName == null)
{
throw new IllegalArgumentException("EClass " + eClass.getName() //$NON-NLS-1$
- + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$
+ + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$
}
return entityName;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index e90359a132..a7f1181fde 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -640,7 +640,7 @@ public class HibernateUtil
}
throw new IllegalArgumentException("The ID value type " + idValue.getClass() //$NON-NLS-1$
- + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$
+ + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
index 898fabc4e5..eddcfefdf2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
@@ -41,7 +41,7 @@ public abstract class CDOPropertyHandler
{
getTracer()
.trace("Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + propertyName);
+ + propertyName);
}
if (feature == null)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
index 0e1f93325c..4e15ca1298 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
@@ -86,8 +86,8 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
if (ePackageURI == null || eClassName == null)
{
throw new IllegalArgumentException("The mapping for the persistentclass " + mappingInfo.getEntityName() //$NON-NLS-1$
- + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$
- + "eclassname, one or both are missing."); //$NON-NLS-1$
+ + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$
+ + "eclassname, one or both are missing."); //$NON-NLS-1$
}
if (TRACER.isEnabled())
@@ -135,7 +135,7 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
if (eClass == null)
{
throw new IllegalArgumentException("The mapped class " + mappingInfo.getEntityName() //$NON-NLS-1$
- + " does not have a eClass equivalent"); //$NON-NLS-1$
+ + " does not have a eClass equivalent"); //$NON-NLS-1$
}
}
@@ -305,14 +305,14 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
}
else
- if (feature instanceof EReference)
- {
- setter = new CDOReferenceSetter(this, mappedProperty.getName());
- }
- else
- {
- setter = new CDOPropertySetter(this, mappedProperty.getName());
- }
+ if (feature instanceof EReference)
+ {
+ setter = new CDOReferenceSetter(this, mappedProperty.getName());
+ }
+ else
+ {
+ setter = new CDOPropertySetter(this, mappedProperty.getName());
+ }
}
HibernateStore hbStore = HibernateStore.getCurrentHibernateStore();
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
index b6ee7becd2..0785cb0978 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
@@ -65,7 +65,7 @@ import java.util.Set;
* @author Eike Stepper
*/
public class LissomeStore extends Store implements ILissomeStore, CDOAllRevisionsProvider, IDBConnectionProvider,
-NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
+ NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
{
public static final String TYPE = "lissome"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
index 326529d2cf..496837e6c6 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
@@ -66,7 +66,7 @@ import java.util.Set;
* @author Eike Stepper
*/
public class MongoDBStore extends Store implements IMongoDBStore, //
-NoExternalReferences, NoQueryXRefs, NoLargeObjects, NoFeatureMaps, NoHandleRevisions, NoRawAccess
+ NoExternalReferences, NoQueryXRefs, NoLargeObjects, NoFeatureMaps, NoHandleRevisions, NoRawAccess
{
public static final String TYPE = "mongodb"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
index 6ff22c28a4..13c79e8cc6 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
@@ -208,7 +208,7 @@ public class ObjyClassProposed
{
TRACER_DEBUG.trace("Attribut Changed for " + eClass.getName() + " name : " + feature.getName());
TRACER_DEBUG.trace("... attribute change is not supported in this release... for " + eClass.getName()
- + " name : " + feature.getName());
+ + " name : " + feature.getName());
}
// TODO - enable the rest of attribute type evolution...
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
index 34effcf9bc..2cda861812 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
@@ -127,7 +127,7 @@ public class ObjyConnection
true, // boolean appendLogFiles,
logDirPath, // String logDirPath,
"MainLog.txt"// String mainLogFileName
- );
+ );
}
if (TRACER_DEBUG.isEnabled())
{
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
index f5e9d07a7c..f1885d89fa 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
@@ -627,7 +627,7 @@ public class ObjyObject
else if (value instanceof CDOIDExternal)
{
TRACER_DEBUG
- .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
+ .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
// System.out.println("value is a proxy object - it should be handled by the mapper.");
// create an ObjyProxy object to hold the the value.
ObjyProxy proxyObject = ObjyProxy.createObject(ooId());
@@ -1147,8 +1147,8 @@ public class ObjyObject
checkSession();
// TODO - verify the message.
TRACER_DEBUG.trace("Get All objects for ID: " + ooId().getStoreString() + " <feature ' " + feature/*
- * .getName( )
- */
+ * .getName( )
+ */
+ "':" + feature.getEType() + "> from " + this);
}
@@ -1441,7 +1441,7 @@ public class ObjyObject
if (TRACER_DEBUG.isEnabled())
{
TRACER_DEBUG.trace("-->> No process to delete() feature (" + i + ") -> feature:" + feature.getName()
- + " - value:" + objects[i] + " ... nothing to do here.");
+ + " - value:" + objects[i] + " ... nothing to do here.");
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
index 5d6e07bf2c..918354c176 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
@@ -54,7 +54,7 @@ public class ObjyArrayListLong extends ObjyArrayList<Long>
ObjyArrayList.sizeName, // Attribute name
1, // # elements in fixed-size array
ooBaseType.ooINT32 // Type of numeric data
- ); // Default value
+ ); // Default value
A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
ObjyArrayList.arrayName, // Attribute name
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
index bcdb256f3b..20f2339120 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
@@ -87,7 +87,7 @@ public class ObjyArrayListString
embeddedAttributeName, // Attribute name
1, // # elements in fixed-size array
"ooUtf8String" // Type of numeric data
- ); // Default value
+ ); // Default value
embeddedClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
embeddedAttributeNull, // Attribute name
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
index 4ddbac9658..81949816fb 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
@@ -80,7 +80,7 @@ public class ObjyFeatureMapArrayList extends ObjyArrayList<ObjyFeatureMapEntry>
ObjyArrayList.sizeName, // Attribute name
1, // # elements in fixed-size array
ooBaseType.ooINT32 // Type of numeric data
- ); // Default value
+ ); // Default value
A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
ObjyArrayList.arrayName, // Attribute name
1, false, ObjyFeatureMapEntry.MapEntryClassName);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
index f6f50de8df..82fe3a79f4 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
@@ -61,7 +61,7 @@ public class ObjyProxy
ObjyProxy.uriAttributeName, // Attribute name
1, // # elements in fixed-size array
"ooUtf8String" // name of embedded class
- );
+ );
// top_mod.propose_new_class(propClass);
if (!inProcess)
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
index d2df7ca9f8..e27ab2838d 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.ocl;singleton:=true
Bundle-Name: %pluginName
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,4 +10,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.2.200"
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
index 757f2d5a9d..51720d4312 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
@@ -216,7 +216,7 @@ public class OCLQueryHandler implements IQueryHandler
*/
protected Query<EClassifier, EClass, EObject> createQuery(CDOView view, CDOQueryInfo info,
ContextParameter contextParameter, OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> ocl)
- throws ParserException, DiagnosticException
+ throws ParserException, DiagnosticException
{
Map<String, Object> parameters = new HashMap<String, Object>(info.getParameters());
initEnvironment(ocl.getEnvironment(), view.getSession().getPackageRegistry(), parameters);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
index f01675edcd..9170ab9dff 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.spi.server.InternalView;
* @author Simon McDuff
* @since 2.0
*/
-public class QueryResult extends AbstractQueryResult<Object>implements InternalQueryResult
+public class QueryResult extends AbstractQueryResult<Object> implements InternalQueryResult
{
public QueryResult(InternalView view, CDOQueryInfo queryInfo, int queryID)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 14f55322d7..ec3f7478e4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -61,7 +61,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* @author Eike Stepper
*/
-public class SessionManager extends Container<ISession>implements InternalSessionManager
+public class SessionManager extends Container<ISession> implements InternalSessionManager
{
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, SessionManager.class);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
index 31834f477e..a1c413b2ae 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
@@ -71,9 +71,9 @@ public class XRefsQueryHandler implements IQueryHandler
CDOBranchPoint branchPoint = context;
CDOBranch branch = branchPoint.getBranch();
int maxResults = info.getMaxResults();
-
- while (!branch.isMainBranch() && (maxResults == CDOQueryInfo.UNLIMITED_RESULTS
- || context.getResultCount() < maxResults))
+
+ while (!branch.isMainBranch()
+ && (maxResults == CDOQueryInfo.UNLIMITED_RESULTS || context.getResultCount() < maxResults))
{
branchPoint = branch.getBase();
branch = branchPoint.getBranch();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
index 8954715ea7..e216835089 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.spi.common.CDOReplicationContext;
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface InternalSynchronizableRepository extends ISynchronizableRepository, InternalRepository,
-CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
+ CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
{
public InternalRepositorySynchronizer getSynchronizer();
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
index 371b1e51e5..ab5435b9e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.ui;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)";vis
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)"
Eclipse-BuddyPolicy:
-Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.400";x-friends:="org.eclipse.emf.cdo.dawn.tests",
- org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.400";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.500";x-friends:="org.eclipse.emf.cdo.dawn.tests",
+ org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
index f3e36f6ee8..9f46331def 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
@@ -58,7 +58,7 @@ public class CDOSessionsViewTest extends AbstractCDOUITest<SWTWorkbenchBot>
// activeView.toolbarButton(OpenSessionDialog.TITLE).click();
activeView.toolbarButton(org.eclipse.emf.cdo.internal.ui.messages.Messages.getString("OpenSessionAction.0"))
- .click();
+ .click();
SWTBotShell openSessionDialog = getBot().shell("Open Session");
openSessionDialog.activate();
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
index 25e1f12044..e7354c459c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,10 +9,14 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -70,12 +74,15 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -90,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
@@ -104,6 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -113,7 +122,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/BaseFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/base/BaseFactory.java
index e43abd6ffb..8647996417 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/BaseFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/BaseFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/BasePackage.java b/plugins/org.eclipse.emf.cdo.tests/model/base/BasePackage.java
index 8f7cdb8ab5..93ba9e2b35 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/BasePackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/BasePackage.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseClassImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseClassImpl.java
index 849e5334be..32ee15ae41 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseClassImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseClassImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseFactoryImpl.java
index 047a69f87e..5bd20fcc03 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BaseFactoryImpl.java
@@ -10,7 +10,6 @@
*/
package base.impl;
-import base.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
@@ -20,6 +19,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
import base.BaseClass;
import base.BaseFactory;
import base.BasePackage;
+import base.Document;
+import base.Element;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
@@ -61,7 +62,7 @@ public class BaseFactoryImpl extends EFactoryImpl implements BaseFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated NOT
*/
@SuppressWarnings("cast")
@@ -71,7 +72,7 @@ public class BaseFactoryImpl extends EFactoryImpl implements BaseFactory
switch (eClass.getClassifierID())
{
case BasePackage.BASE_CLASS:
- return (EObject)createBaseClass();
+ return createBaseClass();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
index 029d568f18..3ff9f15551 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -55,7 +55,7 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
* Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
* performs initialization of the package, or returns the registered package, if one already exists. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see base.BasePackage#eNS_URI
* @see #init()
@@ -74,7 +74,7 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link BasePackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -87,7 +87,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
public static BasePackage init()
{
if (isInited)
+ {
return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI);
+ }
// Obtain or create and register package
BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE
@@ -201,7 +203,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
public void createPackageContents()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -231,7 +235,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
public void initializePackageContents()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -253,17 +259,17 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
addEOperation(baseClassEClass, null, "increment", 0, 1, IS_UNIQUE, IS_ORDERED);
initEClass(documentEClass, Document.class, "Document", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getDocument_Root(), this.getElement(), null, "root", null, 0, 1, Document.class, !IS_TRANSIENT,
+ initEReference(getDocument_Root(), getElement(), null, "root", null, 0, 1, Document.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEClass(elementEClass, Element.class, "Element", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getElement_Subelements(), this.getElement(), this.getElement_Parent(), "subelements", null, 0, -1,
+ initEReference(getElement_Subelements(), getElement(), getElement_Parent(), "subelements", null, 0, -1,
Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getElement_Parent(), this.getElement(), this.getElement_Subelements(), "parent", null, 0, 1,
- Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getElement_Parent(), getElement(), getElement_Subelements(), "parent", null, 0, 1, Element.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseAdapterFactory.java
index 56cfc1cc84..304f23902d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseAdapterFactory.java
@@ -4,13 +4,12 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
package base.util;
-import base.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
@@ -18,6 +17,8 @@ import org.eclipse.emf.ecore.EObject;
import base.BaseClass;
import base.BasePackage;
+import base.Document;
+import base.Element;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedFactory.java
index a55919e131..db22dd761d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
- *
+ *
* @see derived.DerivedPackage
* @generated
*/
@@ -23,14 +23,14 @@ public interface DerivedFactory extends EFactory
{
/**
* The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
DerivedFactory eINSTANCE = derived.impl.DerivedFactoryImpl.init();
/**
* Returns a new object of class '<em>Class</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return a new object of class '<em>Class</em>'.
* @generated
*/
@@ -38,7 +38,7 @@ public interface DerivedFactory extends EFactory
/**
* Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedPackage.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedPackage.java
index 5a3e7b329c..197fce9689 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedPackage.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -24,7 +24,7 @@ import base.BasePackage;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
+ *
* @see derived.DerivedFactory
* @model kind="package"
* @generated
@@ -33,28 +33,28 @@ public interface DerivedPackage extends EPackage
{
/**
* The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNAME = "derived";
/**
* The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNS_URI = "http://www.fernuni-hagen.de/ST/dummy/derived.ecore";
/**
* The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNS_PREFIX = "derived";
/**
* The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
DerivedPackage eINSTANCE = derived.impl.DerivedPackageImpl.init();
@@ -62,7 +62,7 @@ public interface DerivedPackage extends EPackage
/**
* The meta object id for the '{@link derived.impl.DerivedClassImpl <em>Class</em>}' class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see derived.impl.DerivedClassImpl
* @see derived.impl.DerivedPackageImpl#getDerivedClass()
* @generated
@@ -71,7 +71,7 @@ public interface DerivedPackage extends EPackage
/**
* The feature id for the '<em><b>Couter</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -79,7 +79,7 @@ public interface DerivedPackage extends EPackage
/**
* The number of structural features of the '<em>Class</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -88,7 +88,7 @@ public interface DerivedPackage extends EPackage
/**
* Returns the meta object for class '{@link derived.DerivedClass <em>Class</em>}'. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @return the meta object for class '<em>Class</em>'.
* @see derived.DerivedClass
* @generated
@@ -97,7 +97,7 @@ public interface DerivedPackage extends EPackage
/**
* Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -112,7 +112,7 @@ public interface DerivedPackage extends EPackage
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
interface Literals
@@ -120,7 +120,7 @@ public interface DerivedPackage extends EPackage
/**
* The meta object literal for the '{@link derived.impl.DerivedClassImpl <em>Class</em>}' class. <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
+ *
* @see derived.impl.DerivedClassImpl
* @see derived.impl.DerivedPackageImpl#getDerivedClass()
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
index 9d58539ad4..99a637adc9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
@@ -22,14 +22,14 @@ import derived.DerivedPackage;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
{
/**
* Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static DerivedFactory init()
@@ -52,7 +52,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
/**
* Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedFactoryImpl()
@@ -62,7 +62,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated NOT
*/
@SuppressWarnings("cast")
@@ -72,7 +72,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
switch (eClass.getClassifierID())
{
case DerivedPackage.DERIVED_CLASS:
- return (EObject)createDerivedClass();
+ return createDerivedClass();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -80,7 +80,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedClass createDerivedClass()
@@ -91,7 +91,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedPackage getDerivedPackage()
@@ -101,7 +101,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @deprecated
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
index 9b15d98043..d026b5b25a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -21,14 +21,14 @@ import derived.DerivedPackage;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private EClass derivedClassEClass = null;
@@ -40,7 +40,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
* Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
* performs initialization of the package, or returns the registered package, if one already exists. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see derived.DerivedPackage#eNS_URI
* @see #init()
@@ -53,7 +53,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private static boolean isInited = false;
@@ -64,7 +64,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
* This method is used to initialize {@link DerivedPackage#eINSTANCE} when that field is accessed. Clients should not
* invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -78,8 +78,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
}
// Obtain or create and register package
- DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new DerivedPackageImpl());
+ DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new DerivedPackageImpl());
isInited = true;
@@ -102,7 +103,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EClass getDerivedClass()
@@ -112,7 +113,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedFactory getDerivedFactory()
@@ -122,7 +123,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isCreated = false;
@@ -130,7 +131,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
* first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void createPackageContents()
@@ -147,7 +148,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isInitialized = false;
@@ -155,7 +156,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
/**
* Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
* invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedAdapterFactory.java
index 51ace862c4..0cce70d5e8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -22,7 +22,7 @@ import derived.DerivedPackage;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
- *
+ *
* @see derived.DerivedPackage
* @generated
*/
@@ -30,14 +30,14 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
{
/**
* The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static DerivedPackage modelPackage;
/**
* Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedAdapterFactory()
@@ -52,7 +52,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
* Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -72,7 +72,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
/**
* The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected DerivedSwitch<Adapter> modelSwitch = new DerivedSwitch<Adapter>()
@@ -98,7 +98,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
/**
* Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param target
* the object to adapt.
* @return the adapter for the <code>target</code>.
@@ -114,7 +114,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link derived.DerivedClass <em>Class</em>}'. <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases; it's useful to ignore a case when
* inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
+ *
* @return the new adapter.
* @see derived.DerivedClass
* @generated
@@ -128,7 +128,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link base.BaseClass <em>Class</em>}'. <!-- begin-user-doc --> This
* default implementation returns null so that we can easily ignore cases; it's useful to ignore a case when
* inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
+ *
* @return the new adapter.
* @see base.BaseClass
* @generated
@@ -141,7 +141,7 @@ public class DerivedAdapterFactory extends AdapterFactoryImpl
/**
* Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
+ *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
index 89c28f32a4..9ce0aeb2f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
@@ -13,18 +13,18 @@ package derived.util;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import java.util.List;
+
import base.BaseClass;
import derived.DerivedClass;
import derived.DerivedPackage;
-import java.util.List;
-
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ *
* @see derived.DerivedPackage
* @generated
*/
@@ -32,14 +32,14 @@ public class DerivedSwitch<T>
{
/**
* The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static DerivedPackage modelPackage;
/**
* Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public DerivedSwitch()
@@ -53,7 +53,7 @@ public class DerivedSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -65,7 +65,7 @@ public class DerivedSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -85,7 +85,7 @@ public class DerivedSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -115,7 +115,7 @@ public class DerivedSwitch<T>
/**
* Returns the result of interpreting the object as an instance of '<em>Class</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Class</em>'.
@@ -130,7 +130,7 @@ public class DerivedSwitch<T>
/**
* Returns the result of interpreting the object as an instance of '<em>Class</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Class</em>'.
@@ -146,7 +146,7 @@ public class DerivedSwitch<T>
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/IInterface.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/IInterface.java
index 24d8aa2079..b9f84bf42d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/IInterface.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/IInterface.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.CDOObject;
* <li>{@link interface_.IInterface#getTest <em>Test</em>}</li>
* </ul>
* </p>
- *
+ *
* @see interface_.InterfacePackage#getIInterface()
* @model interface="true" abstract="true"
* @extends CDOObject
@@ -34,7 +34,7 @@ public interface IInterface extends CDOObject
* If the meaning of the '<em>Test</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Test</em>' attribute.
* @see #setTest(String)
* @see interface_.InterfacePackage#getIInterface_Test()
@@ -46,7 +46,7 @@ public interface IInterface extends CDOObject
/**
* Sets the value of the '{@link interface_.IInterface#getTest <em>Test</em>}' attribute. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value
* the new value of the '<em>Test</em>' attribute.
* @see #getTest()
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
index fce4f9261d..35d9cc7c11 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -21,14 +21,14 @@ import interface_.InterfacePackage;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFactory
{
/**
* Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static InterfaceFactory init()
@@ -51,7 +51,7 @@ public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFacto
/**
* Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public InterfaceFactoryImpl()
@@ -61,7 +61,7 @@ public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -76,7 +76,7 @@ public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public InterfacePackage getInterfacePackage()
@@ -86,7 +86,7 @@ public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @deprecated
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceAdapterFactory.java
index f5d3a8250e..b0c699f97e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -21,7 +21,7 @@ import interface_.InterfacePackage;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
- *
+ *
* @see interface_.InterfacePackage
* @generated
*/
@@ -29,14 +29,14 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
{
/**
* The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static InterfacePackage modelPackage;
/**
* Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public InterfaceAdapterFactory()
@@ -51,7 +51,7 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
* Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -71,7 +71,7 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
/**
* The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected InterfaceSwitch<Adapter> modelSwitch = new InterfaceSwitch<Adapter>()
@@ -91,7 +91,7 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
/**
* Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param target
* the object to adapt.
* @return the adapter for the <code>target</code>.
@@ -107,7 +107,7 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link interface_.IInterface <em>IInterface</em>}'. <!--
* begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
+ *
* @return the new adapter.
* @see interface_.IInterface
* @generated
@@ -120,7 +120,7 @@ public class InterfaceAdapterFactory extends AdapterFactoryImpl
/**
* Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
+ *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
index ef4b9ff0eb..0e64aec796 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
@@ -13,17 +13,17 @@ package interface_.util;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import java.util.List;
+
import interface_.IInterface;
import interface_.InterfacePackage;
-import java.util.List;
-
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ *
* @see interface_.InterfacePackage
* @generated
*/
@@ -31,14 +31,14 @@ public class InterfaceSwitch<T>
{
/**
* The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static InterfacePackage modelPackage;
/**
* Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public InterfaceSwitch()
@@ -52,7 +52,7 @@ public class InterfaceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -64,7 +64,7 @@ public class InterfaceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -84,7 +84,7 @@ public class InterfaceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -110,7 +110,7 @@ public class InterfaceSwitch<T>
/**
* Returns the result of interpreting the object as an instance of '<em>IInterface</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>IInterface</em>'.
@@ -126,7 +126,7 @@ public class InterfaceSwitch<T>
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/Reference.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/Reference.java
index 04a5f4dd45..d7070eb7a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/Reference.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/Reference.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -22,7 +22,7 @@ import interface_.IInterface;
* <li>{@link reference.Reference#getRef <em>Ref</em>}</li>
* </ul>
* </p>
- *
+ *
* @see reference.ReferencePackage#getReference()
* @model
* @extends CDOObject
@@ -36,7 +36,7 @@ public interface Reference extends CDOObject
* If the meaning of the '<em>Ref</em>' reference isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Ref</em>' reference.
* @see #setRef(IInterface)
* @see reference.ReferencePackage#getReference_Ref()
@@ -48,7 +48,7 @@ public interface Reference extends CDOObject
/**
* Sets the value of the '{@link reference.Reference#getRef <em>Ref</em>}' reference. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value
* the new value of the '<em>Ref</em>' reference.
* @see #getRef()
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferenceFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferenceFactory.java
index f46d2e281b..8176ac5839 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferenceFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferenceFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
- *
+ *
* @see reference.ReferencePackage
* @generated
*/
@@ -23,14 +23,14 @@ public interface ReferenceFactory extends EFactory
{
/**
* The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
ReferenceFactory eINSTANCE = reference.impl.ReferenceFactoryImpl.init();
/**
* Returns a new object of class '<em>Reference</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return a new object of class '<em>Reference</em>'.
* @generated
*/
@@ -38,7 +38,7 @@ public interface ReferenceFactory extends EFactory
/**
* Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferencePackage.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferencePackage.java
index f4b4983de1..d0ebf739cd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferencePackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/ReferencePackage.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
+ *
* @see reference.ReferenceFactory
* @model kind="package"
* @generated
@@ -32,28 +32,28 @@ public interface ReferencePackage extends EPackage
{
/**
* The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNAME = "reference";
/**
* The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNS_URI = "uuid://reference";
/**
* The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
String eNS_PREFIX = "reference";
/**
* The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
ReferencePackage eINSTANCE = reference.impl.ReferencePackageImpl.init();
@@ -61,7 +61,7 @@ public interface ReferencePackage extends EPackage
/**
* The meta object id for the '{@link reference.impl.ReferenceImpl <em>Reference</em>}' class. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see reference.impl.ReferenceImpl
* @see reference.impl.ReferencePackageImpl#getReference()
* @generated
@@ -70,7 +70,7 @@ public interface ReferencePackage extends EPackage
/**
* The feature id for the '<em><b>Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -78,7 +78,7 @@ public interface ReferencePackage extends EPackage
/**
* The number of structural features of the '<em>Reference</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -87,7 +87,7 @@ public interface ReferencePackage extends EPackage
/**
* Returns the meta object for class '{@link reference.Reference <em>Reference</em>}'. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @return the meta object for class '<em>Reference</em>'.
* @see reference.Reference
* @generated
@@ -97,7 +97,7 @@ public interface ReferencePackage extends EPackage
/**
* Returns the meta object for the reference '{@link reference.Reference#getRef <em>Ref</em>}'. <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
+ *
* @return the meta object for the reference '<em>Ref</em>'.
* @see reference.Reference#getRef()
* @see #getReference()
@@ -107,7 +107,7 @@ public interface ReferencePackage extends EPackage
/**
* Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -122,7 +122,7 @@ public interface ReferencePackage extends EPackage
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
interface Literals
@@ -130,7 +130,7 @@ public interface ReferencePackage extends EPackage
/**
* The meta object literal for the '{@link reference.impl.ReferenceImpl <em>Reference</em>}' class. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see reference.impl.ReferenceImpl
* @see reference.impl.ReferencePackageImpl#getReference()
* @generated
@@ -140,7 +140,7 @@ public interface ReferencePackage extends EPackage
/**
* The meta object literal for the '<em><b>Ref</b></em>' reference feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @generated
*/
EReference REFERENCE__REF = eINSTANCE.getReference_Ref();
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
index 55727346dd..1652cd197e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -15,21 +15,21 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
+import interface_.InterfacePackage;
import reference.Reference;
import reference.ReferenceFactory;
import reference.ReferencePackage;
-import interface_.InterfacePackage;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class ReferencePackageImpl extends EPackageImpl implements ReferencePackage
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private EClass referenceEClass = null;
@@ -41,7 +41,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
* Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
* performs initialization of the package, or returns the registered package, if one already exists. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see reference.ReferencePackage#eNS_URI
* @see #init()
@@ -54,7 +54,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private static boolean isInited = false;
@@ -65,7 +65,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
* This method is used to initialize {@link ReferencePackage#eINSTANCE} when that field is accessed. Clients should
* not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
+ *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -79,8 +79,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
}
// Obtain or create and register package
- ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new ReferencePackageImpl());
+ ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ReferencePackageImpl());
isInited = true;
@@ -103,7 +104,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EClass getReference()
@@ -113,7 +114,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public EReference getReference_Ref()
@@ -123,7 +124,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReferenceFactory getReferenceFactory()
@@ -133,7 +134,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isCreated = false;
@@ -141,7 +142,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
* first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void createPackageContents()
@@ -159,7 +160,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isInitialized = false;
@@ -167,7 +168,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
/**
* Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
* invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceAdapterFactory.java
index 0f2466a679..2b76ad43e2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -21,7 +21,7 @@ import reference.ReferencePackage;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
- *
+ *
* @see reference.ReferencePackage
* @generated
*/
@@ -29,14 +29,14 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
{
/**
* The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static ReferencePackage modelPackage;
/**
* Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReferenceAdapterFactory()
@@ -51,7 +51,7 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
* Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -71,7 +71,7 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
/**
* The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected ReferenceSwitch<Adapter> modelSwitch = new ReferenceSwitch<Adapter>()
@@ -91,7 +91,7 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
/**
* Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param target
* the object to adapt.
* @return the adapter for the <code>target</code>.
@@ -107,7 +107,7 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link reference.Reference <em>Reference</em>}'. <!-- begin-user-doc
* --> This default implementation returns null so that we can easily ignore cases; it's useful to ignore a case when
* inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
+ *
* @return the new adapter.
* @see reference.Reference
* @generated
@@ -120,7 +120,7 @@ public class ReferenceAdapterFactory extends AdapterFactoryImpl
/**
* Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
+ *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
index e3260acbc2..8bfcea101b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -13,17 +13,17 @@ package reference.util;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import java.util.List;
+
import reference.Reference;
import reference.ReferencePackage;
-import java.util.List;
-
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
- *
+ *
* @see reference.ReferencePackage
* @generated
*/
@@ -31,14 +31,14 @@ public class ReferenceSwitch<T>
{
/**
* The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected static ReferencePackage modelPackage;
/**
* Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public ReferenceSwitch()
@@ -52,7 +52,7 @@ public class ReferenceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -64,7 +64,7 @@ public class ReferenceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -84,7 +84,7 @@ public class ReferenceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -110,7 +110,7 @@ public class ReferenceSwitch<T>
/**
* Returns the result of interpreting the object as an instance of '<em>Reference</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Reference</em>'.
@@ -126,7 +126,7 @@ public class ReferenceSwitch<T>
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
- *
+ *
* @param object
* the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index 15530ac9a4..163c929ecf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -548,19 +548,15 @@ public class AttributeTest extends AbstractCDOTest
assertEquals(true, points.containsAll(points));
- assertEquals(
- true,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(9, 0) })));
+ assertEquals(true, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
- assertEquals(
- false,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(0, 0) })));
+ assertEquals(false, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
@@ -574,19 +570,15 @@ public class AttributeTest extends AbstractCDOTest
points = polygon.getPoints();
assertEquals(true, points.containsAll(points));
- assertEquals(
- true,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(9, 0) })));
+ assertEquals(true, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
- assertEquals(
- false,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(0, 0) })));
+ assertEquals(false, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
@@ -597,19 +589,15 @@ public class AttributeTest extends AbstractCDOTest
points = polygon.getPoints();
assertEquals(true, points.containsAll(points));
- assertEquals(
- true,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(9, 0) })));
+ assertEquals(true, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
- assertEquals(
- false,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(0, 0) })));
+ assertEquals(false, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
@@ -624,19 +612,15 @@ public class AttributeTest extends AbstractCDOTest
points = polygon.getPoints();
assertEquals(true, points.containsAll(points));
- assertEquals(
- true,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(9, 0) })));
+ assertEquals(true, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
- assertEquals(
- false,
- points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8),
- new Point(0, 0) })));
+ assertEquals(false, points.containsAll(
+ Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false,
points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditEMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditEMapTest.java
index b501215886..fafd5bf792 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditEMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditEMapTest.java
@@ -29,7 +29,7 @@ import java.util.Map;
/**
* Test EMap in combination with auditing.
- *
+ *
* @author Martin Taal
*/
@Requires(IRepositoryConfig.CAPABILITY_AUDITING)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
index 562f10a5a7..77f5f03b04 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
@@ -1130,32 +1130,32 @@ public class BranchingTest extends AbstractCDOTest
public void testAuditViewOnBranch() throws Exception
{
String name = getBranchName("subBranch");
-
+
CDOSession session = openSession1();
CDOBranchManager branchManager = session.getBranchManager();
-
+
// Commit to main branch
CDOBranch mainBranch = branchManager.getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
assertEquals(mainBranch, transaction.getBranch());
assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp());
-
+
Product1 product = getModel1Factory().createProduct1();
product.setName("CDO");
-
+
OrderDetail orderDetail = getModel1Factory().createOrderDetail();
orderDetail.setProduct(product);
orderDetail.setPrice(5.0f);
-
+
CDOResource resource = transaction.createResource(getResourcePath("/res"));
resource.getContents().add(product);
resource.getContents().add(orderDetail);
-
+
CDOCommitInfo commitInfo = transaction.commit();
dumpAll(session);
assertEquals(mainBranch, commitInfo.getBranch());
long commitTime1 = commitInfo.getTimeStamp();
-
+
// Modify main branch (change existing OrderDetail)
orderDetail.setPrice(10.0f);
commitInfo = transaction.commit();
@@ -1163,48 +1163,48 @@ public class BranchingTest extends AbstractCDOTest
assertEquals(mainBranch, commitInfo.getBranch());
long commitTime2 = commitInfo.getTimeStamp();
transaction.close();
-
+
// Commit to sub branch
CDOBranch subBranch = mainBranch.createBranch(name);
transaction = session.openTransaction(subBranch);
assertEquals(subBranch, transaction.getBranch());
assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp());
-
+
resource = transaction.getResource(getResourcePath("/res"));
orderDetail = (OrderDetail)resource.getContents().get(1);
assertEquals(10.0f, orderDetail.getPrice());
product = orderDetail.getProduct();
assertEquals("CDO", product.getName());
-
+
// Modify sub branch (add new OrderDetail)
OrderDetail orderDetail2 = getModel1Factory().createOrderDetail();
orderDetail2.setProduct(product);
orderDetail2.setPrice(20.0f);
resource.getContents().add(0, orderDetail2);
-
+
commitInfo = transaction.commit();
dumpAll(session);
assertEquals(subBranch, commitInfo.getBranch());
long commitTime3 = commitInfo.getTimeStamp();
-
+
transaction.close();
closeSession1();
-
+
session = openSession2();
branchManager = session.getBranchManager();
mainBranch = branchManager.getMainBranch();
subBranch = mainBranch.getBranch(name);
-
+
check(session, mainBranch, commitTime1, 5.0f, "CDO");
check(session, mainBranch, commitTime2, 10.0f, "CDO");
check(session, mainBranch, CDOBranchPoint.UNSPECIFIED_DATE, 10.0f, "CDO");
-
+
dumpAll(session);
check(session, subBranch, commitTime1, 5.0f, "CDO"); // !
check(session, subBranch, commitTime2, 10.0f, "CDO");
check(session, subBranch, commitTime3, 10.0f, 20.0f, "CDO");
check(session, subBranch, CDOBranchPoint.UNSPECIFIED_DATE, 10.0f, 20.0f, "CDO");
-
+
session.close();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
index 3b64b13522..48a1895f43 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
@@ -70,8 +70,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
final CDOTransaction transaction2 = session.openTransaction();
- final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
- .cdoID(), true));
+ final Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
category1B.setName("CHANGED NAME");
assertEquals(0, adapter.getNotifications().length);
@@ -134,8 +134,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
final CDOTransaction transaction2 = session.openTransaction();
- final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
- .cdoID(), true));
+ final Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
category1B.setName("CHANGED NAME");
assertEquals(0, adapter.getNotifications().length);
@@ -197,8 +197,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
CDOSession session2 = openSession();
CDOTransaction transaction2 = session2.openTransaction();
- Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(),
- true));
+ Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
category1B.setName("CHANGED NAME");
assertEquals(0, adapter.getNotifications().length);
@@ -259,8 +259,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
CDOSession session2 = openSession();
CDOTransaction transaction2 = session2.openTransaction();
- Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(),
- true));
+ Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
category1B.setName("CHANGED NAME");
assertEquals(0, adapter.getNotifications().length);
@@ -338,8 +338,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
final CDOTransaction transaction2 = session2.openTransaction();
transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
- final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
- .cdoID(), true));
+ final Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
msg("Changing name");
category1B.setName("CHANGED NAME");
@@ -406,10 +406,10 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
final CDOSession session2 = openSession();
final CDOTransaction transaction2 = session2.openTransaction();
- final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
- .cdoID(), true));
- final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(
- CDOUtil.getCDOObject(companyA).cdoID(), true));
+ final Category category1B = (Category)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+ final Company company1B = (Company)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
msg("Changing name");
category1B.setName("CHANGED NAME");
@@ -496,8 +496,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
final CDOSession session2 = openSession();
final CDOTransaction transaction2 = session2.openTransaction();
- final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(
- CDOUtil.getCDOObject(companyA).cdoID(), true));
+ final Company company1B = (Company)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
msg("Changing name");
company1B.setName("TEST1");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
index 79f0a6aaf0..e54e1ccf73 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
@@ -1001,7 +1001,8 @@ public class ComplexTest extends AbstractCDOTest
IContainedElementNoParentLink element0_ = (IContainedElementNoParentLink)resource2.getContents().get(0);
assertEquals(element0_, container.getElement());
- assertEquals("CrossResourceIfcimplSingleNonContainedUnidirectional-Element-0", ((INamedElement)element0_).getName());
+ assertEquals("CrossResourceIfcimplSingleNonContainedUnidirectional-Element-0",
+ ((INamedElement)element0_).getName());
assertEquals(resource1, container.eResource());
assertEquals(resource2, element0_.eResource());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
index ade5b4eef0..51a66e0143 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
@@ -392,8 +392,8 @@ public class ContainmentTest extends AbstractCDOTest
assertEquals(resource1.getContents().get(0), order.eContainer());
resource2.getContents().remove(order);
- Order order2 = (Order)CDOUtil.getEObject((EObject)container.eGet(container.eClass().getEStructuralFeature(
- "proxyElement")));
+ Order order2 = (Order)CDOUtil
+ .getEObject((EObject)container.eGet(container.eClass().getEStructuralFeature("proxyElement")));
assertSame(order, order2);
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java
index bb9c2504fc..432c942d40 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
index 13d372ff05..efc1eb61e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -33,23 +33,23 @@ public class EMFComplianceTest extends AbstractOMTest
assertEquals(Resource.RESOURCE__WARNINGS, EresourcePackage.CDO_RESOURCE__WARNINGS);
assertEquals(Resource.RESOURCE__TIME_STAMP, EresourcePackage.CDO_RESOURCE__TIME_STAMP);
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_ResourceSet(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__RESOURCE_SET));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_URI(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__URI));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Contents(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__CONTENTS));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Modified(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__IS_MODIFIED));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Loaded(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__IS_LOADED));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_TrackingModification(), EresourcePackage.eINSTANCE
- .getCDOResource().getEStructuralFeature(Resource.RESOURCE__IS_TRACKING_MODIFICATION));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Errors(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__ERRORS));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Warnings(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__WARNINGS));
- assertEquals(EresourcePackage.eINSTANCE.getCDOResource_TimeStamp(), EresourcePackage.eINSTANCE.getCDOResource()
- .getEStructuralFeature(Resource.RESOURCE__TIME_STAMP));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_ResourceSet(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__RESOURCE_SET));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_URI(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__URI));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Contents(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__CONTENTS));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Modified(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__IS_MODIFIED));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Loaded(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__IS_LOADED));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_TrackingModification(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__IS_TRACKING_MODIFICATION));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Errors(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__ERRORS));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Warnings(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__WARNINGS));
+ assertEquals(EresourcePackage.eINSTANCE.getCDOResource_TimeStamp(),
+ EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__TIME_STAMP));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
index df30e640da..bd91d0e820 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
index 03c86f03f2..dc8dac971c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.resource.Resource;
/**
* Test EMap with an EObject in both the key and value
- *
+ *
* @author Martin Taal
*/
public class EMapTest extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java
index 536b4176e3..b1647f7400 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java
index dbfab51602..b95ade2b55 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java
@@ -37,7 +37,7 @@ import junit.framework.TestSuite;
* Note! This class should never be attached to our the suites until this notification is removed. Otherwise the test
* run will fail because this test cases is not yet integrated into our test framework! Only run this test as local
* JUnit test case.
- *
+ *
* @author Martin Fluegge
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
index a2741ab055..e8dfa10dcd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
@@ -342,8 +342,8 @@ public class SecurityTest extends AbstractCDOTest
}
@Override
- protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider,
- CDOBranchPoint securityContext, int level) throws Exception
+ protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
+ int level) throws Exception
{
return value;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
index 5a6d3dec05..245bc15cf7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
@@ -227,104 +227,104 @@ public class SetFeatureTest extends AbstractCDOTest
public void testNotUnsettableWithDefaultBoolean() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableBoolean(), true);
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), true);
}
public void testNotUnsettableWithDefaultBoolean2() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableBoolean(), new Boolean(false));
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), new Boolean(false));
}
public void testNotUnsettableWithDefaultBoolean_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableBoolean(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableBoolean().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean().getDefaultValue());
}
public void testNotUnsettableWithDefaultByte() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableByte(), (byte)10);
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), (byte)10);
}
public void testNotUnsettableWithDefaultByte2() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableByte(), new Byte((byte)25));
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), new Byte((byte)25));
}
public void testNotUnsettableWithDefaultByte_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableByte(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableByte().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte().getDefaultValue());
}
public void testNotUnsettableWithDefaultChar() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableChar(), 'c');
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), 'c');
}
public void testNotUnsettableWithDefaultChart2() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableChar(), new Character('c'));
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), new Character('c'));
}
public void testNotUnsettableWithDefaultChar_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableChar(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableChar().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar().getDefaultValue());
}
public void testNotUnsettableWithDefaultDate() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDate(), new Date(0));
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(), new Date(0));
}
public void testNotUnsettableWithDefaultDate_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDate(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDate().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate().getDefaultValue());
}
public void testNotUnsettableWithDefaultDouble() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDouble(), 15.03d);
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), 15.03d);
}
public void testNotUnsettableWithDefaultDouble2() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDouble(), new Double(15.03d));
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), new Double(15.03d));
}
public void testNotUnsettableWithDefaultDouble_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDouble(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableDouble().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble().getDefaultValue());
}
public void testNotUnsettableWithDefaultVAT() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableVAT(), VAT.VAT7);
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(), VAT.VAT7);
}
public void testNotUnsettableWithDefaultVAT_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableVAT(), getModel2Package()
- .getNotUnsettableWithDefault_NotUnsettableVAT().getDefaultValue());
+ testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(),
+ getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT().getDefaultValue());
}
public void testUnsettableBooleanNoDefault() throws Exception
@@ -351,8 +351,8 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableByteNoDefault2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableByte(), new Byte(
- (byte)25));
+ testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableByte(),
+ new Byte((byte)25));
}
public void testUnsettableByteNoDefault_SetDefault() throws Exception
@@ -390,8 +390,8 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableDoubleNoDefault2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableDouble(), new Double(
- 19.79));
+ testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableDouble(),
+ new Double(19.79));
}
public void testUnsettableDoubleNoDefault_SetDefault() throws Exception
@@ -407,8 +407,8 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableFloatNoDefault2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableFloat(), new Float(
- 19.79f));
+ testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableFloat(),
+ new Float(19.79f));
}
public void testUnsettableFloatNoDefault_SetDefault() throws Exception
@@ -446,8 +446,8 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableShortNoDefault2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableShort(), new Short(
- (short)15));
+ testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableShort(),
+ new Short((short)15));
}
public void testUnsettableShortNoDefault_SetDefault() throws Exception
@@ -463,8 +463,8 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableStringNoDefault2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableString(), new String(
- "Martin"));
+ testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableString(),
+ new String("Martin"));
}
public void testUnsettableVATNoDefault() throws Exception
@@ -480,179 +480,179 @@ public class SetFeatureTest extends AbstractCDOTest
public void testUnsettableWithDefaultBoolean() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableBoolean(), true);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), true);
}
public void testUnsettableWithDefaultBoolean2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableBoolean(), new Boolean(false));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), new Boolean(false));
}
public void testUnsettableWithDefaultByte() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableByte(), (byte)10);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableByte(), (byte)10);
}
public void testUnsettableWithDefaultByte2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableByte(), new Byte((byte)25));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableByte(), new Byte((byte)25));
}
public void testUnsettableWithDefaultByte_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableByte(), getModel2Package().getUnsettable2WithDefault_UnsettableByte()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableByte(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableByte().getDefaultValue());
}
public void testUnsettableWithDefaultChar() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableChar(), 'c');
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableChar(), 'c');
}
public void testUnsettableWithDefaultCharNo() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableChar(), new Character('c'));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableChar(), new Character('c'));
}
public void testUnsettableWithDefaultChar_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableChar(), getModel2Package().getUnsettable2WithDefault_UnsettableChar()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableChar(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableChar().getDefaultValue());
}
public void testUnsettableWithDefaultDate() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableDate(), new Date(0));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDate(), new Date(0));
}
public void testUnsettableWithDefaultDate_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableDate(), getModel2Package().getUnsettable2WithDefault_UnsettableDate()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDate(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDate().getDefaultValue());
}
public void testUnsettableWithDefaultDouble() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableDouble(), 15.03d);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), 15.03d);
}
public void testUnsettableWithDefaultDouble2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableDouble(), new Double(19.79));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), new Double(19.79));
}
public void testUnsettableWithDefaultDouble_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableDouble(), getModel2Package().getUnsettable2WithDefault_UnsettableDouble()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDouble(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableDouble().getDefaultValue());
}
public void testUnsettableWithDefaultFloat() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableFloat(), 15.03f);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), 15.03f);
}
public void testUnsettableWithDefaultFloat2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableFloat(), new Float(19.79f));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), new Float(19.79f));
}
public void testUnsettableWithDefaultFloat_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableFloat(), getModel2Package().getUnsettable2WithDefault_UnsettableFloat()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableFloat(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableFloat().getDefaultValue());
}
public void testUnsettableWithDefaultInt() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableInt(), 15);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableInt(), 15);
}
public void testUnsettableWithDefaultInt2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableInt(), new Integer(15));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableInt(), new Integer(15));
}
public void testUnsettableWithDefaultInt_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableInt(), getModel2Package().getUnsettable2WithDefault_UnsettableInt()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableInt(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableInt().getDefaultValue());
}
public void testUnsettableWithDefaultLong() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableLong(), 15L);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableLong(), 15L);
}
public void testUnsettableWithDefaultShort() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableShort(), (short)15);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableShort(), (short)15);
}
public void testUnsettableWithDefaultShort2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableShort(), new Short((short)15));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableShort(), new Short((short)15));
}
public void testUnsettableWithDefaultShort_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableShort(), getModel2Package().getUnsettable2WithDefault_UnsettableShort()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableShort(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableShort().getDefaultValue());
}
public void testUnsettableWithDefaultString() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableString(), "Martin");
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableString(), "Martin");
}
public void testUnsettableWithDefaultString2() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableString(), new String("Martin"));
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableString(), new String("Martin"));
}
public void testUnsettableWithDefaultString_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableString(), getModel2Package().getUnsettable2WithDefault_UnsettableString()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableString(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableString().getDefaultValue());
}
public void testUnsettableWithDefaultVAT() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableVAT(), VAT.VAT7);
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableVAT(), VAT.VAT7);
}
public void testUnsettableWithDefaultVAT_SetDefault() throws Exception
{
- testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package()
- .getUnsettable2WithDefault_UnsettableVAT(), getModel2Package().getUnsettable2WithDefault_UnsettableVAT()
- .getDefaultValue());
+ testIsSet(getModel2Factory().createUnsettable2WithDefault(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableVAT(),
+ getModel2Package().getUnsettable2WithDefault_UnsettableVAT().getDefaultValue());
}
private void testIsSet(EObject object, EStructuralFeature feature, Object value) throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_FetchRuleAnalyzerTest_DISABLED_.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_FetchRuleAnalyzerTest_DISABLED_.java
index fde52138aa..5e6562120e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_FetchRuleAnalyzerTest_DISABLED_.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_FetchRuleAnalyzerTest_DISABLED_.java
@@ -32,7 +32,7 @@ import java.util.List;
/**
* See bug 202063
- *
+ *
* @author Simon McDuff
*/
public class _FetchRuleAnalyzerTest_DISABLED_ extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
index ba07db5ac9..43a4f15e4c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
* NPE during Transaction.getObject(id, false)
* <p>
* See bug 243310
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_243310_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
index 0c2bab94ab..86dbe447c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* ArrayIndexOutOfBoundsException when importing resources.
* <p>
* See bug 246442
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_246442_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
index d55eab8f1e..7e3f36d4a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* 246622: CDOStore.set doesn't affect variable correctly - Could cause memory retention
* <p>
* See bug 243310
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_246622_Test extends AbstractCDOTest
@@ -65,10 +65,10 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(),
CDOUtil.getCDOObject(order2).cdoRevision().data().get(order_OrderDetailFeature, 0));
- assertEquals(CDOUtil.getCDOObject(order).cdoID(), CDOUtil.getCDOObject(orderDetail).cdoRevision().data()
- .getContainerID());
- assertEquals(CDOUtil.getCDOObject(order2).cdoID(), CDOUtil.getCDOObject(orderDetail2).cdoRevision().data()
- .getContainerID());
+ assertEquals(CDOUtil.getCDOObject(order).cdoID(),
+ CDOUtil.getCDOObject(orderDetail).cdoRevision().data().getContainerID());
+ assertEquals(CDOUtil.getCDOObject(order2).cdoID(),
+ CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
Order order3 = getModel1Factory().createPurchaseOrder();
@@ -77,7 +77,8 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(),
CDOUtil.getCDOObject(order3).cdoRevision().data().get(order_OrderDetailFeature, 0));
- assertEquals(CDOUtil.getCDOObject(order3), CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
+ assertEquals(CDOUtil.getCDOObject(order3),
+ CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
msg("Committing");
transaction1.commit();
@@ -119,10 +120,10 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
msg("Committing");
transaction1.commit();
- assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(), CDOUtil.getCDOObject(purchaseOrder2).cdoRevision().data()
- .get(purchaseOrder_Supplier, 0));
- assertEquals(CDOUtil.getCDOObject(purchaseOrder2).cdoID(), CDOUtil.getCDOObject(supplier2).cdoRevision().data()
- .get(supplier_PurchaseOrder, 0));
+ assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(),
+ CDOUtil.getCDOObject(purchaseOrder2).cdoRevision().data().get(purchaseOrder_Supplier, 0));
+ assertEquals(CDOUtil.getCDOObject(purchaseOrder2).cdoID(),
+ CDOUtil.getCDOObject(supplier2).cdoRevision().data().get(supplier_PurchaseOrder, 0));
assertEquals(CDOUtil.getCDOObject(supplier).cdoID(),
CDOUtil.getCDOObject(purchaseOrder).cdoRevision().data().get(purchaseOrder_Supplier, 0));
@@ -134,8 +135,8 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
purchaseOrder3.setSupplier(supplier2);
res.getContents().add(purchaseOrder3);
- assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(), CDOUtil.getCDOObject(purchaseOrder3).cdoRevision().data()
- .get(purchaseOrder_Supplier, 0));
+ assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(),
+ CDOUtil.getCDOObject(purchaseOrder3).cdoRevision().data().get(purchaseOrder_Supplier, 0));
assertEquals(purchaseOrder3, CDOUtil.getCDOObject(supplier2).cdoRevision().data().get(supplier_PurchaseOrder, 1));
msg("Committing");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java
index aa3f421e32..c37a34455a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.util.EContentAdapter;
* Create a lazy self-attaching adapter for CDOObject
* <p>
* See bug 247141
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_247141_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248052_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248052_Test.java
index 52b69f8510..d54050a34f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248052_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248052_Test.java
@@ -21,7 +21,7 @@ import java.util.Map;
* 248052: CDO: UnsupportedOperationException in HibernateStoreAccessor
* <p>
* See bug 248052
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_248052_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
index e1415027d0..eba50bdeb0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.view.CDOView;
* CDOView.hasResource() is not aware of deleted resources
* <p>
* See bug 248117
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_248124_Test extends AbstractCDOTest
@@ -73,8 +73,8 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
try
{
- transaction2.getResourceSet()
- .getResource(CDOURIUtil.createResourceURI(view, getResourcePath(resourcePath)), true);
+ transaction2.getResourceSet().getResource(CDOURIUtil.createResourceURI(view, getResourcePath(resourcePath)),
+ true);
fail("RuntimeException expected");
}
catch (RuntimeException expected)
@@ -112,8 +112,8 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
try
{
- transaction1.getResourceSet().getResource(
- CDOURIUtil.createResourceURI(transaction1, getResourcePath(resourcePath)), true);
+ transaction1.getResourceSet()
+ .getResource(CDOURIUtil.createResourceURI(transaction1, getResourcePath(resourcePath)), true);
fail("RuntimeException expected");
}
catch (RuntimeException expected)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java
index 24061ec32f..7e63b7bed7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
* Resources fetched using CDOViewImpl.getResource(getResourcePath(CDOID)) not added to ResourceSet
* <p>
* See bug 248915
- *
+ *
* @author Paul Richardson
*/
public class Bugzilla_248915_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java
index 38331d9e71..4b795bf8e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java
@@ -29,7 +29,7 @@ import java.util.List;
/**
* See bug 250036
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_250036_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java
index 844a0e977f..3416ef4aca 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* Persisted objects keeps references to detached objects through deltas
* <p>
* See bug 250757
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_250757_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java
index 36d43c389d..578c52c9e3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
* NPE in ChangeSubscriptionManager.isPending() while subscribing a pending TRANSIENT-by-removal object
* <p>
* See bug 251087
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_251087_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java
index 2c09ce568b..25b0def0b0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
* While committing, error in CommitIndicationTransaction.indicating doesn't stop the commit process
* <p>
* See bug 251752
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_251752_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java
index b5456a3a31..5547fe4246 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* [DBStore] NPE when trying to update objects
* <p>
* See bug 252909
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_252909_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java
index 194c988b7d..e898429a64 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
* CDOTransaction.postCommit not adjusting the Transaction/View reference
* <p>
* See bug 254489
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_254489_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java
index ef355feb51..0fec6e130e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* NPE in CDOResourceImpl.save()
* <p>
* See bug 255662
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_255662_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java
index 7d5655b054..9f6053fe65 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
/**
* Lazy packageRegistry fail when adding instance with Eclass in a subpackage See bug 256141
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_256141_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
index 53b16602a0..518a1792af 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.net4j.util.options.IOptionsEvent;
* 258850: Make Options extend INotifier
* <p>
* See bug 258850
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_258850_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
index d84bcd22dd..15287a5f43 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
/**
* Bug 258933 - CDORevisionImpl.eIsSet() works incorrectly.
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_258933_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java
index c80fef4a96..64fde53d4a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java
@@ -27,7 +27,7 @@ import java.util.List;
* ClassCastException on BasicEMap.clear
* <p>
* See bug 259695
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_259695_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
index d349cb36f0..46aed15942 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
@@ -26,7 +26,7 @@ import java.util.Set;
* CDOEList::toArray not implemented
* <p>
* See bug 260756
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_260756_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
index 21e723aa82..4d1956b1ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
* CDO wrong feature on notification when multiple super types
* <p>
* See bug 260764
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_260764_Test extends AbstractCDOTest
@@ -54,8 +54,8 @@ public class Bugzilla_260764_Test extends AbstractCDOTest
final CDOSession session2 = openSession();
final CDOTransaction transaction2 = session2.openTransaction();
- final OrderAddress orderAddress2 = (OrderAddress)CDOUtil.getEObject(transaction2.getObject(
- CDOUtil.getCDOObject(orderAddress).cdoID(), true));
+ final OrderAddress orderAddress2 = (OrderAddress)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
OrderDetail orderDetail = getModel1Factory().createOrderDetail();
orderAddress2.getOrderDetails().add(orderDetail);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java
index 2f780240b1..b5d2750c14 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
* Change subscription are not registered correctly for new CDOResource objects
* <p>
* See bug 266857
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_266857_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
index fc8f192341..3a9690c241 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
* IllegalStateException in CDOStore.getRevision
* <p>
* See bug 266982
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_266982_Test extends AbstractCDOTest
@@ -48,8 +48,8 @@ public class Bugzilla_266982_Test extends AbstractCDOTest
{
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- Customer customerToLoad = (Customer)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(customer)
- .cdoID()));
+ Customer customerToLoad = (Customer)CDOUtil
+ .getEObject(transaction.getObject(CDOUtil.getCDOObject(customer).cdoID()));
while (!done[0])
{
// Could fail if the attach is not thread safe
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
index 6f13f14c77..ad33d52f5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
@@ -27,7 +27,7 @@ import java.util.Collection;
* Add new packages infos in the Notifications process at the client side
* <p>
* See bug 267050
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_267050_Test extends AbstractCDOTest
@@ -70,7 +70,7 @@ public class Bugzilla_267050_Test extends AbstractCDOTest
}.assertNoTimeOut();
assertEquals(1, newPackagesUnits[0].size());
- assertEquals(getModel1Package().getNsURI(), newPackagesUnits[0].iterator().next().getTopLevelPackageInfo()
- .getPackageURI());
+ assertEquals(getModel1Package().getNsURI(),
+ newPackagesUnits[0].iterator().next().getTopLevelPackageInfo().getPackageURI());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
index 5d97b56eda..02ded73dad 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
* Concurrency problem: attribute of enumeration type not updated correctly between two clients
* <p>
* See bug 273565
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_273565_Test extends AbstractCDOTest
@@ -276,8 +276,8 @@ public class Bugzilla_273565_Test extends AbstractCDOTest
CDOUtil.getCDOObject(orderDetail).cdoWriteLock().lock(DEFAULT_TIMEOUT);
orderDetail.setPrice(2);
- boolean locked = CDOUtil.getCDOObject(orderDetail2).cdoWriteLock()
- .tryLock(DEFAULT_TIMEOUT_EXPECTED, TimeUnit.MILLISECONDS);
+ boolean locked = CDOUtil.getCDOObject(orderDetail2).cdoWriteLock().tryLock(DEFAULT_TIMEOUT_EXPECTED,
+ TimeUnit.MILLISECONDS);
assertEquals(false, locked);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java
index 30a7475dac..378e000f0f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java
@@ -31,7 +31,7 @@ import java.util.List;
* Export resource miss all of the oneToMany references
* <p>
* See bug 273758
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_273758_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java
index 3b4cece972..d46c2db4de 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EAttribute;
* ArrayIndexOutOfBoundsException while unsetting "modified" EAttribute in CDOResource
* <p>
* See bug 276696
- *
+ *
* @author Victor Roldan Betancort
*/
public class Bugzilla_276696_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
index 85346f1461..8a6a13cc9e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.common.notify.Notification;
* CDOObjects should send normal EMF notifications on rollback.
* <p>
* See bug 283131.
- *
+ *
* @author Pascal Lehmann
* @since 4.0
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java
index eaa6a6bf9e..6e7dbd2e61 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* Objects that are contained by a transient feature could be persisted
* <p>
* See bug 289932
- *
+ *
* @author Simon McDuff
*/
public class Bugzilla_289932_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java
index d2704d28e9..ec30b186cd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* unset of CDO does not work correctly
* <p>
* See bug 302233
- *
+ *
* @author Martin Fluegge
*/
public class Bugzilla_302233_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java
index 48b9dbb49f..9d2d84688b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Bug 302414, bug 316713 - ArrayIndexOutOfBoundsException in CDOListFeatureDeltaImpl
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_302414_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
index 146ef957da..96d9f19cf6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* CDO not robust when using dynamic packages
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_303466_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java
index 37605da79f..a368146d71 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* InvalidObjectException when switching branch
* <p>
* See bug 303807
- *
+ *
* @author Victor Roldan Betancort
*/
@Requires(IRepositoryConfig.CAPABILITY_BRANCHING)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java
index f7eb33e2dd..58ed0f92bc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* Problem with CDOStore.contains()
* <p>
* See bug 316273
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_316273_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java
index d6e9d81521..3a1ee93dc5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java
@@ -24,7 +24,7 @@ import java.util.Date;
/**
* Bug 318844 - CDONotificationBuilder cannot handle mixed OID's/CDOObjects when processing CDOClearFeatureDelta</p>
* http://bugs.eclipse.org/318844</p>
- *
+ *
* @author Caspar De Groot
* @since 4.0
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java
index b8b814e7ba..3d9cd569e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java
index 6237f6a2ee..9c8da8c31b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.util.DanglingReferenceException;
/**
* Bug 322754 - NullPointerException after deleting a resource
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_322754_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java
index 4d10064290..49862a78c4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
/**
* Bug 322804 - ClassCastException adding an object to an EList with objects of a custom data type
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_322804_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
index 381a9ff5b9..00c6a49ace 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
@@ -87,7 +87,7 @@ public class Bugzilla_324635_Test extends AbstractCDOTest
assertEquals(false, s1Tr1.isDirty());
// check revision versions.
- assertEquals(CDOUtil.getCDOObject(container).cdoRevision().getVersion(), CDOUtil.getCDOObject(container2)
- .cdoRevision().getVersion());
+ assertEquals(CDOUtil.getCDOObject(container).cdoRevision().getVersion(),
+ CDOUtil.getCDOObject(container2).cdoRevision().getVersion());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java
index 8f7ca121f6..81053c6ea6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
* NPE in TransactionCommitContext with re-attached object on branch.
* <p>
* See bug 324756
- *
+ *
* @author Pascal Lehmann
*/
public class Bugzilla_324756_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
index f48b70023c..3238dc996d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
/**
* Bug 328790 - CDOResource.isLoaded returns false after adding/clearing contents of new resource
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_328790_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java
index 2280dc7343..3f4f88c083 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.view.CDOView;
/**
* Bug 330052 - Breakage related to sticky views
- *
+ *
* @author Egidijus Vaisnora, Caspar De Groot
*/
public class Bugzilla_330052_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
index 56d589cb72..8acd1c72e1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Egidijus Vaishnora - initial API and implementation
* Caspar De Groot - initial API and implementation
@@ -30,7 +30,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOTransaction.InternalCDOCommitContext;
/**
* Bug 334608 - CommitIntegrityCheck erroneously checks non-persistent features
- *
+ *
* @author Egidijus Vaishnora, Caspar De Groot
*/
public class Bugzilla_334608_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java
index c1b206dc15..545aeefb72 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
/**
* Bug 334995 - CDOTransaction corrupted by persisted + new resource with same URI
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_334995_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java
index 740c04f43e..3b01a67a8d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
@@ -27,7 +27,7 @@ import java.util.Set;
/**
* Bug 336314 - Partial commits choke on CDOMoveFeatureDeltas
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_336314_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
index fecb0ace0e..56b602d87f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
index 0a47becf38..de31e9c73c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_338884_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_338884_Test.java
index a3e42a4ad1..ace383c7ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_338884_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_338884_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
@@ -35,7 +35,7 @@ import java.util.Set;
/**
* See bug 338884.
- *
+ *
* @author Caspar De Groot
*/
public class Bugzilla_338884_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339461_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339461_Test.java
index 391302814b..7f788db89e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339461_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339461_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
index 41d5904951..007e98607a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_342130_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_342130_Test.java
index 636569b79a..6fe9097cfd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_342130_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_342130_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
index 5b33198493..e6bc998154 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
@@ -84,8 +84,8 @@ public class Bugzilla_343332_Test extends AbstractCDOTest
((Category)resource.getContents().get(1)).getCategories().add(nestedCategory);
assertNotNull("CDOTransactionHandler1.attachingObject was not called", attachedObject[0]);
- assertEquals(MessageFormat.format("Re-attached object was not the expected object {0}", cdoCategory),
- cdoCategory, attachedObject[0]);
+ assertEquals(MessageFormat.format("Re-attached object was not the expected object {0}", cdoCategory), cdoCategory,
+ attachedObject[0]);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343471_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343471_Test.java
index 440dc91201..21c5506b95 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343471_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343471_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350027_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350027_Test.java
index 8d615c3c51..e60c2d149f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350027_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350027_Test.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.AbstractCDOTest;
* Fix index for moves from left to right.
* <p>
* See bug 350027
- *
+ *
* @author Cyril Jaquier
*/
public class Bugzilla_350027_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352303_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352303_Test.java
index 5771c17ba2..d00c4986b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352303_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352303_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
index 30d8294931..4a34263522 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
@@ -55,24 +55,24 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
assertEquals(null,
cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
singleNonContainedElement.setParent(refSingleNonContained);
- transaction1.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement,
- refSingleNonContained })));
+ transaction1.setCommittables(
+ new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement, refSingleNonContained })));
checkPartialCommitIntegrity((InternalCDOTransaction)transaction1);
transaction1.commit();
// STEP 2 Setting parent feature to point NULL
CDOSession session2 = openSession();
InternalCDOTransaction transaction2 = (InternalCDOTransaction)session2.openTransaction();
- SingleNonContainedElement singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil.getEObject(transaction2
- .getObject(CDOUtil.getCDOObject(singleNonContainedElement).cdoID()));
+ SingleNonContainedElement singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(singleNonContainedElement).cdoID()));
RefSingleNonContained refSingleNonContained2 = singleNonContainedElement2.getParent();
singleNonContainedElement2.setParent(null);
cdoRevision = CDOUtil.getCDOObject(singleNonContainedElement2).cdoRevision();
// here is real Java NULL after setting
assertEquals(null,
cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
- transaction2.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2,
- refSingleNonContained2 })));
+ transaction2.setCommittables(
+ new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
checkPartialCommitIntegrity(transaction2);
transaction2.commit();
session2.close();
@@ -80,10 +80,10 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
// STEP 3 Setting parent feature to point REF
session2 = openSession();
transaction2 = (InternalCDOTransaction)session2.openTransaction();
- singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil.getEObject(transaction2.getObject(CDOUtil
- .getCDOObject(singleNonContainedElement).cdoID()));
- refSingleNonContained2 = (RefSingleNonContained)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(
- refSingleNonContained).cdoID()));
+ singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(singleNonContainedElement).cdoID()));
+ refSingleNonContained2 = (RefSingleNonContained)CDOUtil
+ .getEObject(transaction2.getObject(CDOUtil.getCDOObject(refSingleNonContained).cdoID()));
cdoRevision = CDOUtil.getCDOObject(singleNonContainedElement2).cdoRevision();
// from server loaded revision has CDO NULL ID, which has meaning of the same Java NULL. Identical situation when in
@@ -91,8 +91,8 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
assertEquals(CDOID.NULL,
cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
singleNonContainedElement2.setParent(refSingleNonContained2);
- transaction2.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2,
- refSingleNonContained2 })));
+ transaction2.setCommittables(
+ new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
checkPartialCommitIntegrity(transaction2);
transaction2.commit();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359669_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359669_Test.java
index b765dbcf28..398a0464eb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359669_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359669_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
index e323cd9203..4995901d6d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
/**
* Bug 361819.
- *
+ *
* @author Egidijus Vaisnora
*/
public class Bugzilla_361819_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
index ff1f0b2388..9eb9e92858 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
@@ -24,7 +24,7 @@ import java.util.Collections;
/**
* @author Esteban Dugueperoux
- *
+ *
* Test about remote detachment.
*/
public class Bugzilla_363355_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
index 67d361e737..beca9279ff 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -34,7 +34,7 @@ import java.io.IOException;
/**
* Bug 365832: Issues when trying to import changes: Cannot modify a frozen exception issue
- *
+ *
* @author Alex Lagarde
*/
public class Bugzilla_365832_Test extends AbstractCDOTest
@@ -114,7 +114,7 @@ public class Bugzilla_365832_Test extends AbstractCDOTest
/**
* Creates a Push Transaction with the given options.
- *
+ *
* @param fileForStoringChanges
* the file that CDOPushTransaction should use to store changes (can be null)
* @param reconstructSavePoints
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
index 07f8dbbaa3..e1bcb3874c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
@@ -95,7 +95,8 @@ public class Bugzilla_377173_Test extends AbstractCDOTest
sleep(2000);
}
- public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
+ public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
+ OMMonitor monitor)
{
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381395_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381395_Test.java
index c816346898..d264e6f836 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381395_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381395_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
/**
* Bug 412686: NPE when removing/adding an adapter after CDO view closed.
- *
+ *
* @author Esteban Dugueperoux
*/
public class Bugzilla_381395_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
index 9b87e73c14..4740425327 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
@@ -69,7 +69,7 @@ public class Bugzilla_397822_Test extends AbstractCDOTest
EReference reference = getModel6Package().getUnorderedList_Contained();
assertRevisionDeltaContainsListChanges(revisionDelta, reference //
- // removal of elem4 at index 3
+ // removal of elem4 at index 3
, new CDORemoveFeatureDeltaImpl(reference, 3)
// removal of elem2 at index 1
@@ -104,7 +104,7 @@ public class Bugzilla_397822_Test extends AbstractCDOTest
EAttribute attribute = getModel5Package().getGenListOfInt_Elements();
assertRevisionDeltaContainsListChanges(revisionDelta, attribute //
- // removal of '4' at index 3
+ // removal of '4' at index 3
, new CDORemoveFeatureDeltaImpl(attribute, 3)
// removal of '2' at index 1
@@ -135,7 +135,7 @@ public class Bugzilla_397822_Test extends AbstractCDOTest
EAttribute attribute = getModel5Package().getGenListOfInt_Elements();
assertRevisionDeltaContainsListChanges(revisionDelta, attribute //
- // entire list was cleared
+ // entire list was cleared
, new CDOClearFeatureDeltaImpl(attribute)
);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
index 50786b6a38..693d0eb724 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
@@ -88,8 +88,8 @@ public class Bugzilla_399641_Test extends AbstractCDOTest
public Object create(String description) throws ProductCreationException
{
- return new MyProduct((MyOtherProduct)getManagedContainer().getElement(MyOtherFactory.PRODUCT_GROUP,
- MyOtherFactory.TYPE, null));
+ return new MyProduct(
+ (MyOtherProduct)getManagedContainer().getElement(MyOtherFactory.PRODUCT_GROUP, MyOtherFactory.TYPE, null));
}
public IManagedContainer getManagedContainer()
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
index c9f3da8b3d..9563d5f554 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
@@ -536,8 +536,8 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
CDOObject cdoElement = CDOUtil.getCDOObject(element);
assertClean(cdoElement, ((CDOResource)cdoElement.eResource()).cdoView());
assertEquals(expectedVersion, cdoElement.cdoRevision().getVersion());
- assertEquals("Transaction is not expected to contain revision deltas on the given object", null, transaction
- .getRevisionDeltas().get(cdoElement.cdoID()));
+ assertEquals("Transaction is not expected to contain revision deltas on the given object", null,
+ transaction.getRevisionDeltas().get(cdoElement.cdoID()));
if (expectedDirtyTransaction)
{
@@ -584,8 +584,8 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
CDOBranchVersion branchVersion = new CDOBranchVersionImpl(transaction.getBranch(), version);
if (revisionManager.containsRevisionByVersion(targetElement, branchVersion))
{
- CDORevision fetched = revisionManager
- .getRevisionByVersion(targetElement, branchVersion, initialChunkSize, true);
+ CDORevision fetched = revisionManager.getRevisionByVersion(targetElement, branchVersion, initialChunkSize,
+ true);
if (fetched != null)
{
revisions.add(fetched);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
index f80a3e163c..ff20da2f18 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
@@ -111,8 +111,8 @@ public class Bugzilla_411927_Test extends AbstractCDOTest
getTestProperties().put(RepositoryConfig.PROP_TEST_REPOSITORY, repository);
}
- private void executeTestWith(FailureTime failureTime) throws ConcurrentAccessException, CommitException,
- InterruptedException
+ private void executeTestWith(FailureTime failureTime)
+ throws ConcurrentAccessException, CommitException, InterruptedException
{
disableConsole();
initRepository(failureTime);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
index 9992d044d1..675e569a65 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
@@ -36,7 +36,7 @@ import java.util.Collections;
/**
* Bug 412767: "IllegalArgumentException: id is null on" on ResourceSet.getResource() with connection aware URI with prefetch query.
- *
+ *
* @author Esteban Dugueperoux
*/
@Requires(ISessionConfig.CAPABILITY_NET4J_TCP)
@@ -52,8 +52,8 @@ public class Bugzilla_412767_Test extends AbstractCDOTest
try
{
URI sharedResourceURI = createRemoteResource();
- URI sharedResourceURIWithPrefetch = sharedResourceURI.appendQuery(sharedResourceURI.query() + "&"
- + CDOResource.PREFETCH_PARAMETER + "=true");
+ URI sharedResourceURIWithPrefetch = sharedResourceURI
+ .appendQuery(sharedResourceURI.query() + "&" + CDOResource.PREFETCH_PARAMETER + "=true");
ResourceSet resourceSet = new ResourceSetImpl();
CDOResource sharedResource = (CDOResource)resourceSet.getResource(sharedResourceURIWithPrefetch, true);
assertEquals(CDOState.PROXY, sharedResource.cdoState());
@@ -89,9 +89,9 @@ public class Bugzilla_412767_Test extends AbstractCDOTest
{
ResourceSet resourceSet = new ResourceSetImpl();
- URI sharedResourceURI = URI.createURI(
- CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
- + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+ URI sharedResourceURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
+ + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource"))
+ .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
Resource sharedResource = resourceSet.createResource(sharedResourceURI);
Company sharedCompany = getModel1Factory().createCompany();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
index fd9fd9c5d6..768a679832 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Skips;
/**
* Bug 414270: Do not access sub branches if repository does not support branching.
- *
+ *
* @author Eike Stepper
*/
@Skips(IRepositoryConfig.CAPABILITY_BRANCHING)
@@ -86,19 +86,18 @@ public class Bugzilla_414270_Test extends AbstractCDOTest
CDOBranchManager branchManager = session.getBranchManager();
final CDOBranch[] result = { null };
- int count = branchManager.getBranches(CDOBranch.MAIN_BRANCH_ID, CDOBranch.MAIN_BRANCH_ID + 1,
- new CDOBranchHandler()
+ int count = branchManager.getBranches(CDOBranch.MAIN_BRANCH_ID, CDOBranch.MAIN_BRANCH_ID + 1, new CDOBranchHandler()
+ {
+ public void handleBranch(CDOBranch branch)
+ {
+ if (result[0] != null)
{
- public void handleBranch(CDOBranch branch)
- {
- if (result[0] != null)
- {
- fail("Only one result branch expected: the main branch");
- }
+ fail("Only one result branch expected: the main branch");
+ }
- result[0] = branch;
- }
- });
+ result[0] = branch;
+ }
+ });
assertEquals(1, count);
assertEquals(branchManager.getMainBranch(), result[0]);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
index 73530d1fc4..843e345d43 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
@@ -33,7 +33,7 @@ import java.util.Collections;
/**
* Bug 414949 - ArrayIndexOutOfBoundsException with CDOLegacyWrapper and CDOIDExternal
- *
+ *
* @author Esteban Dugueperoux
*/
@Requires(IModelConfig.CAPABILITY_LEGACY)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417825_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417825_Test.java
index 0fde7fb58a..e19e8826dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417825_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417825_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
/**
* Bug 417825 - Invalidator can die if CDOSession can not be activated within 100ms.
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_417825_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417844_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417844_Test.java
index 9e76acf813..1c950f0794 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417844_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417844_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
/**
* Bug 417844 - InvalidationRunner can die if invalidations come too early.
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_417844_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_418267_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_418267_Test.java
index 8f209c9a64..623716b1fd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_418267_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_418267_Test.java
@@ -38,7 +38,7 @@ import org.eclipse.emf.ecore.EObject;
/**
* Bug 418267 - [Security] Cached permissions are not always properly updated after commits.
- *
+ *
* @author Eike Stepper
*/
@CleanRepositoriesBefore(reason = "TEST_SECURITY_MANAGER")
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java
index d855a20443..fda99b6a02 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.spi.cdo.CDOMergingConflictResolver;
/**
* Bug 419574 - NPE in CDOMergingConflictResolver.
- *
+ *
* @author Eike Stepper
*/
public class Bugzilla_419574_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
index 32a94457e0..60693afd49 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
@@ -45,8 +45,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
List<EObject> objectsToAdd = new ArrayList<EObject>();
objectsToAdd.add(getModel3SubpackageFactory().createClass2());
objectsToAdd.add(getModel3SubpackageFactory().createClass2());
- performUnsetOnMultiValuedFeature(getXMIResource(), getModel3Factory().createClass1(), getModel3Package()
- .getClass1_Class2(), true, objectsToAdd);
+ performUnsetOnMultiValuedFeature(getXMIResource(), getModel3Factory().createClass1(),
+ getModel3Package().getClass1_Class2(), true, objectsToAdd);
}
public void testUnsetOnUnsettableMultiValuedFeatureCDOResource() throws Exception
@@ -54,8 +54,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
List<EObject> objectsToAdd = new ArrayList<EObject>();
objectsToAdd.add(getModel3SubpackageFactory().createClass2());
objectsToAdd.add(getModel3SubpackageFactory().createClass2());
- performUnsetOnMultiValuedFeature(getCDOResource(), getModel3Factory().createClass1(), getModel3Package()
- .getClass1_Class2(), true, objectsToAdd);
+ performUnsetOnMultiValuedFeature(getCDOResource(), getModel3Factory().createClass1(),
+ getModel3Package().getClass1_Class2(), true, objectsToAdd);
}
public void testUnsetOnNonUnsettableMultiValuedFeatureXMIResource() throws Exception
@@ -63,8 +63,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
List<EObject> objectsToAdd = new ArrayList<EObject>();
objectsToAdd.add(getModel6Factory().createBaseObject());
objectsToAdd.add(getModel6Factory().createBaseObject());
- performUnsetOnMultiValuedFeature(getXMIResource(), getModel6Factory().createReferenceObject(), getModel6Package()
- .getReferenceObject_ReferenceList(), false, objectsToAdd);
+ performUnsetOnMultiValuedFeature(getXMIResource(), getModel6Factory().createReferenceObject(),
+ getModel6Package().getReferenceObject_ReferenceList(), false, objectsToAdd);
}
public void testUnsetOnNonUnsettableMultiValuedFeatureCDOResource() throws Exception
@@ -72,8 +72,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
List<EObject> objectsToAdd = new ArrayList<EObject>();
objectsToAdd.add(getModel6Factory().createBaseObject());
objectsToAdd.add(getModel6Factory().createBaseObject());
- performUnsetOnMultiValuedFeature(getCDOResource(), getModel6Factory().createReferenceObject(), getModel6Package()
- .getReferenceObject_ReferenceList(), false, objectsToAdd);
+ performUnsetOnMultiValuedFeature(getCDOResource(), getModel6Factory().createReferenceObject(),
+ getModel6Package().getReferenceObject_ReferenceList(), false, objectsToAdd);
}
public void testUnsetOnUnsettableSingleValuedAttributeCDOResource() throws Exception
@@ -144,8 +144,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
// check
assertEquals("Incorrect number of expected notifications: ", 1, notifications.size());
- assertEquals("Incorrect notification: ", unsettable ? Notification.UNSET : Notification.SET, notifications.get(0)
- .getEventType());
+ assertEquals("Incorrect notification: ", unsettable ? Notification.UNSET : Notification.SET,
+ notifications.get(0).getEventType());
}
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java
index 90371fe8e9..3af703b8ac 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
index bd31c6e5cf..d033c3d913 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
@@ -30,7 +30,7 @@ import org.junit.Assert;
/**
* Bug 437817: "Only one view per repository..." RuntimeException using connection aware URI
- *
+ *
* @author Esteban Dugueperoux
*/
@Requires(ISessionConfig.CAPABILITY_NET4J_TCP)
@@ -48,12 +48,12 @@ public class Bugzilla_437817_Test extends AbstractCDOTest
{
ResourceSet resourceSet = new ResourceSetImpl();
- URI sharedResource1URI = URI.createURI(
- CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
- + getResourcePath("/sharedResource1")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
- URI sharedResource2URI = URI.createURI(
- CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
- + getResourcePath("/sharedResource2")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+ URI sharedResource1URI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
+ + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource1"))
+ .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+ URI sharedResource2URI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
+ + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource2"))
+ .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
Resource sharedResource1 = resourceSet.createResource(sharedResource1URI);
Resource sharedResource2 = resourceSet.createResource(sharedResource2URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
index 79933a1d19..73d8dc7f20 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
@@ -63,8 +63,8 @@ public class Bugzilla_441136_Test extends AbstractCDOTest
{
CDOSession session = openSession();
getRepository().getCommitInfoManager().addCommitInfoHandler(new CommitTransactionIndicationWaiting());
- ((CDONet4jSession)session).options().setCommitTimeout(
- 1000 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS);
+ ((CDONet4jSession)session).options()
+ .setCommitTimeout(1000 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS);
((CDONet4jSessionImpl)session).setSignalTimeout(10000 * SignalProtocol.DEFAULT_TIMEOUT);
CDOTransaction transaction = session.openTransaction();
ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
index d649f099f1..1d4b2ec6b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
@@ -55,8 +55,8 @@ public class Bugzilla_447912_Test extends AbstractCDOTest
listener.getLatch().await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS));
assertEquals(mainBranchFromView1.getBranches().length, mainBranchFromView2.getBranches().length);
- assertEquals(session1.getBranchManager().getMainBranch().getBranches().length, session2.getBranchManager()
- .getMainBranch().getBranches().length);
+ assertEquals(session1.getBranchManager().getMainBranch().getBranches().length,
+ session2.getBranchManager().getMainBranch().getBranches().length);
assertEquals(2, mainBranchFromView1.getBranches().length);
assertEquals(mainBranchFromView1.getBranches()[0].getID(), mainBranchFromView2.getBranches()[0].getID());
assertEquals(mainBranchFromView1.getBranches()[1].getID(), mainBranchFromView2.getBranches()[1].getID());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bundle/OM.java
index cae5f87f28..7a00e0845c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bundle/OM.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* The <em>Operations & Maintenance</em> class of this bundle.
- *
+ *
* @author Eike Stepper
*/
public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IModelConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IModelConfig.java
index 460c7959c6..a0850ce645 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IModelConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IModelConfig.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index 149024cdba..b8855627c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -872,7 +872,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
@Target({ ElementType.TYPE, ElementType.METHOD })
public @interface Requires
{
- String[]value();
+ String[] value();
}
@Inherited
@@ -880,6 +880,6 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
@Target({ ElementType.TYPE, ElementType.METHOD })
public @interface Skips
{
- String[]value();
+ String[] value();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
index e93390f9b6..146c82d9b9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
@@ -32,7 +32,7 @@ import java.text.MessageFormat;
* CommitNotifications overtaking each other.
* <p>
* See bug 328352
- *
+ *
* @author Pascal Lehmann
* @since 4.0
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
index 41d54aa828..e12b6e9a3f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Caspar De Groot - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTests.java
index b15b02bacb..fc38a6bc0f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTests.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletePerformanceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletePerformanceTest.java
index 4dcfcd680a..f6eeb32eaf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletePerformanceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletePerformanceTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Stefan Winkler - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/IPerformanceRecordAnalyzer.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/IPerformanceRecordAnalyzer.java
index 1fecb7e121..b3a9a103af 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/IPerformanceRecordAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/IPerformanceRecordAnalyzer.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
index 44a02a08e1..43c9064e84 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
index c347ea81ad..f293f040d3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Stefan Winkler - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
index 681e3df89f..11f53e407a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Stefan Winkler - initial API and implementation
*/
@@ -18,7 +18,7 @@ import java.util.List;
/**
* A performance record analyzer that prints directly to a {@link PrintStream}, such as {@link System#out}.
- *
+ *
* @author Stefan Winkler
*/
public class PrintStreamPerformanceRecordAnalyzer implements IPerformanceRecordAnalyzer
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
index be25a4436e..7cd0d65935 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
@@ -226,8 +226,8 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
InternalCDORevision secondVersion = company.cdoRevision();
addRevision(secondVersion);
- CDORevision removedRevision = revisionCache.removeRevision(firstVersion.getID(), firstVersion.getBranch()
- .getVersion(firstVersion.getVersion()));
+ CDORevision removedRevision = revisionCache.removeRevision(firstVersion.getID(),
+ firstVersion.getBranch().getVersion(firstVersion.getVersion()));
assertNotNull(removedRevision);
assertEqualRevisions(firstVersion, removedRevision);
}
@@ -243,9 +243,10 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
InternalCDORevision secondVersion = company.cdoRevision();
addRevision(secondVersion);
- revisionCache.removeRevision(secondVersion.getID(), secondVersion.getBranch()
- .getVersion(secondVersion.getVersion()));
- assertNull(revisionCache.getRevisionByVersion(secondVersion.getID(), BRANCH.getVersion(secondVersion.getVersion())));
+ revisionCache.removeRevision(secondVersion.getID(),
+ secondVersion.getBranch().getVersion(secondVersion.getVersion()));
+ assertNull(
+ revisionCache.getRevisionByVersion(secondVersion.getID(), BRANCH.getVersion(secondVersion.getVersion())));
}
public void testRemoveSecondRevisionResultsInNoActiveRevision() throws Exception
@@ -259,8 +260,8 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
InternalCDORevision secondVersion = company.cdoRevision();
addRevision(secondVersion);
- revisionCache.removeRevision(secondVersion.getID(), secondVersion.getBranch()
- .getVersion(secondVersion.getVersion()));
+ revisionCache.removeRevision(secondVersion.getID(),
+ secondVersion.getBranch().getVersion(secondVersion.getVersion()));
CDORevision fetchedRevision = revisionCache.getRevision(firstVersion.getID(), BRANCH_POINT);
assertNull(fetchedRevision);
}
@@ -306,17 +307,17 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
{
Runnable[] testCases = new Runnable[] {
- new Runnable()
- {
- public void run()
- {
- CDOObject company = createCompanyInResource(COMPANY, session.openTransaction());
- CDORevision revision = company.cdoRevision();
- addRevision(revision);
- CDORevision fetchedRevision = revisionCache.getRevision(revision.getID(), BRANCH_POINT);
- assertNotNull(fetchedRevision != null);
- }
- } //
+ new Runnable()
+ {
+ public void run()
+ {
+ CDOObject company = createCompanyInResource(COMPANY, session.openTransaction());
+ CDORevision revision = company.cdoRevision();
+ addRevision(revision);
+ CDORevision fetchedRevision = revisionCache.getRevision(revision.getID(), BRANCH_POINT);
+ assertNotNull(fetchedRevision != null);
+ }
+ } //
, new Runnable()
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/Session.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/Session.java
index 8f754d2bd3..23bb40860f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/Session.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/Session.java
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.EPackage;
/**
* A class that holds a single CDOSession. It starts an IRepository that uses a memstore and a client that connects to
* it by JVM transport
- *
+ *
* @author Andre Dietisheim
*/
public class Session extends Lifecycle
@@ -84,7 +84,7 @@ public class Session extends Lifecycle
/**
* Returns the session held by this class and registers the given packages to it.
- *
+ *
* @param ePackages
* the e packages
* @return the session
@@ -103,7 +103,7 @@ public class Session extends Lifecycle
/**
* Returns the session this class holds.
- *
+ *
* @return the session
*/
public CDOSession getSession()
@@ -132,7 +132,7 @@ public class Session extends Lifecycle
/**
* Creates the repository for this session holder. It initializes the acceptor and store used within this session
* holder
- *
+ *
* @param repositoryName
* the repository name
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java
index 3d80d3862d..8dbfef4fcf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener2.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener2.java
index e040c33f9a..bac7fec4a4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener2.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener2.java
@@ -178,7 +178,7 @@ public class TestListener2 implements IListener
public String formatEvents(String prefix, String suffix)
{
StringBuilder builder = new StringBuilder();
-
+
synchronized (this)
{
for (Entry<IEvent, Long> entry : events.entrySet())
@@ -186,7 +186,7 @@ public class TestListener2 implements IListener
builder.append(prefix + entry.getValue() + ": " + entry.getKey() + suffix);
}
}
-
+
return builder.toString();
}
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
index 39c814ca8d..50fa0c4024 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.ui;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.transfer.workspace;bundle-version="[4.2.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.300";x-internal:=true,
- org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.300";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.300",
- org.eclipse.emf.cdo.transfer.ui;version="4.2.300",
- org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.300",
+Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.400";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.400";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.400",
+ org.eclipse.emf.cdo.transfer.ui;version="4.2.400",
+ org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.400",
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
index 2c8007daa5..3c41b63108 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
@@ -16,11 +16,11 @@ import org.eclipse.emf.cdo.transfer.CDOTransferSystem;
import org.eclipse.emf.cdo.transfer.ui.swt.TransferComposite;
import org.eclipse.emf.cdo.ui.shared.SharedIcons;
+import org.eclipse.net4j.util.om.monitor.SubProgressMonitor;
import org.eclipse.net4j.util.ui.UIUtil;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.net4j.util.om.monitor.SubProgressMonitor;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
index c004cc4e1c..f0d0782d0c 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.transfer;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.300";x-internal:=true,
- org.eclipse.emf.cdo.spi.transfer;version="4.2.300",
- org.eclipse.emf.cdo.transfer;version="4.2.300"
+Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.400";x-internal:=true,
+ org.eclipse.emf.cdo.spi.transfer;version="4.2.400",
+ org.eclipse.emf.cdo.transfer;version="4.2.400"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.internal.transfer.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
index 68426e9301..78d65d51a2 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
@@ -19,6 +19,7 @@ import org.eclipse.net4j.util.event.INotifier;
import o