Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF72
-rw-r--r--plugins/org.eclipse.emf.cdo.common/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.common/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/plugin.xml19
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.core.prefs435
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.ui.prefs133
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/META-INF/MANIFEST.MF27
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.ini (renamed from plugins/org.eclipse.emf.cdo.explorer/about.ini)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.mappings (renamed from plugins/org.eclipse.emf.cdo.explorer/about.mappings)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.properties (renamed from plugins/org.eclipse.emf.cdo.explorer/about.properties)12
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/build.properties32
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/BrokenLink.gifbin0 -> 375 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callees.gifbin0 -> 215 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callers.gifbin0 -> 218 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Copy.gifbin0 -> 607 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Element.gifbin0 -> 443 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Flat.gifbin0 -> 97 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Generics.gifbin0 -> 99 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Horizontal.gifbin0 -> 373 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Link.gifbin0 -> 218 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Model.gifbin0 -> 208 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/ModelContainer.gifbin0 -> 364 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Refresh.gifbin0 -> 330 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Search.gifbin0 -> 348 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/SortByDependencies.gifbin0 -> 238 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Uri.gifbin0 -> 349 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Vertical.gifbin0 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Xml.gifbin0 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/ovr16/Error.gifbin0 -> 82 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.ecore88
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.genmodel68
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/modeling32.png (renamed from plugins/org.eclipse.emf.cdo.explorer/modeling32.png)bin2414 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.properties58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.xml51
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Addressable.java67
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesFactory.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesPackage.java1314
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Element.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Link.java117
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Model.java329
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ModelContainer.java65
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/bundle/DependenciesPlugin.java155
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/DependenciesFactoryImpl.java218
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/DependenciesPackageImpl.java790
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ElementImpl.java541
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/LinkImpl.java516
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ModelContainerImpl.java249
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ModelImpl.java939
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/DependenciesItemProviderAdapterFactory.java328
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ElementItemProvider.java280
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/LinkItemProvider.java237
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelContainerItemProvider.java280
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelItemProvider.java496
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelItemProviderForLinkViewer.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/URIStyler.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ui/DependenciesView.java846
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ui/TableColumnSorter.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/DependenciesAdapterFactory.java226
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/DependenciesSwitch.java251
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/Graph.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/WorkspaceScanner.java218
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF25
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/workingset.gifbin0 -> 349 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml30
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/workingsets/CheckoutWorkingSetWizardPage.java560
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/workingsets/OthersWorkingSetUpdater.java139
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/Assembly.gifbin0 -> 580 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/AssemblyModule.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/AssemblyModuleDisabled.gifbin0 -> 367 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/old/Assembly.gifbin0 -> 579 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/old/AssemblyModule.gifbin0 -> 532 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/overlay/ModuleOverlay.gifbin0 -> 307 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/plugin.properties34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/plugin.xml29
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyEditPlugin.java101
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyItemProvider.java196
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyItemProviderAdapterFactory.java258
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyModuleItemProvider.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/.api_filters44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.aird200
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.ecore20
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.genmodel28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/plugin.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/Assembly.java101
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyFactory.java61
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyModule.java162
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyPackage.java398
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyFactoryImpl.java127
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyImpl.java347
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyModuleImpl.java407
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyPackageImpl.java331
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyAdapterFactory.java179
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyResourceFactoryImpl.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyResourceImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblySwitch.java173
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyXMLProcessor.java57
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/plugin.xml44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/IAssemblyDescriptor.java125
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/IAssemblyManager.java62
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/ISystemDescriptor.java313
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/ISystemManager.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/AssemblyDescriptor.java810
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/AssemblyManager.java624
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMAdapterFactory.java53
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMManager.java201
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMResourceSetConfiguration.java297
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMResourceSetConfigurer.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java1202
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemManager.java717
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/TimeStamp.java240
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/bundle/OM.java75
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/properties/CheckoutProperties.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/properties/ModuleCheckoutProperties.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Change.gifbin0 -> 533 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ChangeDisabled.gifbin0 -> 330 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Delivery.gifbin0 -> 184 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Dependency.gifbin0 -> 131 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Drop.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/DropType.gifbin0 -> 332 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Module.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ModuleType.gifbin0 -> 608 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Process.gifbin0 -> 1027 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Release.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ReleaseType.gifbin0 -> 335 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Stream.gifbin0 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/System.gifbin0 -> 339 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Tag.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/plugin.properties98
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/plugin.xml29
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/BaselineItemProvider.java130
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java201
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DeliveryItemProvider.java174
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DependencyItemProvider.java185
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DropItemProvider.java179
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DropTypeItemProvider.java172
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/FixedBaselineItemProvider.java172
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/FloatingBaselineItemProvider.java134
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/LMEditPlugin.java100
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/LMItemProviderAdapterFactory.java479
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleElementItemProvider.java107
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleItemProvider.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleTypeItemProvider.java157
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ProcessElementItemProvider.java133
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ProcessItemProvider.java215
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/StreamElementItemProvider.java107
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/StreamItemProvider.java349
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/SystemElementItemProvider.java122
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/SystemItemProvider.java195
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/icons/full/obj16/DependencyDefinition.gifbin0 -> 131 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/icons/full/obj16/ModuleDefinition.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/plugin.properties33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/plugin.xml33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/DependencyDefinitionItemProvider.java263
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModuleDefinitionItemProvider.java227
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModulesEditPlugin.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModulesItemProviderAdapterFactory.java253
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/.api_filters35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.aird258
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.ecore27
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.genmodel28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/plugin.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/DependencyDefinition.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModuleDefinition.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModulesFactory.java67
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModulesPackage.java440
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/DependencyDefinitionImpl.java302
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModuleDefinitionImpl.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModulesFactoryImpl.java222
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModulesPackageImpl.java358
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesAdapterFactory.java177
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesResourceFactoryImpl.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesResourceImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesSwitch.java173
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesXMLProcessor.java57
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/CDOServer (LM).launch436
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/META-INF/MANIFEST.MF21
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/config/.options24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/config/cdo-server.xml68
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/plugin.xml30
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/AbstractLifecycleManager.java888
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/LMAppExtension.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/XMLLifecycleManager.java103
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/bundle/OM.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/.api_filters11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/META-INF/MANIFEST.MF33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Assembly.gifbin0 -> 580 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Checkout.pngbin0 -> 2998 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Delete.gifbin0 -> 351 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/DeleteChange.gifbin0 -> 3230 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/DeleteModule.gifbin0 -> 3230 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewChange.pngbin0 -> 2829 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewDelivery.pngbin0 -> 2362 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewDrop.pngbin0 -> 3959 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewModule.pngbin0 -> 3974 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewRelease.pngbin0 -> 4095 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewStream.pngbin0 -> 2364 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewTag.pngbin0 -> 4088 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Rename.gifbin0 -> 922 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/RenameChange.gifbin0 -> 2815 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/System.gifbin0 -> 339 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Update.gifbin0 -> 332 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/checkout.gifbin0 -> 357 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateAddition.pngbin0 -> 625 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateModification.pngbin0 -> 629 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateRemoval.pngbin0 -> 683 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/read_only.gifbin0 -> 851 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/plugin.xml124
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/InteractiveDeliveryMerger.java95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMHistoryInputObjectModifier.java115
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMLoadResourceProvider.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMMenuFiller.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMTargetNameProvider.java81
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/CheckoutAction.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/DeleteChangeAction.java82
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/DeleteModuleAction.java70
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/InstallUpdatesHandler.java50
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/LMAction.java277
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewChangeAction.java261
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewDeliveryAction.java203
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewDropAction.java255
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewModuleAction.java195
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewStreamAction.java274
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/RenameChangeAction.java140
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/UpdateAssemblyAction.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/bundle/OM.java69
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/decorators/AvailableUpdatesDecorator.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/dialogs/SelectModuleResourcesDialog.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/properties/ModulePropertyPage.java250
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/providers/SystemContentProvider.java229
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/providers/SystemLabelProvider.java85
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/views/AssembliesView.java674
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/views/SystemsView.java324
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/widgets/BaselineComposite.java224
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/widgets/TimeStampComposite.java268
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/.api_filters131
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.ini15
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.mappings6
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.properties31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/build.properties28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.aird1993
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.ecore165
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.genmodel133
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/modeling32.pngbin0 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/plugin.xml24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/BasePoint.java68
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Baseline.java102
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Change.java154
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Delivery.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Dependency.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Drop.java119
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/DropType.java100
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/FixedBaseline.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/FloatingBaseline.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Impact.java242
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/LMFactory.java139
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/LMPackage.java3727
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Module.java132
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ModuleElement.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ModuleType.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Process.java137
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ProcessElement.java35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Stream.java347
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamElement.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamMode.java242
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamSpec.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/System.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/SystemElement.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/BaselineImpl.java352
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ChangeImpl.java447
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DeliveryImpl.java299
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DependencyImpl.java270
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DropImpl.java312
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DropTypeImpl.java310
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/FixedBaselineImpl.java266
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/FloatingBaselineImpl.java214
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/LMFactoryImpl.java369
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/LMPackageImpl.java1502
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ModuleImpl.java391
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ModuleTypeImpl.java270
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ProcessElementImpl.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ProcessImpl.java362
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/StreamImpl.java907
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/SystemImpl.java328
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMAdapterFactory.java512
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMMerger.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMSwitch.java785
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.classpath6
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.gitignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/ant_tasks/.gitignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant8
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/build.properties9
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/CDOTask.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/GenerateModelTask.java398
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/plugin.xml21
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockAreaRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteSessionNotificationIndication.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteTopicRequest.java68
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/model/catalog.genmodel7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/plugin.xml12
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryConfigurationManagerExtension.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/plugin.xml18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.embedded/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.embedded/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml15
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml34
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/Net4jAppExtension.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerWriteIndication.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteTopicIndication.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java65
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.server/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.properties14
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/schema/appExtensions.exsd49
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/DelegatingCommitContext.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Topic.java135
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TopicManager.java169
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java60
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/messages.properties16
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java49
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITopic.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITopicManager.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AppExtension.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension4.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension5.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalQueryResult.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalTopic.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalTopicManager.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorPool.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.project52
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.jdt.core.prefs434
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.jdt.ui.prefs133
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/LMIntegrationTest.launch252
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/LMVersionEvolutionTest.launch252
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/build.properties21
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/AbstractIntegrationTest.java362
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/AbstractLMTest.java235
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/LMIntegrationTest.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/LMVersionEvolutionTest.java278
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/bundle/OM.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java127
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java156
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockStateCacheTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java81
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingSequenceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java51
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RemoteSessionManagerTest.java89
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java4
-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_324084_Test.java6
-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.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336382_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_369646_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_370105_Test.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439173_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_505654_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_516824_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_517168_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_560957_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_576893_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_579786_Test.java95
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.jdt/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.jdt/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/topic.gifbin0 -> 315 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_remote_topics.gifbin0 -> 564 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/DropConfirmationDialog.java180
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch471
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF39
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml34
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOAdapterFactoryContentProvider.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOContentProvider.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java342
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOLoadResourceAction.java159
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/handlers/LockingHandler.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteTopicsView.java758
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/UserInfo.java539
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLoadResourceProvider.java64
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTopicProvider.java134
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF52
-rw-r--r--plugins/org.eclipse.emf.cdo/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo/plugin.xml16
-rw-r--r--plugins/org.eclipse.emf.cdo/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java73
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java83
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionRegistry.java72
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionRequest.java422
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteTopic.java81
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteTopicEvent.java53
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java16
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLockImpl.java224
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionRegistryImpl.java109
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java29
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java259
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteTopicImpl.java258
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/AbstractLocksChangedEvent.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/AbstractRegistry.java136
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java95
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java15
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.java54
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDORemoteTopic.java35
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/plugin.xml17
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/build.properties5
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.db2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.db2/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.derby/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.db.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.db.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.h2/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.net4j.db/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.debug/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.doc/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.doc/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml17
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties5
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.examples/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.examples/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.sdk/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.sdk/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.sdk/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.tcp/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java14
-rw-r--r--plugins/org.eclipse.net4j.tests/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.net4j.tests/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/RWOLockManagerTest.java2
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jarbin5035 -> 5032 bytes
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.trace/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.trace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.net4j.trace/plugin.xml9
-rw-r--r--plugins/org.eclipse.net4j.trace/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/expand_all.gifbin0 -> 165 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/link_with_editor.gifbin0 -> 158 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/messages/Messages.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java)6
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/messages/messages.properties26
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/CollapseAllAction.java50
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/ExpandAllAction.java50
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/LinkWithEditorAction.java37
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/RefreshAction.java49
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java12
-rw-r--r--plugins/org.eclipse.net4j.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.ui/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.util.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.util.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF34
-rw-r--r--plugins/org.eclipse.net4j.util.ui/plugin.xml46
-rw-r--r--plugins/org.eclipse.net4j.util.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/GlobalPartAdapter.java137
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/SafeTreeViewer.java90
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java28
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java70
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java5
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/DoubleClickButtonAdapter.java47
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java37
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs95
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs12
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF66
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.properties7
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.xml28
-rw-r--r--plugins/org.eclipse.net4j.util/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util/schema/factories.exsd8
-rw-r--r--plugins/org.eclipse.net4j.util/schema/productGroups.exsd135
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java38
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java74
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AccessUtil.java169
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/PluginUtil.java129
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java11
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java160
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ThreadPool.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ListContainer.java96
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ModifiableContainer.java282
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/PersistableContainer.java104
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java323
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/LimitedInputStream.java58
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/RemoteException.java57
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java44
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java25
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java7
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java7
-rw-r--r--plugins/org.eclipse.net4j.ws/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ws/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.net4j/plugin.xml12
-rw-r--r--plugins/org.eclipse.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java7
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java25
-rw-r--r--plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.business/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.business/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.inventory/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.server.web/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.jdt.ui.prefs2
1164 files changed, 71883 insertions, 2821 deletions
diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
index 31269a7b24..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:59:04 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
index 2605b19243..a8ae660a7d 100644
--- a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
index 63a1f4de1a..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 13:00:51 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
index 2605b19243..a8ae660a7d 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
index 71eea1fea5..6a102301d6 100644
--- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.common;singleton:=true
-Bundle-Version: 4.15.0.qualifier
+Bundle-Version: 4.18.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,21 +15,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
- org.eclipse.emf.cdo.common.admin;version="4.15.0",
- org.eclipse.emf.cdo.common.branch;version="4.15.0",
- org.eclipse.emf.cdo.common.commit;version="4.15.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.15.0",
- org.eclipse.emf.cdo.common.id;version="4.15.0",
- org.eclipse.emf.cdo.common.lob;version="4.15.0",
- org.eclipse.emf.cdo.common.lock;version="4.15.0",
- org.eclipse.emf.cdo.common.model;version="4.15.0",
- org.eclipse.emf.cdo.common.protocol;version="4.15.0",
- org.eclipse.emf.cdo.common.revision;version="4.15.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.15.0",
- org.eclipse.emf.cdo.common.security;version="4.15.0",
- org.eclipse.emf.cdo.common.util;version="4.15.0",
- org.eclipse.emf.cdo.internal.common;version="4.15.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.18.0",
+ org.eclipse.emf.cdo.common.admin;version="4.18.0",
+ org.eclipse.emf.cdo.common.branch;version="4.18.0",
+ org.eclipse.emf.cdo.common.commit;version="4.18.0",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.18.0",
+ org.eclipse.emf.cdo.common.id;version="4.18.0",
+ org.eclipse.emf.cdo.common.lob;version="4.18.0",
+ org.eclipse.emf.cdo.common.lock;version="4.18.0",
+ org.eclipse.emf.cdo.common.model;version="4.18.0",
+ org.eclipse.emf.cdo.common.protocol;version="4.18.0",
+ org.eclipse.emf.cdo.common.revision;version="4.18.0",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.18.0",
+ org.eclipse.emf.cdo.common.security;version="4.18.0",
+ org.eclipse.emf.cdo.common.util;version="4.18.0",
+ org.eclipse.emf.cdo.internal.common;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -38,9 +38,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.branch;version="4.15.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.18.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -49,7 +49,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.id;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -60,9 +60,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.admin,
org.eclipse.emf.cdo.server.admin",
- org.eclipse.emf.cdo.internal.common.lock;version="4.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -71,7 +71,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -80,7 +80,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -89,7 +89,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.util;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.util;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -98,15 +98,15 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.spi.common;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.util;version="4.15.0"
+ org.eclipse.emf.cdo.spi.common;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.id;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.model;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.util;version="4.18.0"
Automatic-Module-Name: org.eclipse.emf.cdo.common
Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/plugin.xml b/plugins/org.eclipse.emf.cdo.common/plugin.xml
index 5eb70e7e4d..b331ff7431 100644
--- a/plugins/org.eclipse.emf.cdo.common/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.common/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2018, 2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2018, 2021, 2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -13,7 +13,12 @@
<plugin>
- <extension point="org.eclipse.core.expressions.propertyTesters">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.common.util.uriHandlers" name="URI Handlers"/>
+ <productGroup id="org.eclipse.emf.cdo.common.ResourceSetConfigurers" name="Resource Set Configurers"/>
+ </extension>
+
+ <extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
id="org.eclipse.emf.cdo.repository.properties"
type="org.eclipse.emf.cdo.common.CDOCommonRepository"
@@ -26,6 +31,6 @@
namespace="org.eclipse.emf.cdo.branch"
properties="id,name,pathName,baseBranchID,baseBranchID,baseTimeStamp,deleted,local,main,proxy"
class="org.eclipse.emf.cdo.internal.common.branch.BranchProperties$Tester"/>
- </extension>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index 707fa57dac..28c77f3869 100644
--- a/plugins/org.eclipse.emf.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.common/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.common</artifactId>
- <version>4.15.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index 001a1105ed..ea7e5f3f92 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2016, 2019-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,7 +101,7 @@ public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<C
/**
* @since 4.4
*/
- public void setName(String name);
+ public void setName(String name) throws CDODuplicateBranchException;
/**
* Returns the fully qualified path name of this branch, a concatenation of the names of all branches from the
@@ -190,13 +190,13 @@ public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<C
* special time stamp <i> {@link CDOBranchPoint#UNSPECIFIED_DATE unspecified}</i>
* @see #createBranch(String)
*/
- public CDOBranch createBranch(String name, long timeStamp);
+ public CDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException;
/**
* Creates a sub branch of this branch with the given name, {@link #getBase() based} at the {@link CDOTimeProvider
* current time}.
*/
- public CDOBranch createBranch(String name);
+ public CDOBranch createBranch(String name) throws CDODuplicateBranchException;
/**
* Deletes this branch and all its sub branches.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java
new file mode 100644
index 0000000000..7fcb9779f6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * 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 org.eclipse.emf.cdo.common.branch;
+
+/**
+ * @author Eike Stepper
+ * @since 4.16
+ */
+public class CDODuplicateBranchException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ public CDODuplicateBranchException(CDOBranch branch)
+ {
+ super("The branch " + branch.getPathName() + " already exists");
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
index ace54e4779..f3bbb68cc3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011-2013, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011-2013, 2019, 2020, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.model;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOClassInfo;
import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -73,6 +74,11 @@ public interface CDOClassInfo extends Adapter
public EStructuralFeature[] getAllPersistentMapFeatures();
/**
+ * @since 4.16
+ */
+ public EAttribute[] getAllPersistentLobAttributes();
+
+ /**
* @deprecated As of 4.2 pushed down to {@link InternalCDOClassInfo#getPersistentFeatureIndex(EStructuralFeature)}.
*/
@Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
index 24d037bc09..786e451db7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2017, 2021 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
index a18b36ffb3..63dbeb5329 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016, 2017, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2017, 2020, 2021 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
index 22b7cafe5c..ffcff1f169 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2018, 2020, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2018, 2020-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -338,6 +338,11 @@ public interface CDOProtocolConstants
*/
public static final short SIGNAL_AUTHORIZE_OPERATIONS = 68;
+ /**
+ * @since 4.17
+ */
+ public static final short SIGNAL_REMOTE_TOPIC = 69;
+
// //////////////////////////////////////////////////////////////////////
// Session Refresh
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
index 63bd4b1d6e..4fe8b0a298 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2021, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,8 +19,9 @@ class CDOProtocolVersion
static
{
- VALUE = 45; // SIGNAL_AUTHORIZE_OPERATIONS
+ VALUE = 46; // SIGNAL_REMOTE_TOPIC
+ // VALUE = 45; // SIGNAL_AUTHORIZE_OPERATIONS
// VALUE = 44; // SIGNAL_VIEW_CLOSED_NOTIFICATION
// VALUE = 43; // SIGNAL_DELETE_BRANCH
// VALUE = 42; // CDOPrefetcherManager, see bug 576893
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index 7a046d81e6..22bde8f587 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2016, 2018-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2016, 2018-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -796,7 +796,7 @@ public final class CDORevisionUtil
out.println("<tr>");
out.println("<td>");
- out.println("<h4>" + branch.getName() + "[" + branch.getID() + "]</h4>");
+ out.println("<h4>" + branch.getName() + " [" + branch.getID() + "]</h4>");
out.println("</td>");
out.println("<td>");
out.println("<h4>" + CDOCommonUtil.formatTimeStamp(branch.getBase().getTimeStamp()) + " / "
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
index 218fadf69c..8f1bf95805 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,13 +31,19 @@ public interface CDOQueryInfo
public static final int UNLIMITED_RESULTS = -1;
/**
- * The name of a {@link Boolean} typed {@link #getParameters() parameter} to influence automatic response flushing (the default) after each query result.
+ * The name of a {@link Boolean}-typed {@link #getParameters() parameter} to influence automatic response flushing (the default) after each query result.
*
* @since 4.2
*/
public static final String PARAM_DISABLE_RESPONSE_FLUSHING = "disable.response.flushing";
/**
+ * The name of a {@link Boolean}-typed {@link #getParameters() parameter} that can suppress timeouts during slow query execution on the server.
+ * @since 4.18
+ */
+ public static final String PARAM_DISABLE_RESPONSE_TIMEOUT = "disable.response.timeout";
+
+ /**
* Returns the language identifier of this query, never <code>null</code>.
*/
public String getQueryLanguage();
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 ca4e0ab48c..4fa2c9ba7c 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2016, 2019, 2021, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchChangedEvent.ChangeKind;
import org.eclipse.emf.cdo.common.branch.CDOBranchCreationContext;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader;
@@ -28,6 +29,7 @@ import org.eclipse.net4j.util.AdapterUtil;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.container.Container;
import org.eclipse.net4j.util.event.Event;
+import org.eclipse.net4j.util.io.RemoteException;
import org.eclipse.net4j.util.om.monitor.Monitor;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
@@ -126,10 +128,12 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
}
@Override
- public void setName(String name)
+ public void setName(String name) throws CDODuplicateBranchException
{
checkActive();
+ CDOBranchManagerImpl.checkBranchName(name);
+
BranchLoader branchLoader = branchManager.getBranchLoader();
if (!(branchLoader instanceof BranchLoader3))
{
@@ -139,7 +143,15 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
String oldName = getName();
if (!ObjectUtil.equals(name, oldName))
{
- ((BranchLoader3)branchLoader).renameBranch(id, oldName, name);
+ try
+ {
+ ((BranchLoader3)branchLoader).renameBranch(id, oldName, name);
+ }
+ catch (RemoteException ex)
+ {
+ throw ex.unwrap();
+ }
+
basicSetName(name);
}
}
@@ -245,18 +257,13 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
}
@Override
- public InternalCDOBranch createBranch(String name, long timeStamp)
+ public InternalCDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException
{
- if (!branchManager.getRepository().isSupportingBranches())
- {
- throw new IllegalStateException("Branching is not supported");
- }
-
return branchManager.createBranch(BranchLoader.NEW_BRANCH, name, this, timeStamp);
}
@Override
- public InternalCDOBranch createBranch(String name)
+ public InternalCDOBranch createBranch(String name) throws CDODuplicateBranchException
{
return createBranch(name, CDOBranchPoint.UNSPECIFIED_DATE);
}
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 626d446aee..e4be9149bd 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag.TagEvent;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag.TagMovedEvent;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.common.util.CDOException;
import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
import org.eclipse.emf.cdo.internal.common.bundle.OM;
@@ -30,12 +31,14 @@ import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.BranchInfo;
+import org.eclipse.net4j.util.StringUtil;
import org.eclipse.net4j.util.collection.Pair;
import org.eclipse.net4j.util.container.Container;
import org.eclipse.net4j.util.container.ContainerEvent;
import org.eclipse.net4j.util.container.IContainerDelta;
import org.eclipse.net4j.util.event.Event;
import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.io.RemoteException;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
import org.eclipse.net4j.util.ref.ReferenceValueMap;
@@ -344,11 +347,27 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
}
@Override
- public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp)
+ public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp) throws CDODuplicateBranchException
{
checkActive();
- Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+ if (!repository.isSupportingBranches())
+ {
+ throw new IllegalStateException("Branching is not supported");
+ }
+
+ checkBranchName(name);
+
+ Pair<Integer, Long> result;
+ try
+ {
+ result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+ }
+ catch (RemoteException ex)
+ {
+ throw ex.unwrap();
+ }
+
int actualBranchID = result.getElement1();
long actualBaseTimeStamp = result.getElement2();
@@ -767,6 +786,19 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
checkState(branchLoader, "branchLoader"); //$NON-NLS-1$
}
+ public static void checkBranchName(String name) throws IllegalArgumentException
+ {
+ if (StringUtil.isEmpty(name))
+ {
+ throw new IllegalArgumentException("Branch name is empty");
+ }
+
+ if (name.indexOf('/') != -1)
+ {
+ throw new IllegalArgumentException("Branch name contains '/'");
+ }
+ }
+
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
index 9d76250189..77d68b97b7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2017, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2017, 2019, 2020, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -115,7 +115,7 @@ public final class CDOIDObjectLongImpl extends AbstractCDOID implements Internal
@Override
protected int doCompareTo(CDOID o) throws ClassCastException
{
- return Long.valueOf(value).compareTo(((CDOIDObjectLongImpl)o).value);
+ return Long.compare(value, ((CDOIDObjectLongImpl)o).value);
}
private Object readResolve() throws ObjectStreamException
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
index 6a036ce475..1b3384ed85 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -115,28 +115,15 @@ public final class CDOIDObjectUUIDImpl extends AbstractCDOID implements Internal
{
byte thisByte = value[i];
byte thatByte = thatValue[i];
- if (thisByte < thatByte)
- {
- return -1;
- }
- if (thisByte > thatByte)
+ int result = Byte.compare(thisByte, thatByte);
+ if (result != 0)
{
- return 1;
+ return result;
}
}
- if (value.length < thatValue.length)
- {
- return -1;
- }
-
- if (value.length > thatValue.length)
- {
- return 1;
- }
-
- return 0;
+ return Integer.compare(value.length, thatValue.length);
}
private Object readResolve() throws ObjectStreamException
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
index 1c6b0af494..46b410d8a7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013, 2017, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2017, 2019, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -105,18 +105,7 @@ public final class CDOIDTempObjectImpl extends AbstractCDOID implements CDOIDTem
@Override
protected int doCompareTo(CDOID o) throws ClassCastException
{
- CDOIDTempObjectImpl that = (CDOIDTempObjectImpl)o;
- if (value < that.value)
- {
- return -1;
- }
-
- if (value > that.value)
- {
- return 1;
- }
-
- return 0;
+ return Integer.compare(value, ((CDOIDTempObjectImpl)o).value);
}
private static int getHashCode(int value)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
index baf8afda82..c245d71fbb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index 8af925d42a..e523ffbfa6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011-2013, 2016, 2018-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011-2013, 2016, 2018-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -73,6 +74,8 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
private EStructuralFeature[] allPersistentMapFeatures;
+ private EAttribute[] allPersistentLobAttributes;
+
private int[] persistentFeatureIndices;
private int settingsFeatureCount;
@@ -213,6 +216,12 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
}
@Override
+ public EAttribute[] getAllPersistentLobAttributes()
+ {
+ return allPersistentLobAttributes;
+ }
+
+ @Override
public int getPersistentFeatureIndex(EStructuralFeature feature) throws IllegalArgumentException
{
int featureID = eClass.getFeatureID(feature);
@@ -305,6 +314,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
List<EReference> persistentReferences = new ArrayList<>();
List<EStructuralFeature> persistentContainments = new ArrayList<>();
List<EStructuralFeature> persistentMapFeatures = new ArrayList<>();
+ List<EAttribute> persistentLobAttributes = new ArrayList<>();
// Used for tests for containment
EStructuralFeature[] containments = ((EClassImpl.FeatureSubsetSupplier)eClass.getEAllStructuralFeatures()).containments();
@@ -338,6 +348,10 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
persistentOppositeBits.set(featureID);
}
}
+ else if (CDOModelUtil.isLob(feature.getEType()))
+ {
+ persistentLobAttributes.add((EAttribute)feature);
+ }
if (isMap(feature))
{
@@ -382,6 +396,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
allPersistentReferences = persistentReferences.toArray(new EReference[persistentReferences.size()]);
allPersistentContainments = persistentContainments.toArray(new EStructuralFeature[persistentContainments.size()]);
allPersistentMapFeatures = persistentMapFeatures.toArray(new EStructuralFeature[persistentMapFeatures.size()]);
+ allPersistentLobAttributes = persistentLobAttributes.toArray(new EAttribute[persistentLobAttributes.size()]);
persistentFeatureIndices = new int[allFeatures.size()];
Arrays.fill(persistentFeatureIndices, NO_SLOT);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
index 6a77bcaf00..e7daa3910b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2019, 2021, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.spi.common.branch;
import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.BranchInfo;
/**
@@ -40,10 +41,10 @@ public interface InternalCDOBranch extends CDOBranch
public InternalCDOBranch getBranch(String path);
@Override
- public InternalCDOBranch createBranch(String name, long timeStamp);
+ public InternalCDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException;
@Override
- public InternalCDOBranch createBranch(String name);
+ public InternalCDOBranch createBranch(String name) throws CDODuplicateBranchException;
public BranchInfo getBranchInfo();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
index 8974b985b8..752ea66254 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2017, 2019-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchHandler;
import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.common.protocol.CDODataInput;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
@@ -75,7 +76,7 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle
@Override
public InternalCDOBranch getBranch(String path);
- public InternalCDOBranch createBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp);
+ public InternalCDOBranch createBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp) throws CDODuplicateBranchException;
/**
* @since 4.15
@@ -358,7 +359,7 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle
*/
public interface BranchLoader3 extends BranchLoader2
{
- public void renameBranch(int branchID, String oldName, String newName);
+ public void renameBranch(int branchID, String oldName, String newName) throws CDODuplicateBranchException;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
index d269ee6e13..b9ad8bad65 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2018, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2018, 2019, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.spi.common.id;
import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
import org.eclipse.net4j.util.io.ExtendedDataInput;
@@ -103,6 +104,12 @@ public abstract class AbstractCDOID implements CDOID
@Override
public final int compareTo(CDOID o)
{
+ if (CDOIDUtil.isNull(o))
+ {
+ // All non-null IDs are greater than the null ID.
+ return 1;
+ }
+
try
{
return doCompareTo(o);
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
index 31269a7b24..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:59:04 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
index 2605b19243..a8ae660a7d 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
index 797f64bf34..8d1007fb35 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.compare;singleton:=true
-Bundle-Version: 4.5.1.qualifier
+Bundle-Version: 4.6.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.compare.rcp;bundle-version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy
-Export-Package: org.eclipse.emf.cdo.compare;version="4.5.1",
- org.eclipse.emf.cdo.internal.compare.bundle;version="4.5.1";x-friends:="org.eclipse.emf.cdo.tests"
+Export-Package: org.eclipse.emf.cdo.compare;version="4.6.1",
+ org.eclipse.emf.cdo.internal.compare.bundle;version="4.6.1";x-friends:="org.eclipse.emf.cdo.tests"
Bundle-ActivationPolicy: lazy
Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
com.google.common.collect;version="[27.0.0,30.2.0)",
diff --git a/plugins/org.eclipse.emf.cdo.compare/plugin.xml b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
index 0495b2fa77..477a8c90a3 100644
--- a/plugins/org.eclipse.emf.cdo.compare/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2021, 2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -19,4 +19,21 @@
uri="http://www.eclipse.org/emf/compare"/>
</extension>
+ <extension point="org.eclipse.emf.compare.rcp.matchEngine">
+ <engineFactory
+ class="org.eclipse.emf.cdo.compare.CDOCompare$CDOMatchEngine$Factory"
+ description="A CDO-specific match engine"
+ label="CDO Match Engine"
+ ranking="10"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.compare.rcp.diffEngine">
+ <descriptor
+ id="org.eclipse.emf.compare.rcp.cdo.diffEngine"
+ description="A diff engine that creates and uses CDO-specific feature filters"
+ impl="org.eclipse.emf.cdo.compare.CDOCompare$CDODiffEngine"
+ label="CDO Diff Engine"
+ ranking="200"/>
+ </extension>
+
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.compare/pom.xml b/plugins/org.eclipse.emf.cdo.compare/pom.xml
index 0bbbb77651..267adebe39 100644
--- a/plugins/org.eclipse.emf.cdo.compare/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019-2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.compare</artifactId>
- <version>4.5.1-SNAPSHOT</version>
+ <version>4.6.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 552f856110..7c18bcf94d 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2013, 2015, 2016, 2019-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -107,6 +107,14 @@ public class CDOCompare
}
}
+ /**
+ * @since 4.6
+ */
+ public boolean useRCPRegistries()
+ {
+ return USE_RCP_REGISTRIES;
+ }
+
public Comparison compare(IComparisonScope scope)
{
Function<EObject, String> idFunction = createIDFunction();
@@ -146,7 +154,7 @@ public class CDOCompare
{
Builder builder = EMFCompare.builder();
- if (USE_RCP_REGISTRIES)
+ if (useRCPRegistries())
{
org.eclipse.emf.compare.rcp.internal.extension.IEMFCompareBuilderConfigurator configurator = //
org.eclipse.emf.compare.rcp.internal.extension.impl.EMFCompareBuilderConfigurator.createDefault();
@@ -202,6 +210,11 @@ public class CDOCompare
protected IMatchEngine.Factory.Registry createMatchEngineFactoryRegistry(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
+ if (useRCPRegistries())
+ {
+ return null;
+ }
+
IMatchEngine.Factory.Registry registry = new MatchEngineFactoryRegistryImpl();
registry.add(new CDOMatchEngine.Factory(matcher, comparisonFactory));
return registry;
@@ -209,6 +222,11 @@ public class CDOCompare
protected IDiffEngine createDiffEngine()
{
+ if (useRCPRegistries())
+ {
+ return null;
+ }
+
return new CDODiffEngine();
}
@@ -460,7 +478,10 @@ public class CDOCompare
*/
public static class CDOMatchEngine extends DefaultMatchEngine
{
- CDOMatchEngine(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
+ /**
+ * @since 4.6
+ */
+ public CDOMatchEngine(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
super(matcher, comparisonFactory);
}
@@ -483,6 +504,21 @@ public class CDOCompare
private int ranking;
+ /**
+ * Default factory configuration used by EMF Compare diff engine factory extension point
+ *
+ * @since 4.6
+ */
+ public Factory()
+ {
+ CDOCompare compare = new CDOCompare();
+ CDOIDFunction idFunction = compare.createIDFunction();
+ IdentifierEObjectMatcher matcher = compare.createMatcher(idFunction);
+ IEqualityHelperFactory equalityHelperFactory = compare.createEqualityHelperFactory();
+ IComparisonFactory comparisonFactory = compare.createComparisonFactory(equalityHelperFactory);
+ matchEngine = createMatchEngine(matcher, comparisonFactory);
+ }
+
public Factory(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
matchEngine = createMatchEngine(matcher, comparisonFactory);
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
index 66379b2e3b..d25c415a7e 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, 2015-2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2013, 2015-2017, 2019-2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,14 +27,18 @@ import org.eclipse.emf.cdo.util.ObjectNotFoundException;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.cdo.view.CDOViewOpener;
+import org.eclipse.net4j.util.om.OMPlatform;
+
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.AbstractTreeIterator;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.scope.AbstractComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.EcoreUtil.ProperContentIterator;
@@ -60,6 +64,8 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
{
private static final CDOViewOpener DEFAULT_VIEW_OPENER = CDOCompareUtil.DEFAULT_VIEW_OPENER;
+ private static final boolean COLLECT_RESOURCE_URIS = OMPlatform.INSTANCE.isProperty("org.eclipse.emf.cdo.compare.CDOComparisonScope.COLLECT_RESOURCE_URIS");
+
private boolean resolveProxies = true;
public CDOComparisonScope(Notifier left, Notifier right, Notifier origin)
@@ -317,6 +323,18 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
CDOObject object = view.getObject(id);
if (object != null)
{
+ if (collectResourceURIs() && object instanceof Resource)
+ {
+ URI resourceURI = ((Resource)object).getURI();
+ if (resourceURI != null)
+ {
+ Set<String> resourceURIs = getResourceURIs();
+
+ URIConverter uriConverter = view.getResourceSet().getURIConverter();
+ resourceURIs.add(uriConverter.normalize(resourceURI).toString());
+ }
+ }
+
collectRequiredParentIDs(object, requiredParentIDs);
}
}
@@ -326,6 +344,14 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
}
}
+ /**
+ * @since 4.6
+ */
+ protected boolean collectResourceURIs()
+ {
+ return COLLECT_RESOURCE_URIS;
+ }
+
public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView)
{
return create(leftView, rightView, originView, DEFAULT_VIEW_OPENER);
@@ -444,7 +470,7 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
//$FALL-THROUGH$
}
}
-
+
return null;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
index a3454c7516..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:56 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
index 8a2c539fa0..fbcd9791d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
index 0288f7493e..1fa96c18f5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
index c993e80543..e9ed36ce21 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
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 7eb8611dc7..21f97e8b92 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.3.0.qualifier
+Bundle-Version: 2.3.1.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,16 +23,16 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.resources;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.util;version="2.3.0",
+Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.resources;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.util;version="2.3.1",
org.eclipse.emf.cdo.dawn.transaction;version="2.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.emf.cdo.dawn.gmf
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml b/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
index 7179e7a7ad..a3d26dbad9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019, 2020, 2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.dawn.gmf</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
index 6bd53f51f3..1a9f4fd3a5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2015, 2019, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -205,11 +205,15 @@ public class DawnGMFEditorSupport extends DawnAbstractEditorSupport
@Override
public void handleRemoteLockChanges(Map<Object, DawnState> changedObjects)
{
- for (Object o : changedObjects.keySet())
+ if (!changedObjects.isEmpty())
{
- handleLock((CDOObject)o, getView());
+ for (Object o : changedObjects.keySet())
+ {
+ handleLock((CDOObject)o, getView());
+ }
+
+ refresh();
}
- refresh();
}
private void handleLock(CDOObject object, CDOView cdoView)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
index a3454c7516..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:56 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
index 8a2c539fa0..fbcd9791d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
index 989987b650..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 13:05:14 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
index 8a2c539fa0..fbcd9791d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
index d55dc78437..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:22 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
index 8a2c539fa0..fbcd9791d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
index 41ff1c938f..196dec5527 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
@@ -2,19 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.util;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.util.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)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="2.2.0",
- org.eclipse.emf.cdo.dawn.util.connection;version="2.2.0",
- org.eclipse.emf.cdo.dawn.util.exceptions;version="2.2.0"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.util.connection;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.util.exceptions;version="2.2.1"
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.emf.cdo.dawn.util
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/pom.xml b/plugins/org.eclipse.emf.cdo.dawn.util/pom.xml
index 1a25eaf7d5..e01013f4fc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019, 2020, 2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.dawn.util</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs
index a3454c7516..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:56 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
index 8a2c539fa0..fbcd9791d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Martin Fluegge - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Martin Fluegge\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
index c8bc006d9b..b424f3abfa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.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;singleton:=true
-Bundle-Version: 2.3.1.qualifier
+Bundle-Version: 2.3.3.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.emf.cdo.dawn;version="2.3.1",
- org.eclipse.emf.cdo.dawn.actions;version="2.3.1";x-internal:=true,
- org.eclipse.emf.cdo.dawn.appearance;version="2.3.1",
- org.eclipse.emf.cdo.dawn.commands;version="2.3.1",
- org.eclipse.emf.cdo.dawn.conflicts;version="2.3.1",
- org.eclipse.emf.cdo.dawn.editors;version="2.3.1",
- org.eclipse.emf.cdo.dawn.editors.impl;version="2.3.1",
- org.eclipse.emf.cdo.dawn.helper;version="2.3.1",
- org.eclipse.emf.cdo.dawn.notifications;version="2.3.1",
- org.eclipse.emf.cdo.dawn.preferences;version="2.3.1",
- org.eclipse.emf.cdo.dawn.resources;version="2.3.1",
- org.eclipse.emf.cdo.dawn.resources.impl;version="2.3.1",
- org.eclipse.emf.cdo.dawn.spi;version="2.3.1",
- org.eclipse.emf.cdo.dawn.transaction;version="2.3.1",
- org.eclipse.emf.cdo.internal.dawn.bundle;version="2.3.1"
+Export-Package: org.eclipse.emf.cdo.dawn;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.actions;version="2.3.3";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.appearance;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.commands;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.conflicts;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.editors;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.editors.impl;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.helper;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.notifications;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.preferences;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.resources;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.resources.impl;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.spi;version="2.3.3",
+ org.eclipse.emf.cdo.dawn.transaction;version="2.3.3",
+ org.eclipse.emf.cdo.internal.dawn.bundle;version="2.3.3"
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.emf.cdo.dawn
diff --git a/plugins/org.eclipse.emf.cdo.dawn/about.properties b/plugins/org.eclipse.emf.cdo.dawn/about.properties
index 89e5bb6deb..ea583cf407 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/about.properties
+++ b/plugins/org.eclipse.emf.cdo.dawn/about.properties
@@ -21,7 +21,7 @@ featureText = CDO Model Repository Dawn\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2022 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.dawn/pom.xml b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
index e8ea741eb0..e940af7c49 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.dawn</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
index daff4cfe9b..79e82e2140 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2019, 2021, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,7 +56,10 @@ public class BasicDawnLockingHandler extends BasicDawnListener
}
}
- IDawnEditorSupport dawnEditorSupport = editor.getDawnEditorSupport();
- dawnEditorSupport.handleRemoteLockChanges(changedObjects);
+ if (!changedObjects.isEmpty())
+ {
+ IDawnEditorSupport dawnEditorSupport = editor.getDawnEditorSupport();
+ dawnEditorSupport.handleRemoteLockChanges(changedObjects);
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
index ee30b77697..ef0e0f02bd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2015, 2022 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,13 +64,13 @@ public class DawnWrapperResourceImpl extends CDOResourceImpl implements DawnWrap
}
@Override
- public Map<Object, Object> getDefaultLoadOptions()
+ public synchronized Map<Object, Object> getDefaultLoadOptions()
{
throw new UnsupportedOperationException();
}
@Override
- public Map<Object, Object> getDefaultSaveOptions()
+ public synchronized Map<Object, Object> getDefaultSaveOptions()
{
throw new UnsupportedOperationException();
}
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs
index 0288f7493e..1fa96c18f5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
-
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
index 2de092afba..35bb508a84 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
@@ -48,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
index c993e80543..e9ed36ce21 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
index 1e8e3a6783..0afcd93025 100644
--- a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.doc; singleton:=true
-Bundle-Version: 4.2.5.qualifier
+Bundle-Version: 4.2.6.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -23,14 +23,14 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
org.eclipse.emf.cdo.server.ocl;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.emf.cdo.explorer;bundle-version="[4.0.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.doc;version="4.2.5",
- org.eclipse.emf.cdo.doc.online;version="4.2.5",
- org.eclipse.emf.cdo.doc.operators;version="4.2.5",
- org.eclipse.emf.cdo.doc.programmers;version="4.2.5",
- org.eclipse.emf.cdo.doc.programmers.client;version="4.2.5",
- org.eclipse.emf.cdo.doc.programmers.server;version="4.2.5",
- org.eclipse.emf.cdo.doc.reference;version="4.2.5",
- org.eclipse.emf.cdo.doc.reference.api;version="4.2.5",
- org.eclipse.emf.cdo.doc.reference.schema;version="4.2.5",
- org.eclipse.emf.cdo.doc.users;version="4.2.5"
+Export-Package: org.eclipse.emf.cdo.doc;version="4.2.6",
+ org.eclipse.emf.cdo.doc.online;version="4.2.6",
+ org.eclipse.emf.cdo.doc.operators;version="4.2.6",
+ org.eclipse.emf.cdo.doc.programmers;version="4.2.6",
+ org.eclipse.emf.cdo.doc.programmers.client;version="4.2.6",
+ org.eclipse.emf.cdo.doc.programmers.server;version="4.2.6",
+ org.eclipse.emf.cdo.doc.reference;version="4.2.6",
+ org.eclipse.emf.cdo.doc.reference.api;version="4.2.6",
+ org.eclipse.emf.cdo.doc.reference.schema;version="4.2.6",
+ org.eclipse.emf.cdo.doc.users;version="4.2.6"
Automatic-Module-Name: org.eclipse.emf.cdo.doc
diff --git a/plugins/org.eclipse.emf.cdo.doc/about.properties b/plugins/org.eclipse.emf.cdo.doc/about.properties
index 455145bb8a..5c3f4002bc 100644
--- a/plugins/org.eclipse.emf.cdo.doc/about.properties
+++ b/plugins/org.eclipse.emf.cdo.doc/about.properties
@@ -21,7 +21,7 @@ featureText = CDO Model Repository Documentation\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2022 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.doc/pom.xml b/plugins/org.eclipse.emf.cdo.doc/pom.xml
index 992965d5a9..b3edf31555 100644
--- a/plugins/org.eclipse.emf.cdo.doc/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.doc</artifactId>
- <version>4.2.5-SNAPSHOT</version>
+ <version>4.2.6-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.classpath b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.classpath
new file mode 100644
index 0000000000..e801ebfb46
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.project b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.project
new file mode 100644
index 0000000000..f2dd743589
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.project
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.ecore.dependencies</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1396938000000</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..c7a37d5e96
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/.project=UTF-8
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b05bc4978b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,435 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+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.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+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.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.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+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.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+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.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+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.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=160
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..556ed07a3c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,3 @@
+#Fri Sep 02 05:38:34 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..e9ed36ce21
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,133 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=true
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.push_down_negation=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_modifiers=false
+cleanup.remove_redundant_semicolons=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_array_creation=true
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_autoboxing=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_unboxing=false
+cleanup_profile=_CDO
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_EMFT
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_unnecessary_array_creation=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..b050639a54
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..97c11e6725
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.team.ui.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
+eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..0c17d59e45
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,95 @@
+#Thu Feb 04 09:44:24 CET 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+MISSING_EE_DESCRIPTIONS=Warning
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..2f779824ea
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,35 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=2
+compilers.p.discouraged-class=1
+compilers.p.exec-env-too-low=2
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
+compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ecore.dependencies/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..7a662f5ebb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.cdo.ecore.dependencies;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Export-Package: org.eclipse.emf.cdo.ecore.dependencies;version="1.0.1";x-internal:=true,
+ org.eclipse.emf.cdo.ecore.dependencies.bundle;version="1.0.1";x-internal:=true,
+ org.eclipse.emf.cdo.ecore.dependencies.impl;version="1.0.1";x-internal:=true,
+ org.eclipse.emf.cdo.ecore.dependencies.provider;version="1.0.1";x-internal:=true,
+ org.eclipse.emf.cdo.ecore.dependencies.ui;version="1.0.1";x-internal:=true,
+ org.eclipse.emf.cdo.ecore.dependencies.util;version="1.0.1";x-internal:=true
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.search;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.cdo.ecore.dependencies
+Bundle-Activator: org.eclipse.emf.cdo.ecore.dependencies.bundle.DependenciesPlugin$Implementation
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.html b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.ini b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.ini
index 32006ae5d6..32006ae5d6 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/about.ini
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.ini
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.mappings b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.mappings
index 28e3764743..28e3764743 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/about.mappings
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.mappings
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.properties b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.properties
index 0e634541b0..74f84fc1fe 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/about.properties
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/about.properties
@@ -1,12 +1,12 @@
-# Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others.
+# Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
# All rights reserved. This program and the accompanying materials
# 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
-
+
# NLS_MESSAGEFORMAT_VAR
# ==============================================================================
@@ -16,12 +16,12 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Model Repository Explorer
-featureText = CDO Model Repository Explorer\n\
+featureName = CDO Model Repository Migrator Tool
+featureText = CDO Model Repository Migrator Tool\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2022 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/build.properties b/plugins/org.eclipse.emf.cdo.ecore.dependencies/build.properties
new file mode 100644
index 0000000000..62053bb873
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/build.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# 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
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = .,\
+ model/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ about.html,\
+ icons/,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ modeling32.png
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+src.includes = about.html,\
+ pom.xml
+
+doc.project = org.eclipse.emf.cdo.doc
+
+generateSourceReferences = true
+
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/BrokenLink.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/BrokenLink.gif
new file mode 100644
index 0000000000..76f9a30d44
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/BrokenLink.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callees.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callees.gif
new file mode 100644
index 0000000000..cf2aaa5cd8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callees.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callers.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callers.gif
new file mode 100644
index 0000000000..5389e56952
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callers.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Copy.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Copy.gif
new file mode 100644
index 0000000000..6d0dd17d73
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Copy.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Element.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Element.gif
new file mode 100644
index 0000000000..d8f32d8f29
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Element.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Flat.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Flat.gif
new file mode 100644
index 0000000000..1ef74cf98f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Flat.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Generics.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Generics.gif
new file mode 100644
index 0000000000..45c1db4c08
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Generics.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Horizontal.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Horizontal.gif
new file mode 100644
index 0000000000..86bfc482dd
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Horizontal.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Link.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Link.gif
new file mode 100644
index 0000000000..df32a68482
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Link.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Model.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Model.gif
new file mode 100644
index 0000000000..cf48d76a0b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Model.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/ModelContainer.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/ModelContainer.gif
new file mode 100644
index 0000000000..0b60dcc395
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/ModelContainer.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Refresh.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Refresh.gif
new file mode 100644
index 0000000000..e3831471a6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Refresh.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Search.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Search.gif
new file mode 100644
index 0000000000..304c01d096
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Search.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/SortByDependencies.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/SortByDependencies.gif
new file mode 100644
index 0000000000..cde1a078c7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/SortByDependencies.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Uri.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Uri.gif
new file mode 100644
index 0000000000..f4bb551365
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Uri.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Vertical.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Vertical.gif
new file mode 100644
index 0000000000..493c2fbd5f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Vertical.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Xml.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Xml.gif
new file mode 100644
index 0000000000..e67ded674f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Xml.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/ovr16/Error.gif b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/ovr16/Error.gif
new file mode 100644
index 0000000000..7291a534d5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/ovr16/Error.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.ecore b/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.ecore
new file mode 100644
index 0000000000..172e61041b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.ecore
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="dependencies" nsURI="http://www.eclipse.org/emf/CDO/dependencies/1.0.0"
+ nsPrefix="dependencies">
+ <eClassifiers xsi:type="ecore:EClass" name="Addressable" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" lowerBound="1" eType="#//URI"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ModelContainer">
+ <eOperations name="getModel" eType="#//Model">
+ <eParameters name="uri" lowerBound="1" eType="#//URI"/>
+ </eOperations>
+ <eOperations name="getElement" eType="#//Element">
+ <eParameters name="uri" lowerBound="1" eType="#//URI"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="models" upperBound="-1"
+ eType="#//Model" containment="true" eOpposite="#//Model/container"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Addressable">
+ <eOperations name="dependsUpon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eParameters name="target" lowerBound="1" eType="#//Model"/>
+ </eOperations>
+ <eOperations name="addDependency">
+ <eParameters name="target" lowerBound="1" eType="#//Model"/>
+ </eOperations>
+ <eOperations name="hasBrokenLinks" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="getElement" eType="#//Element">
+ <eParameters name="uri" lowerBound="1" eType="#//URI"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
+ eType="#//ModelContainer" eOpposite="#//ModelContainer/models"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" eType="#//File" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="workspace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="exists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
+ eType="#//Element" containment="true" resolveProxies="false" eOpposite="#//Element/model"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingLinks" upperBound="-1"
+ eType="#//Link" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="incomingLinks" upperBound="-1"
+ eType="#//Link" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="brokenLinks" upperBound="-1"
+ eType="#//Link" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="dependencies" upperBound="-1"
+ eType="#//Model" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="dependingModels" upperBound="-1"
+ eType="#//Model" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="flatDependencies" upperBound="-1"
+ eType="#//Model" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="flatDependingModels" upperBound="-1"
+ eType="#//Model" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Element" eSuperTypes="#//Addressable">
+ <eOperations name="hasBrokenLinks" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="model" eType="#//Model"
+ resolveProxies="false" eOpposite="#//Model/elements"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="exists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingLinks" upperBound="-1"
+ eType="#//Link" containment="true" resolveProxies="false" eOpposite="#//Link/source"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="incomingLinks" upperBound="-1"
+ eType="#//Link" resolveProxies="false" eOpposite="#//Link/target"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="brokenLinks" upperBound="-1"
+ eType="#//Link" changeable="false" volatile="true" transient="true" derived="true"
+ resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//Addressable">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
+ eType="#//Element" resolveProxies="false" eOpposite="#//Element/outgoingLinks"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+ eType="#//Element" resolveProxies="false" eOpposite="#//Element/incomingLinks"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="reference" lowerBound="1"
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="broken" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="File" instanceClassName="org.eclipse.core.resources.IFile"
+ serializable="false"/>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.genmodel b/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.genmodel
new file mode 100644
index 0000000000..103fc256f0
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.genmodel
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.ecore.dependencies/src" creationIcons="false"
+ editDirectory="/org.eclipse.emf.cdo.ecore.dependencies/src" editorDirectory=""
+ modelPluginID="org.eclipse.emf.cdo.ecore.dependencies" modelName="Dependencies"
+ editPluginClass="org.eclipse.emf.cdo.ecore.dependencies.bundle.DependenciesPlugin"
+ updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0"
+ copyrightFields="false" operationReflection="true" styleProviders="true" cleanup="true">
+ <foreignModel>dependencies.ecore</foreignModel>
+ <genPackages prefix="Dependencies" basePackage="org.eclipse.emf.cdo.ecore" disposableProviderFactory="true"
+ ecorePackage="dependencies.ecore#/">
+ <genDataTypes ecoreDataType="dependencies.ecore#//URI"/>
+ <genDataTypes ecoreDataType="dependencies.ecore#//File"/>
+ <genClasses image="false" ecoreClass="dependencies.ecore#//Addressable">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Addressable/uri"/>
+ </genClasses>
+ <genClasses ecoreClass="dependencies.ecore#//ModelContainer">
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//ModelContainer/models"/>
+ <genOperations ecoreOperation="dependencies.ecore#//ModelContainer/getModel">
+ <genParameters ecoreParameter="dependencies.ecore#//ModelContainer/getModel/uri"/>
+ </genOperations>
+ <genOperations ecoreOperation="dependencies.ecore#//ModelContainer/getElement">
+ <genParameters ecoreParameter="dependencies.ecore#//ModelContainer/getElement/uri"/>
+ </genOperations>
+ </genClasses>
+ <genClasses ecoreClass="dependencies.ecore#//Model">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/container"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Model/file"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Model/workspace"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Model/exists"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Model/nsURI"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Model/name"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/elements"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/outgoingLinks"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/incomingLinks"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/brokenLinks"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/dependencies"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dependencies.ecore#//Model/dependingModels"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/flatDependencies"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Model/flatDependingModels"/>
+ <genOperations ecoreOperation="dependencies.ecore#//Model/dependsUpon">
+ <genParameters ecoreParameter="dependencies.ecore#//Model/dependsUpon/target"/>
+ </genOperations>
+ <genOperations ecoreOperation="dependencies.ecore#//Model/addDependency">
+ <genParameters ecoreParameter="dependencies.ecore#//Model/addDependency/target"/>
+ </genOperations>
+ <genOperations ecoreOperation="dependencies.ecore#//Model/hasBrokenLinks"/>
+ <genOperations ecoreOperation="dependencies.ecore#//Model/getElement">
+ <genParameters ecoreParameter="dependencies.ecore#//Model/getElement/uri"/>
+ </genOperations>
+ </genClasses>
+ <genClasses ecoreClass="dependencies.ecore#//Element">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Element/model"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Element/exists"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Element/outgoingLinks"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dependencies.ecore#//Element/incomingLinks"/>
+ <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Element/brokenLinks"/>
+ <genOperations ecoreOperation="dependencies.ecore#//Element/hasBrokenLinks"/>
+ </genClasses>
+ <genClasses ecoreClass="dependencies.ecore#//Link">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference dependencies.ecore#//Link/source"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dependencies.ecore#//Link/target"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dependencies.ecore#//Link/reference"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute dependencies.ecore#//Link/broken"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/modeling32.png b/plugins/org.eclipse.emf.cdo.ecore.dependencies/modeling32.png
index 6b08de2ada..6b08de2ada 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/modeling32.png
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.properties b/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.properties
new file mode 100644
index 0000000000..c7aa2707d9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.properties
@@ -0,0 +1,58 @@
+# Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# 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
+
+pluginName = CDO Model Repository Ecore Dependencies
+providerName = Eclipse Modeling Project
+
+view.category.name = Eclipse Modeling Framework
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+ _UI_PropertyDescriptor_description = The {0} of the {1}
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+ _UI_Unknown_type = Object
+_UI_Unknown_datatype= Value
+_UI_Unknown_feature = Unspecified
+
+_UI_Addressable_type = Addressable
+_UI_Addressable_uri_feature = URI
+_UI_Element_exists_feature = Exists
+_UI_Element_incomingLinks_feature = Incoming Links
+_UI_Element_model_feature = Model
+_UI_Element_outgoingLinks_feature = Outgoing Links
+_UI_Element_type = Element
+_UI_Link_broken_feature = Broken
+_UI_Link_reference_feature = Reference
+_UI_Link_source_feature = Source
+_UI_Link_target_feature = Target
+_UI_Link_type = Link
+_UI_Model_container_feature = Container
+_UI_Model_dependencies_feature = Dependencies
+_UI_Model_dependingModels_feature = Depending Models
+_UI_Model_elements_feature = Elements
+_UI_Model_exists_feature = Exists
+_UI_Model_file_feature = File
+_UI_Model_flatDependencies_feature = Flat Dependencies
+_UI_Model_flatDependingModels_feature = Flat Depending Models
+_UI_Model_incomingLinks_feature = Incoming Links
+_UI_Model_name_feature = Name
+_UI_Model_nsURI_feature = NS URI
+_UI_Model_outgoingLinks_feature = Outgoing Links
+_UI_Model_type = Model
+_UI_Model_workspace_feature = Workspace
+_UI_ModelContainer_models_feature = Models
+_UI_ModelContainer_type = Model Container
+_UI_Element_brokenLinks_feature = Broken Links
+_UI_Model_brokenLinks_feature = Broken Links
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.xml b/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.xml
new file mode 100644
index 0000000000..8f2a3cfe09
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ 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
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated dependencies -->
+ <package
+ uri="http://www.eclipse.org/emf/CDO/dependencies/1.0.0"
+ class="org.eclipse.emf.cdo.ecore.dependencies.DependenciesPackage"
+ genModel="model/dependencies.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated dependencies -->
+ <factory
+ uri="http://www.eclipse.org/emf/CDO/dependencies/1.0.0"
+ class="org.eclipse.emf.cdo.ecore.dependencies.provider.DependenciesItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource
+ org.eclipse.emf.edit.provider.IItemStyledLabelProvider"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.views">
+ <category
+ id="org.eclipse.emf.views"
+ name="%view.category.name"/>
+ <view
+ id="org.eclipse.emf.cdo.ecore.DependenciesView"
+ name="Ecore Dependencies"
+ icon="icons/full/obj16/Model.gif"
+ class="org.eclipse.emf.cdo.ecore.dependencies.ui.DependenciesView"
+ category="org.eclipse.emf.views"
+ inject="true"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/pom.xml b/plugins/org.eclipse.emf.cdo.ecore.dependencies/pom.xml
new file mode 100644
index 0000000000..52c79aa211
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ 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
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.plugins</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/plugins</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo</groupId>
+ <artifactId>org.eclipse.emf.cdo.ecore.dependencies</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Addressable.java b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Addressable.java
new file mode 100644
index 0000000000..f5f7b3d70d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Addressable.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * 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 org.eclipse.emf.cdo.ecore.dependencies;
+
+import org.eclipse.net4j.util.StringUtil;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+
+import java.util.Comparator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Addressable</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.ecore.dependencies.Addressable#getUri <em>Uri</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.cdo.ecore.dependencies.DependenciesPackage#getAddressable()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface Addressable extends EObject
+{
+ public static final Comparator<Addressable> ALPHABETICAL_COMPARATOR = Comparator.comparing(Addressable::getAlphaKey);
+
+ /**
+ * Returns the value of the '<em><b>Uri</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Uri</em>' attribute.
+ * @see #setUri(URI)
+ * @see org.eclipse.emf.cdo.ecore.dependencies.DependenciesPackage#getAddressable_Uri()
+ * @model dataType="org.eclipse.emf.cdo.ecore.dependencies.URI" required="true"
+ * @generated
+ */
+ URI getUri();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.ecore.dependencies.Addressable#getUri <em>Uri</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Uri</em>' attribute.
+ * @see #getUri()
+ * @generated
+ */
+ void setUri(URI value);
+
+ public static String getAlphaKey(Addressable addressable)
+ {
+ URI uri = addressable.getUri();
+ return uri == null ? StringUtil.EMPTY : uri.toString();
+ }
+} // Addressable
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesFactory.java b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesFactory.java
new file mode 100644
index 0000000000..c286f930ee
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * 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 org.eclipse.emf.cdo.ecore.dependencies;
+
+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 org.eclipse.emf.cdo.ecore.dependencies.DependenciesPackage
+ * @generated
+ */
+public interface DependenciesFactory extends EFactory
+{
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ DependenciesFactory eINSTANCE = org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesFactoryImpl.init();
+
+ /**
+ * Returns a new object of class '<em>Model Container</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Model Container</em>'.
+ * @generated
+ */
+ ModelContainer createModelContainer();
+
+ /**
+ * Returns a new object of class '<em>Model</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Model</em>'.
+ * @generated
+ */
+ Model createModel();
+
+ /**
+ * Returns a new object of class '<em>Element</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Element</em>'.
+ * @generated
+ */
+ Element createElement();
+
+ /**
+ * Returns a new object of class '<em>Link</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Link</em>'.
+ * @generated
+ */
+ Link createLink();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the package supported by this factory.
+ * @generated
+ */
+ DependenciesPackage getDependenciesPackage();
+
+} // DependenciesFactory
diff --git a/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesPackage.java b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesPackage.java
new file mode 100644
index 0000000000..d9812acafe
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesPackage.java
@@ -0,0 +1,1314 @@
+/*
+ * Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * 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 org.eclipse.emf.cdo.ecore.dependencies;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.DependenciesFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DependenciesPackage extends EPackage
+{
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNAME = "dependencies";
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNS_URI = "http://www.eclipse.org/emf/CDO/dependencies/1.0.0";
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNS_PREFIX = "dependencies";
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ DependenciesPackage eINSTANCE = org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.ecore.dependencies.Addressable <em>Addressable</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Addressable
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getAddressable()
+ * @generated
+ */
+ int ADDRESSABLE = 0;
+
+ /**
+ * The feature id for the '<em><b>Uri</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ADDRESSABLE__URI = 0;
+
+ /**
+ * The number of structural features of the '<em>Addressable</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ADDRESSABLE_FEATURE_COUNT = 1;
+
+ /**
+ * The number of operations of the '<em>Addressable</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ADDRESSABLE_OPERATION_COUNT = 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.ecore.dependencies.impl.ModelContainerImpl <em>Model Container</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.ModelContainerImpl
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getModelContainer()
+ * @generated
+ */
+ int MODEL_CONTAINER = 1;
+
+ /**
+ * The feature id for the '<em><b>Models</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_CONTAINER__MODELS = 0;
+
+ /**
+ * The number of structural features of the '<em>Model Container</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_CONTAINER_FEATURE_COUNT = 1;
+
+ /**
+ * The operation id for the '<em>Get Model</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_CONTAINER___GET_MODEL__URI = 0;
+
+ /**
+ * The operation id for the '<em>Get Element</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_CONTAINER___GET_ELEMENT__URI = 1;
+
+ /**
+ * The number of operations of the '<em>Model Container</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_CONTAINER_OPERATION_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.ecore.dependencies.impl.ModelImpl <em>Model</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.ModelImpl
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getModel()
+ * @generated
+ */
+ int MODEL = 2;
+
+ /**
+ * The feature id for the '<em><b>Uri</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__URI = ADDRESSABLE__URI;
+
+ /**
+ * The feature id for the '<em><b>Container</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__CONTAINER = ADDRESSABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>File</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__FILE = ADDRESSABLE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Workspace</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__WORKSPACE = ADDRESSABLE_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Exists</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__EXISTS = ADDRESSABLE_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__NS_URI = ADDRESSABLE_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__NAME = ADDRESSABLE_FEATURE_COUNT + 5;
+
+ /**
+ * The feature id for the '<em><b>Elements</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__ELEMENTS = ADDRESSABLE_FEATURE_COUNT + 6;
+
+ /**
+ * The feature id for the '<em><b>Outgoing Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__OUTGOING_LINKS = ADDRESSABLE_FEATURE_COUNT + 7;
+
+ /**
+ * The feature id for the '<em><b>Incoming Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__INCOMING_LINKS = ADDRESSABLE_FEATURE_COUNT + 8;
+
+ /**
+ * The feature id for the '<em><b>Broken Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__BROKEN_LINKS = ADDRESSABLE_FEATURE_COUNT + 9;
+
+ /**
+ * The feature id for the '<em><b>Dependencies</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__DEPENDENCIES = ADDRESSABLE_FEATURE_COUNT + 10;
+
+ /**
+ * The feature id for the '<em><b>Depending Models</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__DEPENDING_MODELS = ADDRESSABLE_FEATURE_COUNT + 11;
+
+ /**
+ * The feature id for the '<em><b>Flat Dependencies</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__FLAT_DEPENDENCIES = ADDRESSABLE_FEATURE_COUNT + 12;
+
+ /**
+ * The feature id for the '<em><b>Flat Depending Models</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL__FLAT_DEPENDING_MODELS = ADDRESSABLE_FEATURE_COUNT + 13;
+
+ /**
+ * The number of structural features of the '<em>Model</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_FEATURE_COUNT = ADDRESSABLE_FEATURE_COUNT + 14;
+
+ /**
+ * The operation id for the '<em>Depends Upon</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL___DEPENDS_UPON__MODEL = ADDRESSABLE_OPERATION_COUNT + 0;
+
+ /**
+ * The operation id for the '<em>Add Dependency</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL___ADD_DEPENDENCY__MODEL = ADDRESSABLE_OPERATION_COUNT + 1;
+
+ /**
+ * The operation id for the '<em>Has Broken Links</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL___HAS_BROKEN_LINKS = ADDRESSABLE_OPERATION_COUNT + 2;
+
+ /**
+ * The operation id for the '<em>Get Element</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL___GET_ELEMENT__URI = ADDRESSABLE_OPERATION_COUNT + 3;
+
+ /**
+ * The number of operations of the '<em>Model</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MODEL_OPERATION_COUNT = ADDRESSABLE_OPERATION_COUNT + 4;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.ecore.dependencies.impl.ElementImpl <em>Element</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.ElementImpl
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getElement()
+ * @generated
+ */
+ int ELEMENT = 3;
+
+ /**
+ * The feature id for the '<em><b>Uri</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__URI = ADDRESSABLE__URI;
+
+ /**
+ * The feature id for the '<em><b>Model</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__MODEL = ADDRESSABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Exists</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__EXISTS = ADDRESSABLE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Outgoing Links</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__OUTGOING_LINKS = ADDRESSABLE_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Incoming Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__INCOMING_LINKS = ADDRESSABLE_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Broken Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT__BROKEN_LINKS = ADDRESSABLE_FEATURE_COUNT + 4;
+
+ /**
+ * The number of structural features of the '<em>Element</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT_FEATURE_COUNT = ADDRESSABLE_FEATURE_COUNT + 5;
+
+ /**
+ * The operation id for the '<em>Has Broken Links</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT___HAS_BROKEN_LINKS = ADDRESSABLE_OPERATION_COUNT + 0;
+
+ /**
+ * The number of operations of the '<em>Element</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ELEMENT_OPERATION_COUNT = ADDRESSABLE_OPERATION_COUNT + 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.ecore.dependencies.impl.LinkImpl <em>Link</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.LinkImpl
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getLink()
+ * @generated
+ */
+ int LINK = 4;
+
+ /**
+ * The feature id for the '<em><b>Uri</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK__URI = ADDRESSABLE__URI;
+
+ /**
+ * The feature id for the '<em><b>Source</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK__SOURCE = ADDRESSABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Target</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK__TARGET = ADDRESSABLE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Reference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK__REFERENCE = ADDRESSABLE_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Broken</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK__BROKEN = ADDRESSABLE_FEATURE_COUNT + 3;
+
+ /**
+ * The number of structural features of the '<em>Link</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK_FEATURE_COUNT = ADDRESSABLE_FEATURE_COUNT + 4;
+
+ /**
+ * The number of operations of the '<em>Link</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK_OPERATION_COUNT = ADDRESSABLE_OPERATION_COUNT + 0;
+
+ /**
+ * The meta object id for the '<em>URI</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.common.util.URI
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getURI()
+ * @generated
+ */
+ int URI = 5;
+
+ /**
+ * The meta object id for the '<em>File</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.core.resources.IFile
+ * @see org.eclipse.emf.cdo.ecore.dependencies.impl.DependenciesPackageImpl#getFile()
+ * @generated
+ */
+ int FILE = 6;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.ecore.dependencies.Addressable <em>Addressable</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Addressable</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Addressable
+ * @generated
+ */
+ EClass getAddressable();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Addressable#getUri <em>Uri</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Uri</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Addressable#getUri()
+ * @see #getAddressable()
+ * @generated
+ */
+ EAttribute getAddressable_Uri();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.ecore.dependencies.ModelContainer <em>Model Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Model Container</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.ModelContainer
+ * @generated
+ */
+ EClass getModelContainer();
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getModels <em>Models</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Models</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getModels()
+ * @see #getModelContainer()
+ * @generated
+ */
+ EReference getModelContainer_Models();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getModel(org.eclipse.emf.common.util.URI) <em>Get Model</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Get Model</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getModel(org.eclipse.emf.common.util.URI)
+ * @generated
+ */
+ EOperation getModelContainer__GetModel__URI();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getElement(org.eclipse.emf.common.util.URI) <em>Get Element</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Get Element</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.ModelContainer#getElement(org.eclipse.emf.common.util.URI)
+ * @generated
+ */
+ EOperation getModelContainer__GetElement__URI();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.ecore.dependencies.Model <em>Model</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Model</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model
+ * @generated
+ */
+ EClass getModel();
+
+ /**
+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getContainer <em>Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the container reference '<em>Container</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getContainer()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_Container();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getFile <em>File</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>File</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getFile()
+ * @see #getModel()
+ * @generated
+ */
+ EAttribute getModel_File();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#isWorkspace <em>Workspace</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Workspace</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#isWorkspace()
+ * @see #getModel()
+ * @generated
+ */
+ EAttribute getModel_Workspace();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#isExists <em>Exists</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Exists</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#isExists()
+ * @see #getModel()
+ * @generated
+ */
+ EAttribute getModel_Exists();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getName()
+ * @see #getModel()
+ * @generated
+ */
+ EAttribute getModel_Name();
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getElements <em>Elements</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Elements</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getElements()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_Elements();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getOutgoingLinks <em>Outgoing Links</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Outgoing Links</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getOutgoingLinks()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_OutgoingLinks();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getIncomingLinks <em>Incoming Links</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Incoming Links</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getIncomingLinks()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_IncomingLinks();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getBrokenLinks <em>Broken Links</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Broken Links</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getBrokenLinks()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_BrokenLinks();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getNsURI <em>Ns URI</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Ns URI</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getNsURI()
+ * @see #getModel()
+ * @generated
+ */
+ EAttribute getModel_NsURI();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getDependencies <em>Dependencies</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Dependencies</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getDependencies()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_Dependencies();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getDependingModels <em>Depending Models</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Depending Models</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getDependingModels()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_DependingModels();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getFlatDependencies <em>Flat Dependencies</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Flat Dependencies</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getFlatDependencies()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_FlatDependencies();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getFlatDependingModels <em>Flat Depending Models</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Flat Depending Models</em>'.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getFlatDependingModels()
+ * @see #getModel()
+ * @generated
+ */
+ EReference getModel_FlatDependingModels();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#dependsUpon(org.eclipse.emf.cdo.ecore.dependencies.Model) <em>Depends Upon</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Depends Upon</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#dependsUpon(org.eclipse.emf.cdo.ecore.dependencies.Model)
+ * @generated
+ */
+ EOperation getModel__DependsUpon__Model();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#addDependency(org.eclipse.emf.cdo.ecore.dependencies.Model) <em>Add Dependency</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Add Dependency</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#addDependency(org.eclipse.emf.cdo.ecore.dependencies.Model)
+ * @generated
+ */
+ EOperation getModel__AddDependency__Model();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#hasBrokenLinks() <em>Has Broken Links</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Has Broken Links</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#hasBrokenLinks()
+ * @generated
+ */
+ EOperation getModel__HasBrokenLinks();
+
+ /**
+ * Returns the meta object for the '{@link org.eclipse.emf.cdo.ecore.dependencies.Model#getElement(org.eclipse.emf.common.util.URI) <em>Get Element</em>}' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the '<em>Get Element</em>' operation.
+ * @see org.eclipse.emf.cdo.ecore.dependencies.Model#getElement(org.eclipse.emf.common.util.URI)
+ * @generated
+ */
+ EOperation getModel__GetElement__URI();