Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-01-26 01:03:39 -0500
committerEike Stepper2015-02-18 09:38:56 -0500
commita755c047828d98082e1d50282743ac1c199ec347 (patch)
tree09441d5f1921c05212b6f551488e6c35cc1fc4ff
parent6e522e2217055ea54156021b4fd79efd5ce7904f (diff)
downloadcdo-a755c047828d98082e1d50282743ac1c199ec347.tar.gz
cdo-a755c047828d98082e1d50282743ac1c199ec347.tar.xz
cdo-a755c047828d98082e1d50282743ac1c199ec347.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/about.html28
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/build.properties26
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html304
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/feature.properties143
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/feature.xml162
-rw-r--r--features/org.eclipse.emf.cdo.explorer-feature/license.html107
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml119
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gifbin350 -> 369 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gifbin338 -> 536 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gifbin354 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gifbin356 -> 925 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gifbin345 -> 561 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gifbin338 -> 329 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gifbin530 -> 535 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gifbin503 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gifbin338 -> 329 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gifbin530 -> 535 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gifbin503 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.options3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.project39
-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.core.prefs381
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs119
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/CDOExplorer.launch (renamed from plugins/org.eclipse.emf.cdo.explorer/CDOExplorer.launch)0
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/add.gif (renamed from plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif)bin318 -> 318 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_16.gifbin0 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_32.gifbin0 -> 1431 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/checkout.gifbin0 -> 357 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository.gifbin0 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository_ovr.gifbin0 -> 172 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.properties18
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml90
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/splash.bmp (renamed from plugins/org.eclipse.emf.cdo.explorer/splash.bmp)bin831782 -> 831782 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutContentProvider.java137
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutLabelProvider.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoriesView.java171
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoryItemProvider.java168
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/NewRepositoryLocationDialog.java108
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerActionBarAdvisor.java (renamed from plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerApplication.java (renamed from plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorer.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java (renamed from plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchAdvisor.java (renamed from plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchWindowAdvisor.java (renamed from plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchWindowAdvisor.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java55
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/about.ini15
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/about.mappings6
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/about.properties31
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/build.properties7
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_16.gifbin359 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_32.gifbin1467 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/modeling32.pngbin0 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/plugin.xml41
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckout.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckoutManager.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java76
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepository.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepositoryManager.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutImpl.java176
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutManagerImpl.java53
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryFactory.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryImpl.java220
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryManagerImpl.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/OnlineCDOCheckout.java51
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/RemoteCDORepository.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDOCheckoutProvider.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDORepositoryProvider.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gifbin364 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.release/release.properties6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_16.gifbin588 -> 588 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_32.gifbin1593 -> 1546 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/icons/full/ctool16/create_repo.gifbin3491 -> 319 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/icons/full/view16/admin_view.gifbin608 -> 609 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResource.gifbin973 -> 360 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResourceFolder.gifbin970 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResource.gifbin345 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResourceFolder.gifbin342 -> 925 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/cdo_session.gifbin359 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository.gifbin545 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository_content.gifbin359 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/cdo_session.gifbin359 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository.gifbin545 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository_content.gifbin359 -> 353 bytes
-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.sample/NewCDOBinaryResource.gifbin370 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gifbin373 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gifbin585 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gifbin366 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gifbin376 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gifbin198 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gifbin202 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gifbin115 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gifbin79 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gifbin561 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gifbin597 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gifbin157 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gifbin354 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gifbin582 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gifbin115 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gifbin112 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gifbin561 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gifbin597 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gifbin157 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gifbin247 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gifbin583 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gifbin152 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gifbin607 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gifbin210 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gifbin211 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gifbin219 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gifbin198 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gifbin564 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gifbin1027 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gifbin325 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gifbin588 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gifbin545 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gifbin359 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gifbin591 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gifbin235 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gifbin368 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gifbin594 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gifbin560 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gifbin1031 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gifbin535 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gifbin164 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gifbin367 -> 368 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gifbin375 -> 370 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gifbin354 -> 354 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gifbin372 -> 375 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gifbin369 -> 371 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gifbin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gifbin359 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gifbin380 -> 371 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gifbin379 -> 376 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gifbin503 -> 203 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gifbin588 -> 588 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gifbin359 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gifbin588 -> 588 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gifbin582 -> 585 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gifbin345 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF34
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java99
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java7
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerPersistence.java33
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FileContainerPersistence.java49
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java26
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java23
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ShareableLifecycle.java2
175 files changed, 3736 insertions, 300 deletions
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.project b/features/org.eclipse.emf.cdo.explorer-feature/.project
new file mode 100644
index 0000000000..4d2c745c00
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.explorer-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..34b0796d29
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Mon Jul 04 12:33:55 CEST 2011
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..0c9f6d5a44
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 10:16:21 CET 2010
+commit.comment.template=[${task.id}] ${task.description} \r\n${task.url}
+eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/about.html b/features/org.eclipse.emf.cdo.explorer-feature/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/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/features/org.eclipse.emf.cdo.explorer-feature/build.properties b/features/org.eclipse.emf.cdo.explorer-feature/build.properties
new file mode 100644
index 0000000000..9641625231
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/build.properties
@@ -0,0 +1,26 @@
+# Copyright (c) 2011-2013 Eike Stepper (Berlin, 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 = feature.xml,\
+ feature.properties,\
+ CDOExplorer.product,\
+ rootfiles/,\
+ icons/,\
+ epl-v10.html,\
+ about.html,\
+ license.html
+src.includes = about.html,\
+ epl-v10.html,\
+ buckminster.cspex,\
+ rootfiles/,\
+ license.html
+
+root = rootfiles
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html b/features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html
new file mode 100644
index 0000000000..cb1073a4ba
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+ {
+ panose-1:2 11 6 4 3 5 4 4 2 4;
+ mso-font-charset:0;
+ mso-font-pitch:variable;
+ mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-parent:"";
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ }
+p
+ {margin-right:0in;
+ mso-margin-top-alt:auto;
+ mso-margin-bottom-alt:auto;
+ margin-left:0in;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ }
+p.BalloonText, li.BalloonText, div.BalloonText
+ {mso-style-name:"Balloon Text";
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:8.0pt;
+
+ }
+@page Section1
+ {size:8.5in 11.0in;
+ margin:1.0in 1.25in 1.0in 1.25in;
+ mso-header-margin:.5in;
+ mso-footer-margin:.5in;
+ mso-paper-source:0;}
+div.Section1
+ {page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/feature.properties b/features/org.eclipse.emf.cdo.explorer-feature/feature.properties
new file mode 100644
index 0000000000..29d9d0ef37
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/feature.properties
@@ -0,0 +1,143 @@
+# Copyright (c) 2011-2013 Eike Stepper (Berlin, 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
+
+featureName = CDO Model Repository Explorer Product
+description = Contains the product definition of an installable CDO explorer.
+
+providerName = Eclipse Modeling Project
+updateSiteName = Eclipse Modeling Project Updates
+
+copyrightURL = copyright.txt
+copyright = Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+
+licenseURL=license.html
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer-feature/feature.xml
new file mode 100644
index 0000000000..490bd1bc26
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/feature.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2011-2013 Eike Stepper (Berlin, 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
+-->
+<feature
+ id="org.eclipse.emf.cdo.explorer"
+ label="%featureName"
+ version="4.3.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.explorer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.explorer.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.ui.shared"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.jvm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.tcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.ui.shared"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.util.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.transfer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.transfer.repository"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.transfer.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.explorer-feature/license.html b/features/org.eclipse.emf.cdo.explorer-feature/license.html
new file mode 100644
index 0000000000..c3d34c3c21
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer-feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!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>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
index 0f152b6137..b334119842 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
@@ -33,12 +33,9 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <plugin
+ <includes
id="org.eclipse.emf.cdo.explorer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
id="org.eclipse.emf.cdo.examples.company"
@@ -55,118 +52,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.cdo"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.net4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.ui.shared"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.jvm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.tcp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.ui.shared"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.util.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer.repository"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.transfer.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ui.views"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
index 1586d01413..fa07edc0bb 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.migrator"
label="%featureName"
- version="4.2.100.qualifier"
+ version="4.2.200.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
index 54d55f0a8a..c3ef0f6812 100644
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="4.3.0",
+Export-Package: org.eclipse.emf.cdo.edit;version="4.3.100",
org.eclipse.emf.cdo.eresource.provider;version="4.2.100",
org.eclipse.emf.cdo.etypes.provider;version="4.2.100",
- org.eclipse.emf.cdo.internal.edit.messages;version="4.3.0";x-internal:=true
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.3.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif
index 463c38f026..0079039288 100644
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif
index 755b5bbad6..b5e86d2163 100644
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif
index 6968b7a7ba..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif
index 3988005b7c..152ce470c5 100644
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif
index 560f25470f..061161ae1c 100644
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index 775c69f30a..41af2b94d7 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -577,8 +577,12 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
{
if (object != null)
{
- return ((IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object, IItemLabelProvider.class))
- .getImage(object);
+ IItemLabelProvider itemLabelProvider = (IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object,
+ IItemLabelProvider.class);
+ if (itemLabelProvider != null)
+ {
+ return itemLabelProvider.getImage(object);
+ }
}
return null;
@@ -588,8 +592,12 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
{
if (object != null)
{
- return ((IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object, IItemLabelProvider.class))
- .getText(object);
+ IItemLabelProvider itemLabelProvider = (IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object,
+ IItemLabelProvider.class);
+ if (itemLabelProvider != null)
+ {
+ return itemLabelProvider.getText(object);
+ }
}
return null;
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
index 06107a889a..6487189aa1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
index bb1088c319..36ecd9bf09 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
index d678903420..347acb017a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
index 06107a889a..6487189aa1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/CloneRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
index bb1088c319..36ecd9bf09 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/FailoverRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
index d678903420..347acb017a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/icons/NormalRepository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.classpath b/plugins/org.eclipse.emf.cdo.explorer.ui/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.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/J2SE-1.5"/>
+ <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.explorer.ui/.options b/plugins/org.eclipse.emf.cdo.explorer.ui/.options
new file mode 100644
index 0000000000..f8a9576cbc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.options
@@ -0,0 +1,3 @@
+# Debugging and tracing options
+
+org.eclipse.emf.cdo.explorer.ui/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.project b/plugins/org.eclipse.emf.cdo.explorer.ui/.project
new file mode 100644
index 0000000000..2066f9bf48
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.explorer.ui</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>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng.release/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>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..4f61cd36ae
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 04 13:02:52 CEST 2011
+eclipse.preferences.version=1
+
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..48aafaf7ea
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,381 @@
+eclipse.preferences.version=1
+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.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.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.enumIdentifier=error
+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.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.missingDeprecatedAnnotation=warning
+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.nullReference=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.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+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.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+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.source=1.5
+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_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_binary_expression=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_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_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_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_binary_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_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_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_unary_operator=do not 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_binary_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_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_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_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=120
+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_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..72f4c75fe8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,119 @@
+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_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=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.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_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+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_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+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_profile=_EMFT
+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) 2004-2014 Eike Stepper (Berlin, 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=true
+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.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.explorer.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.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.explorer.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..b050639a54
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.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.explorer.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..2f50f36c0c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.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${task.url}
+eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..0c17d59e45
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.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.explorer.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..fe01bb701d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,31 @@
+#Thu Feb 04 09:44:24 CET 2010
+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.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.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.not-externalized-att=2
+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.explorer/CDOExplorer.launch b/plugins/org.eclipse.emf.cdo.explorer.ui/CDOExplorer.launch
index b179ae4acb..b179ae4acb 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/CDOExplorer.launch
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/CDOExplorer.launch
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..919e83e44d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.cdo.explorer.ui;singleton:=true
+Bundle-Version: 4.4.0.qualifier
+Bundle-Activator: org.eclipse.emf.cdo.explorer.ui.bundle.OM$Activator
+Bundle-Vendor: %providerName
+Bundle-ClassPath: .
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.cdo.explorer;bundle-version="[4.4.0,5.0.0)",
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
+Export-Package: org.eclipse.emf.cdo.explorer.ui;version="4.4.0";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.application;version="4.4.0";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.bundle;version="4.4.0";x-internal:=true
+Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/about.html b/plugins/org.eclipse.emf.cdo.explorer.ui/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/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.ui/build.properties b/plugins/org.eclipse.emf.cdo.explorer.ui/build.properties
new file mode 100644
index 0000000000..9e30e92de4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/build.properties
@@ -0,0 +1,24 @@
+# Copyright (c) 2011, 2012 Eike Stepper (Berlin, 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
+
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ plugin.properties,\
+ .options,\
+ about.html,\
+ icons/
+src.includes = about.html,\
+ CDOExplorer.launch
+
+generateSourceReferences = true
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/add.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/add.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_16.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_16.gif
new file mode 100644
index 0000000000..aab84f2e0b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_16.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_32.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_32.gif
new file mode 100644
index 0000000000..5f919ac942
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/alt_window_32.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/icons/checkout.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/checkout.gif
new file mode 100644
index 0000000000..58ca981513
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/checkout.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository.gif
new file mode 100644
index 0000000000..347acb017a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository_ovr.gif b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository_ovr.gif
new file mode 100644
index 0000000000..7b41b035e5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/icons/repository_ovr.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.properties
new file mode 100644
index 0000000000..9015b712c5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2011-2013 Eike Stepper (Berlin, 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 Explorer
+providerName = Eclipse Modeling Project
+
+app.name = CDOExplorer
+
+product.description = The CDO explorer application
+product.name = CDO Explorer
+
+perspective.name = CDO Explorer
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
new file mode 100644
index 0000000000..759cacbe0f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2011-2013 Eike Stepper (Berlin, 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 id="app" point="org.eclipse.core.runtime.applications" name="%app.name">
+ <application>
+ <run class="org.eclipse.emf.cdo.explorer.ui.application.CDOExplorerApplication"/>
+ </application>
+ </extension>
+
+ <extension id="product" point="org.eclipse.core.runtime.products">
+ <product
+ name="CDO Explorer"
+ description="%product.description"
+ application="org.eclipse.emf.cdo.explorer.app">
+ <property name="appName" value="CDO Explorer"/>
+ </product>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ class="org.eclipse.emf.cdo.explorer.ui.application.CDOExplorerPerspective"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
+ id="org.eclipse.emf.cdo.explorer.ui.CDOExplorerPerspective"
+ name="%perspective.name">
+ </perspective>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.views">
+ <view
+ class="org.eclipse.emf.cdo.explorer.ui.CDORepositoriesView"
+ id="org.eclipse.emf.cdo.explorer.ui.CDORepositoriesView"
+ name="CDO Repositories"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gif"
+ category="org.eclipse.emf.cdo"
+ allowMultiple="false">
+ </view>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.navigator.navigatorContent">
+ <navigatorContent
+ id="org.eclipse.emf.cdo.explorer.ui.CDOCheckouts"
+ icon="icons/checkout.gif"
+ name="CDO Checkouts"
+ contentProvider="org.eclipse.emf.cdo.explorer.ui.CDOCheckoutContentProvider"
+ labelProvider="org.eclipse.emf.cdo.explorer.ui.CDOCheckoutLabelProvider"
+ priority="normal"
+ activeByDefault="true"
+ providesSaveables="false">
+ <triggerPoints>
+ <or>
+ <instanceof
+ value="org.eclipse.emf.cdo.explorer.CDOCheckout">
+ </instanceof>
+ <instanceof
+ value="org.eclipse.emf.ecore.EObject">
+ </instanceof>
+ </or>
+ </triggerPoints>
+ </navigatorContent>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.navigator.viewer">
+ <viewerContentBinding
+ viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+ <includes>
+ <contentExtension
+ isRoot="true"
+ pattern="org.eclipse.emf.cdo.explorer.ui.CDOCheckouts">
+ </contentExtension>
+ </includes>
+ </viewerContentBinding>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/splash.bmp b/plugins/org.eclipse.emf.cdo.explorer.ui/splash.bmp
index df885aa12e..df885aa12e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/splash.bmp
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/splash.bmp
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutContentProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutContentProvider.java
new file mode 100644
index 0000000000..f2e392e6bb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutContentProvider.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2009-2013 Eike Stepper (Berlin, 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
+ * Victor Roldan Betancort - maintenance
+ */
+package org.eclipse.emf.cdo.explorer.ui;
+
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+import org.eclipse.emf.cdo.explorer.CDOCheckoutManager;
+import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.EMFEditPlugin;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * @author Eike Stepper
+ * @since 4.3
+ */
+public class CDOCheckoutContentProvider extends AdapterFactoryContentProvider
+{
+ private static final CDOCheckoutManager MANAGER = CDOExplorerUtil.getCheckoutManager();
+
+ private final ComposedAdapterFactory adapterFactory;
+
+ private Object input;
+
+ public CDOCheckoutContentProvider()
+ {
+ super(null);
+
+ ComposedAdapterFactory.Descriptor.Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
+ adapterFactory = new ComposedAdapterFactory(registry);
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+ setAdapterFactory(adapterFactory);
+ }
+
+ @Override
+ public void dispose()
+ {
+ super.dispose();
+ adapterFactory.dispose();
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
+ {
+ super.inputChanged(viewer, oldInput, newInput);
+ input = newInput;
+ }
+
+ @Override
+ public Object[] getElements(Object object)
+ {
+ Object[] children = getRootContent(object);
+ if (children != null)
+ {
+ return children;
+ }
+
+ return super.getElements(object);
+ }
+
+ @Override
+ public Object[] getChildren(Object object)
+ {
+ Object[] children = getRootContent(object);
+ if (children != null)
+ {
+ return children;
+ }
+
+ return super.getChildren(object);
+ }
+
+ @Override
+ public boolean hasChildren(Object object)
+ {
+ if (object == input)
+ {
+ return !MANAGER.isEmpty();
+ }
+
+ if (object instanceof CDOCheckout)
+ {
+ CDOCheckout checkout = (CDOCheckout)object;
+ EObject rootObject = checkout.getRootObject();
+ return super.hasChildren(rootObject);
+ }
+
+ return super.hasChildren(object);
+ }
+
+ @Override
+ public Object getParent(Object object)
+ {
+ if (object == input)
+ {
+ return null;
+ }
+
+ if (object instanceof CDOCheckout)
+ {
+ return input;
+ }
+
+ return super.getParent(object);
+ }
+
+ private Object[] getRootContent(Object object)
+ {
+ // if (object == input)
+ // {
+ // return MANAGER.getCheckouts();
+ // }
+
+ if (object instanceof CDOCheckout)
+ {
+ CDOCheckout checkout = (CDOCheckout)object;
+ return super.getChildren(checkout.getRootObject());
+ }
+
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutLabelProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutLabelProvider.java
new file mode 100644
index 0000000000..85274001c4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDOCheckoutLabelProvider.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2009-2012 Eike Stepper (Berlin, 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.explorer.ui;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceNode;
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+import org.eclipse.emf.cdo.explorer.ui.bundle.OM;
+
+import org.eclipse.emf.edit.EMFEditPlugin;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author Eike Stepper
+ * @since 4.3
+ */
+public class CDOCheckoutLabelProvider extends AdapterFactoryLabelProvider
+{
+ private final ComposedAdapterFactory adapterFactory;
+
+ private Image checkoutImage;
+
+ public CDOCheckoutLabelProvider()
+ {
+ super(null);
+
+ ComposedAdapterFactory.Descriptor.Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
+ adapterFactory = new ComposedAdapterFactory(registry);
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+ setAdapterFactory(adapterFactory);
+
+ ImageDescriptor imageDescriptor = OM.getImageDescriptor("icons/checkout.gif");
+ checkoutImage = imageDescriptor.createImage();
+ }
+
+ @Override
+ public void dispose()
+ {
+ checkoutImage.dispose();
+ super.dispose();
+
+ // Must come after super.dispose().
+ adapterFactory.dispose();
+ }
+
+ @Override
+ public String getText(Object element)
+ {
+ if (element instanceof CDOCheckout)
+ {
+ CDOCheckout checkout = (CDOCheckout)element;
+ return checkout.getLabel();
+ }
+
+ if (element instanceof CDOResourceNode)
+ {
+ CDOResourceNode resourceNode = (CDOResourceNode)element;
+ return resourceNode.getName();
+ }
+
+ return super.getText(element);
+ }
+
+ @Override
+ public Image getImage(Object element)
+ {
+ if (element instanceof CDOCheckout)
+ {
+ return checkoutImage;
+ }
+
+ return super.getImage(element);
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoriesView.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoriesView.java
new file mode 100644
index 0000000000..43fb8a0d85
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoriesView.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer.ui;
+
+import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.explorer.CDORepositoryManager;
+import org.eclipse.emf.cdo.explorer.ui.bundle.OM;
+
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
+import org.eclipse.net4j.util.ui.views.ContainerView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ITreeViewerListener;
+import org.eclipse.jface.viewers.TreeExpansionEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbenchActionConstants;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDORepositoriesView extends ContainerView
+{
+ private final Set<CDORepository> expandedRepositories = new HashSet<CDORepository>();
+
+ private CDORepositoryItemProvider itemProvider;
+
+ private NewRepositoryAction newAction;
+
+ public CDORepositoriesView()
+ {
+ }
+
+ @Override
+ protected IContainer<?> getContainer()
+ {
+ return CDOExplorerUtil.getRepositoryManager();
+ }
+
+ @Override
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
+ {
+ itemProvider = new CDORepositoryItemProvider()
+ {
+ @Override
+ public boolean hasChildren(Object element)
+ {
+ if (element instanceof CDORepositoryManager)
+ {
+ CDORepositoryManager repositoryManager = (CDORepositoryManager)element;
+
+ TreeViewer viewer = CDORepositoriesView.this.getViewer();
+ for (CDORepository repository : repositoryManager.getRepositories())
+ {
+ if (expandedRepositories.remove(repository) && !viewer.getExpandedState(repository))
+ {
+
+ }
+ }
+ }
+
+ return super.hasChildren(element);
+ }
+ };
+ return itemProvider;
+ }
+
+ @Override
+ protected Control createUI(Composite parent)
+ {
+ newAction = new NewRepositoryAction();
+ return super.createUI(parent);
+ }
+
+ @Override
+ protected void initViewer()
+ {
+ super.initViewer();
+ getViewer().addTreeListener(new ITreeViewerListener()
+ {
+ public void treeExpanded(TreeExpansionEvent event)
+ {
+ Object element = event.getElement();
+ if (element instanceof CDORepository)
+ {
+ CDORepository repository = (CDORepository)element;
+ LifecycleUtil.activate(repository);
+ itemProvider.superGetChildren(repository);
+ }
+ }
+
+ public void treeCollapsed(TreeExpansionEvent event)
+ {
+ Object element = event.getElement();
+ if (element instanceof CDORepository)
+ {
+ CDORepository repository = (CDORepository)element;
+ LifecycleUtil.deactivate(repository);
+ }
+ }
+ });
+ }
+
+ @Override
+ protected void fillLocalPullDown(IMenuManager manager)
+ {
+ manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+ }
+
+ @Override
+ protected void fillLocalToolBar(IToolBarManager manager)
+ {
+ manager.add(newAction);
+ manager.add(getRefreshAction());
+ super.fillLocalToolBar(manager);
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private class NewRepositoryAction extends Action
+ {
+ public NewRepositoryAction()
+ {
+ setText("New Repository");
+ setToolTipText("Add a new repository");
+ setImageDescriptor(OM.getImageDescriptor("icons/add.gif"));
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ NewRepositoryLocationDialog dialog = new NewRepositoryLocationDialog(getSite().getShell());
+ if (dialog.open() == NewRepositoryLocationDialog.OK)
+ {
+ String connectorType = dialog.getConnectorType();
+ String connectorDescription = dialog.getConnectorDescription();
+ String repositoryName = dialog.getRepositoryName();
+
+ CDORepositoryManager repositoryManager = CDOExplorerUtil.getRepositoryManager();
+ repositoryManager.addRemoteRepository(repositoryName, repositoryName, connectorType, connectorDescription);
+ }
+ }
+ catch (RuntimeException ex)
+ {
+ OM.LOG.error(ex);
+ throw ex;
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoryItemProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoryItemProvider.java
new file mode 100644
index 0000000000..fdb73ba3f6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/CDORepositoryItemProvider.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer.ui;
+
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
+
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.ui.actions.LongRunningAction;
+import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
+import org.eclipse.net4j.util.ui.views.IElementFilter;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.swt.graphics.Image;
+
+import java.util.Iterator;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDORepositoryItemProvider extends ContainerItemProvider<IContainer<Object>>
+{
+ public CDORepositoryItemProvider()
+ {
+ }
+
+ public CDORepositoryItemProvider(IElementFilter rootElementFilter)
+ {
+ super(rootElementFilter);
+ }
+
+ @Override
+ public boolean hasChildren(Object element)
+ {
+ if (element instanceof CDORepository)
+ {
+ CDORepository repository = (CDORepository)element;
+ if (!repository.isConnected())
+ {
+ return true;
+ }
+ }
+
+ return super.hasChildren(element);
+ }
+
+ @Override
+ public Object[] getChildren(Object element)
+ {
+ if (element instanceof CDORepository)
+ {
+ CDORepository repository = (CDORepository)element;
+ if (!repository.isConnected())
+ {
+ ContainerItemProvider<IContainer<Object>>.LazyElement lazyElement = createLazyElement(repository);
+ return new Object[] { lazyElement };
+ }
+ }
+
+ return superGetChildren(element);
+ }
+
+ public Object[] superGetChildren(Object element)
+ {
+ return super.getChildren(element);
+ }
+
+ @Override
+ public String getText(Object element)
+ {
+ if (element instanceof CDOBranch)
+ {
+ CDOBranch branch = (CDOBranch)element;
+ return branch.getName();
+ }
+
+ return super.getText(element);
+ }
+
+ @Override
+ public Image getImage(Object obj)
+ {
+ if (obj instanceof CDORepository)
+ {
+ return SharedIcons.getImage(SharedIcons.OBJ_REPO);
+ }
+
+ if (obj instanceof CDOBranch)
+ {
+ return SharedIcons.getImage(SharedIcons.OBJ_BRANCH);
+ }
+
+ return super.getImage(obj);
+ }
+
+ @Override
+ public void fillContextMenu(IMenuManager manager, ITreeSelection selection)
+ {
+ super.fillContextMenu(manager, selection);
+ if (selection.size() == 1)
+ {
+ Object obj = selection.getFirstElement();
+ if (obj instanceof CDORepository)
+ {
+ manager.add(new RemoveAction(obj));
+ }
+ }
+ }
+
+ @Override
+ protected boolean isSlow(IContainer<Object> container)
+ {
+ return true;
+ }
+
+ @Override
+ protected String getSlowText(IContainer<Object> container)
+ {
+ if ((IContainer<?>)container instanceof CDORepository)
+ {
+ return "Connecting...";
+ }
+
+ return "Loading...";
+ }
+
+ @Override
+ protected void handleInactiveElement(Iterator<org.eclipse.net4j.util.ui.views.ContainerItemProvider.Node> it,
+ org.eclipse.net4j.util.ui.views.ContainerItemProvider.Node child)
+ {
+ // Do nothing.
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ public static class RemoveAction extends LongRunningAction
+ {
+ private Object object;
+
+ public RemoveAction(Object object)
+ {
+ super("Remove");
+ this.object = object;
+ }
+
+ @Override
+ protected void doRun(IProgressMonitor progressMonitor) throws Exception
+ {
+ // if (object instanceof CDORepository)
+ // {
+ // CDORepository repository = (CDORepository)object;
+ // repository.remove();
+ // }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/NewRepositoryLocationDialog.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/NewRepositoryLocationDialog.java
new file mode 100644
index 0000000000..1e459497b9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/NewRepositoryLocationDialog.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer.ui;
+
+import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.ui.container.ElementWizardComposite;
+
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @author Eike Stepper
+ */
+public class NewRepositoryLocationDialog extends TitleAreaDialog
+{
+ private ElementWizardComposite connectorWizard;
+
+ private Text repositoryNameText;
+
+ private String connectorType;
+
+ private String connectorDescription;
+
+ private String repositoryName;
+
+ public NewRepositoryLocationDialog(Shell parentShell)
+ {
+ super(parentShell);
+ setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
+ }
+
+ public String getConnectorType()
+ {
+ return connectorType;
+ }
+
+ public String getConnectorDescription()
+ {
+ return connectorDescription;
+ }
+
+ public String getRepositoryName()
+ {
+ return repositoryName;
+ }
+
+ @Override
+ protected void configureShell(Shell newShell)
+ {
+ super.configureShell(newShell);
+ newShell.setText("New Repository Location");
+ }
+
+ @Override
+ protected Control createDialogArea(Composite parent)
+ {
+ setTitle("New Repository Location");
+ // setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
+
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(1, false));
+
+ Group group1 = new Group(composite, SWT.NONE);
+ group1.setLayout(new GridLayout(1, false));
+ group1.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+ group1.setText("Connection");
+ connectorWizard = new ElementWizardComposite.WithRadios(group1, SWT.NONE, "org.eclipse.net4j.connectors", "Type:");
+ connectorWizard.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
+ Group group2 = new Group(composite, SWT.NONE);
+ group2.setLayout(new GridLayout(1, false));
+ group2.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+ group2.setText("Repository");
+ repositoryNameText = new Text(group2, SWT.BORDER);
+ repositoryNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+ return composite;
+ }
+
+ protected IManagedContainer getContainer()
+ {
+ return IPluginContainer.INSTANCE;
+ }
+
+ @Override
+ protected void okPressed()
+ {
+ connectorType = connectorWizard.getFactoryType();
+ connectorDescription = connectorWizard.getDescription();
+ repositoryName = repositoryNameText.getText();
+ super.okPressed();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerActionBarAdvisor.java
index 9e62e4c39b..a56f55d249 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerActionBarAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.internal.explorer;
+package org.eclipse.emf.cdo.explorer.ui.application;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorer.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerApplication.java
index 50209739fe..bd3bf382b1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorer.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.internal.explorer;
+package org.eclipse.emf.cdo.explorer.ui.application;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
@@ -19,7 +19,7 @@ import org.eclipse.ui.PlatformUI;
/**
* @author Eike Stepper
*/
-public class CDOExplorer implements IApplication
+public class CDOExplorerApplication implements IApplication
{
public Object start(IApplicationContext context)
{
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java
index bb2e3887a7..a56222a46d 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java
@@ -9,7 +9,7 @@
* Victor Roldan Betancort - initial API and implementation
* Eike Stepper - maintenance
*/
-package org.eclipse.emf.cdo.internal.explorer;
+package org.eclipse.emf.cdo.explorer.ui.application;
import org.eclipse.emf.cdo.internal.ui.views.CDORemoteSessionsView;
import org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchAdvisor.java
index d60f9b74e6..855055b286 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.internal.explorer;
+package org.eclipse.emf.cdo.explorer.ui.application;
import org.eclipse.emf.cdo.internal.ui.perspectives.CDOPerspective;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchWindowAdvisor.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchWindowAdvisor.java
index 5b09c412ed..285b26dc95 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchWindowAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerWorkbenchWindowAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.internal.explorer;
+package org.eclipse.emf.cdo.explorer.ui.application;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.application.ActionBarAdvisor;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java
new file mode 100644
index 0000000000..a46a155dcd
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011, 2012 Eike Stepper (Berlin, 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
+ * Victor Roldan Betancort - maintenance
+ */
+package org.eclipse.emf.cdo.explorer.ui.bundle;
+
+import org.eclipse.net4j.util.om.OMBundle;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+import org.eclipse.net4j.util.ui.UIActivator;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+/**
+ * The <em>Operations & Maintenance</em> class of this bundle.
+ *
+ * @author Eike Stepper
+ */
+public abstract class OM
+{
+ public static final String BUNDLE_ID = "org.eclipse.emf.cdo.explorer.ui"; //$NON-NLS-1$
+
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
+
+ public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
+
+ public static final OMLogger LOG = BUNDLE.logger();
+
+ public static ImageDescriptor getImageDescriptor(String imageFilePath)
+ {
+ return Activator.imageDescriptorFromPlugin(BUNDLE_ID, imageFilePath);
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ public static final class Activator extends UIActivator
+ {
+ public static Activator INSTANCE;
+
+ public Activator()
+ {
+ super(BUNDLE);
+ INSTANCE = this;
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index df2a6b11c5..ffb9eb92db 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.4.0.qualifier
Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
@@ -10,8 +10,9 @@ Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.explorer;version="4.1.200";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.1.200";x-internal:=true
+ org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.explorer;version="4.4.0",
+ org.eclipse.emf.cdo.internal.explorer;version="4.4.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.4.0";x-internal:=true,
+ org.eclipse.emf.cdo.spi.explorer;version="4.4.0"
+Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.ini b/plugins/org.eclipse.emf.cdo.explorer/about.ini
new file mode 100644
index 0000000000..32006ae5d6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/about.ini
@@ -0,0 +1,15 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
+
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.mappings b/plugins/org.eclipse.emf.cdo.explorer/about.mappings
new file mode 100644
index 0000000000..bddaab4310
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@ \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.properties b/plugins/org.eclipse.emf.cdo.explorer/about.properties
new file mode 100644
index 0000000000..1f9bf55939
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/about.properties
@@ -0,0 +1,31 @@
+# Copyright (c) 2006-2009, 2011, 2012 Eike Stepper (Berlin, 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
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# 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\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+Copyright (c) 2004-2014 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
+\n\
+Visit http://www.eclipse.org/cdo
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.explorer/build.properties b/plugins/org.eclipse.emf.cdo.explorer/build.properties
index 9e30e92de4..fef2dbb588 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/build.properties
+++ b/plugins/org.eclipse.emf.cdo.explorer/build.properties
@@ -13,12 +13,9 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml,\
plugin.properties,\
.options,\
- about.html,\
- icons/
-src.includes = about.html,\
- CDOExplorer.launch
+ about.html
+src.includes = about.html
generateSourceReferences = true
diff --git a/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_16.gif b/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_16.gif
deleted file mode 100644
index 979c352bbf..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_32.gif b/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_32.gif
deleted file mode 100644
index b27662fcbe..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/icons/alt_window_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer/modeling32.png b/plugins/org.eclipse.emf.cdo.explorer/modeling32.png
new file mode 100644
index 0000000000..6b08de2ada
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
deleted file mode 100644
index 9891798067..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2011-2013 Eike Stepper (Berlin, 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 id="app" point="org.eclipse.core.runtime.applications" name="%app.name">
- <application>
- <run class="org.eclipse.emf.cdo.internal.explorer.CDOExplorer"/>
- </application>
- </extension>
-
- <extension id="product" point="org.eclipse.core.runtime.products">
- <product
- name="CDO Explorer"
- description="%product.description"
- application="org.eclipse.emf.cdo.explorer.app">
- <property name="appName" value="CDO Explorer"/>
- </product>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- class="org.eclipse.emf.cdo.internal.explorer.CDOExplorerPerspective"
- icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
- id="org.eclipse.emf.cdo.explorer.CDOExplorerPerspective"
- name="%perspective.name">
- </perspective>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckout.java
new file mode 100644
index 0000000000..1cbdbf100d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckout.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.view.CDOView;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.core.runtime.IAdaptable;
+
+/**
+ * A CDO checkout.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ * @apiviz.landmark
+ */
+public interface CDOCheckout extends IAdaptable
+{
+ public String getLabel();
+
+ public void setLabel(String label);
+
+ public CDOCheckoutManager getCheckoutManager();
+
+ public CDORepository getRepository();
+
+ public String getBranchPath();
+
+ public void setBranchPath(String branchPath);
+
+ public long getTimeStamp();
+
+ public void setTimeStamp(long timeStamp);
+
+ public boolean isReadOnly();
+
+ public void setReadOnly(boolean readOnly);
+
+ public CDOID getRootID();
+
+ public void setRootID(CDOID rootID);
+
+ public CDOView getView();
+
+ public EObject getRootObject();
+
+ public void close();
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckoutManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckoutManager.java
new file mode 100644
index 0000000000..90f28d3138
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOCheckoutManager.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+
+import org.eclipse.net4j.util.container.IContainer;
+
+/**
+ * Manages a set of {@link CDOCheckout checkouts}.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ * @apiviz.composedOf {@link CDOCheckout}
+ */
+public interface CDOCheckoutManager extends IContainer<CDOCheckout>
+{
+ public CDOCheckout[] getCheckouts();
+
+ public CDOCheckout connect(String label, CDORepository repository, String branchPath, long timeStamp,
+ boolean readOnly, CDOID rootID);
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java
new file mode 100644
index 0000000000..e511844798
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.explorer;
+
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
+import org.eclipse.emf.cdo.internal.explorer.CDOCheckoutManagerImpl;
+import org.eclipse.emf.cdo.internal.explorer.CDORepositoryManagerImpl;
+
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+
+/**
+ * @author Eike Stepper
+ * @since 4.4
+ */
+public final class CDOExplorerUtil
+{
+ private static CDORepositoryManager repositoryManager;
+
+ private static CDOCheckoutManager checkoutManager;
+
+ public static synchronized CDOCheckoutManager getCheckoutManager()
+ {
+ if (checkoutManager == null)
+ {
+ CDORepository repository = getRepositoryManager().getRepositories()[0];
+
+ checkoutManager = new CDOCheckoutManagerImpl();
+ checkoutManager.connect("Repo1 Root", repository, "MAIN", 0, false, CDOIDUtil.createLong(1));
+ LifecycleUtil.activate(checkoutManager);
+ }
+
+ return checkoutManager;
+ }
+
+ public static synchronized void disposeCheckoutManager()
+ {
+ LifecycleUtil.deactivate(checkoutManager);
+ checkoutManager = null;
+ }
+
+ public static synchronized CDORepositoryManager getRepositoryManager()
+ {
+ if (repositoryManager == null)
+ {
+ // File file = new File(OM.BUNDLE.getStateLocation(), "repositories");
+ // FileContainerPersistence<CDORepository> persistence = new FileContainerPersistence<CDORepository>(file);
+ //
+ // CDORepositoryManagerImpl manager = new CDORepositoryManagerImpl();
+ // manager.setPersistence(persistence);
+ // manager.activate();
+ //
+ // repositoryManager = manager;
+
+ repositoryManager = new CDORepositoryManagerImpl();
+ repositoryManager.addRemoteRepository("Repo1", "repo1", "tcp", "localhost");
+
+ LifecycleUtil.activate(repositoryManager);
+ }
+
+ return repositoryManager;
+ }
+
+ public static synchronized void disposeRepositoryManager()
+ {
+ LifecycleUtil.deactivate(repositoryManager);
+ repositoryManager = null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepository.java
new file mode 100644
index 0000000000..dc53363191
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepository.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer;
+
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.session.CDOSessionProvider;
+
+import org.eclipse.net4j.util.container.IContainer;
+
+/**
+ * A CDO server independent representation of a repository.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ * @apiviz.landmark
+ */
+public interface CDORepository extends IContainer<CDOBranch>, CDOSessionProvider
+{
+ public String getLabel();
+
+ public void setLabel(String label);
+
+ public CDORepositoryManager getRepositoryManager();
+
+ public String getConnectorType();
+
+ public String getConnectorDescription();
+
+ public String getRepositoryName();
+
+ public boolean isConnected();
+
+ public void disconnect();
+
+ public CDOCheckout[] getCheckouts();
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepositoryManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepositoryManager.java
new file mode 100644
index 0000000000..ff5fdd8f25
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDORepositoryManager.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.explorer;
+
+import org.eclipse.net4j.util.container.IContainer;
+
+/**
+ * Manages a set of {@link CDORepository repositories}.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ * @apiviz.landmark
+ * @apiviz.composedOf {@link CDORepository}
+ */
+public interface CDORepositoryManager extends IContainer<CDORepository>
+{
+ public CDORepository[] getRepositories();
+
+ public CDORepository addRemoteRepository(String label, String repositoryName, String connectorType,
+ String connectorDescription);
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutImpl.java
new file mode 100644
index 0000000000..c685e81cfa
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutImpl.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+import org.eclipse.emf.cdo.explorer.CDOCheckoutManager;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.view.CDOView;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.core.runtime.PlatformObject;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class CDOCheckoutImpl extends PlatformObject implements CDOCheckout
+{
+ private final CDOCheckoutManager checkoutManager;
+
+ private final CDORepository repository;
+
+ private String branchPath;
+
+ private long timeStamp;
+
+ private boolean readOnly;
+
+ private CDOID rootID;
+
+ private String label;
+
+ private CDOView view;
+
+ private EObject rootObject;
+
+ public CDOCheckoutImpl(CDOCheckoutManager checkoutManager, CDORepository repository, String branchPath,
+ long timeStamp, boolean readOnly, CDOID rootID, String label)
+ {
+ this.checkoutManager = checkoutManager;
+ this.label = label;
+ this.repository = repository;
+ this.branchPath = branchPath;
+ this.timeStamp = timeStamp;
+ this.readOnly = readOnly;
+ this.rootID = rootID;
+ }
+
+ public final CDOCheckoutManager getCheckoutManager()
+ {
+ return checkoutManager;
+ }
+
+ public final CDORepository getRepository()
+ {
+ return repository;
+ }
+
+ public final String getBranchPath()
+ {
+ return branchPath;
+ }
+
+ public final void setBranchPath(String branchPath)
+ {
+ this.branchPath = branchPath;
+ }
+
+ public final long getTimeStamp()
+ {
+ return timeStamp;
+ }
+
+ public final void setTimeStamp(long timeStamp)
+ {
+ this.timeStamp = timeStamp;
+ }
+
+ public final boolean isReadOnly()
+ {
+ return readOnly;
+ }
+
+ public final void setReadOnly(boolean readOnly)
+ {
+ this.readOnly = readOnly;
+ }
+
+ public final CDOID getRootID()
+ {
+ return rootID;
+ }
+
+ public final void setRootID(CDOID rootID)
+ {
+ this.rootID = rootID;
+ }
+
+ public final String getLabel()
+ {
+ return label;
+ }
+
+ public final void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public final boolean isOpen()
+ {
+ return view != null;
+ }
+
+ public final synchronized void open()
+ {
+ if (!isOpen())
+ {
+ view = openView();
+ }
+ }
+
+ public final synchronized void close()
+ {
+ if (isOpen())
+ {
+ rootObject = null;
+
+ view.close();
+ view = null;
+ }
+ }
+
+ public final synchronized CDOView getView()
+ {
+ open();
+ return view;
+ }
+
+ public final synchronized EObject getRootObject()
+ {
+ if (rootObject == null)
+ {
+ rootObject = loadRootObject();
+ }
+
+ return rootObject;
+ }
+
+ @Override
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter)
+ {
+ if (adapter == EObject.class)
+ {
+ return getRootObject();
+ }
+
+ return super.getAdapter(adapter);
+ }
+
+ protected EObject loadRootObject()
+ {
+ CDOView view = getView();
+ return view.getObject(rootID);
+ }
+
+ protected abstract CDOView openView();
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutManagerImpl.java
new file mode 100644
index 0000000000..27e5f395df
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOCheckoutManagerImpl.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+import org.eclipse.emf.cdo.explorer.CDOCheckoutManager;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+
+import org.eclipse.net4j.util.container.SetContainer;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOCheckoutManagerImpl extends SetContainer<CDOCheckout> implements CDOCheckoutManager
+{
+ public CDOCheckoutManagerImpl()
+ {
+ super(CDOCheckout.class);
+ }
+
+ public CDOCheckout[] getCheckouts()
+ {
+ return getElements();
+ }
+
+ public CDOCheckout connect(String label, CDORepository repository, String branchPath, long timeStamp,
+ boolean readOnly, CDOID rootID)
+ {
+ CDOCheckout checkout = new OnlineCDOCheckout(this, repository, branchPath, timeStamp, readOnly, rootID, label);
+ return addCheckout(checkout);
+ }
+
+ private CDOCheckout addCheckout(CDOCheckout checkout)
+ {
+ if (addElement(checkout))
+ {
+ CDORepositoryImpl repository = (CDORepositoryImpl)checkout.getRepository();
+ repository.addCheckout(checkout);
+ return checkout;
+ }
+
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryFactory.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryFactory.java
new file mode 100644
index 0000000000..a7f17b4596
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.explorer.CDORepository;
+
+import org.eclipse.net4j.util.factory.Factory;
+import org.eclipse.net4j.util.factory.ProductCreationException;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class CDORepositoryFactory extends Factory
+{
+ public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.explorer.repositories";
+
+ public CDORepositoryFactory(String type)
+ {
+ super(PRODUCT_GROUP, type);
+ }
+
+ public abstract CDORepository create(String description) throws ProductCreationException;
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryImpl.java
new file mode 100644
index 0000000000..9e646c2b19
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryImpl.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.common.CDOCommonSession.Options.PassiveUpdateMode;
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.explorer.CDORepositoryManager;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
+import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.session.CDOSessionConfiguration;
+
+import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.connector.IConnector;
+import org.eclipse.net4j.util.ObjectUtil;
+import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.lifecycle.ILifecycle;
+import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.lifecycle.ShareableLifecycle;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class CDORepositoryImpl extends ShareableLifecycle implements CDORepository
+{
+ private final Set<CDOCheckout> checkouts = new HashSet<CDOCheckout>();
+
+ private final LifecycleEventAdapter sessionListener = new LifecycleEventAdapter()
+ {
+ @Override
+ protected void onDeactivated(ILifecycle lifecycle)
+ {
+ disconnect();
+ }
+ };
+
+ private final CDORepositoryManager repositoryManager;
+
+ private String label;
+
+ private String repositoryName;
+
+ private CDOSession session;
+
+ public CDORepositoryImpl(CDORepositoryManager repositoryManager, String label, String repositoryName)
+ {
+ super(true);
+ this.repositoryManager = repositoryManager;
+ this.repositoryName = repositoryName;
+ }
+
+ public final CDORepositoryManager getRepositoryManager()
+ {
+ return repositoryManager;
+ }
+
+ public String getLabel()
+ {
+ return label;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public final String getRepositoryName()
+ {
+ return repositoryName;
+ }
+
+ public synchronized CDOSession getSession()
+ {
+ if (session == null)
+ {
+ session = openSession();
+ session.addListener(sessionListener);
+ }
+
+ return session;
+ }
+
+ public boolean isConnected()
+ {
+ return isActive();
+ }
+
+ public void disconnect()
+ {
+ if (session != null)
+ {
+ session.removeListener(sessionListener);
+
+ while (isActive())
+ {
+ deactivate();
+ }
+ }
+ }
+
+ public CDOCheckout[] getCheckouts()
+ {
+ synchronized (checkouts)
+ {
+ return checkouts.toArray(new CDOCheckout[checkouts.size()]);
+ }
+ }
+
+ public void addCheckout(CDOCheckout checkout)
+ {
+ synchronized (checkouts)
+ {
+ checkouts.add(checkout);
+ }
+ }
+
+ public boolean isEmpty()
+ {
+ if (session != null)
+ {
+ return session.getBranchManager().getMainBranch().isEmpty();
+ }
+
+ return false;
+ }
+
+ public CDOBranch[] getElements()
+ {
+ return getSession().getBranchManager().getMainBranch().getBranches();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+
+ if (obj instanceof CDORepository)
+ {
+ CDORepository that = (CDORepository)obj;
+ return ObjectUtil.equals(getConnectorType(), that.getConnectorType())
+ && ObjectUtil.equals(getConnectorDescription(), that.getConnectorDescription())
+ && ObjectUtil.equals(repositoryName, that.getRepositoryName());
+ }
+
+ return false;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return ObjectUtil.hashCode(getConnectorType()) ^ ObjectUtil.hashCode(getConnectorDescription())
+ ^ ObjectUtil.hashCode(repositoryName);
+ }
+
+ @Override
+ public String toString()
+ {
+ int refCount = LifecycleUtil.getRefCount(this);
+ return getConnectorType() + "://" + getConnectorDescription() + "/" + repositoryName + " [" + refCount + "]";
+ }
+
+ @Override
+ protected void doDeactivate() throws Exception
+ {
+ session.close();
+ session = null;
+
+ super.doDeactivate();
+ }
+
+ protected IManagedContainer getContainer()
+ {
+ return IPluginContainer.INSTANCE;
+ }
+
+ protected IConnector getConnector()
+ {
+ IManagedContainer container = getContainer();
+ return Net4jUtil.getConnector(container, getConnectorType(), getConnectorDescription());
+ }
+
+ protected CDOSessionConfiguration createSessionConfiguration()
+ {
+ IConnector connector = getConnector();
+
+ CDONet4jSessionConfiguration config = CDONet4jUtil.createNet4jSessionConfiguration();
+ config.setConnector(connector);
+ config.setRepositoryName(repositoryName);
+ return config;
+ }
+
+ protected CDOSession openSession()
+ {
+ CDOSessionConfiguration sessionConfiguration = createSessionConfiguration();
+ sessionConfiguration.setPassiveUpdateEnabled(true);
+ sessionConfiguration.setPassiveUpdateMode(PassiveUpdateMode.CHANGES);
+
+ CDOSession session = sessionConfiguration.openSession();
+ session.options().setGeneratedPackageEmulationEnabled(true);
+ return session;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryManagerImpl.java
new file mode 100644
index 0000000000..eca4861783
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDORepositoryManagerImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.explorer.CDORepositoryManager;
+
+import org.eclipse.net4j.util.container.SetContainer;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDORepositoryManagerImpl extends SetContainer<CDORepository> implements CDORepositoryManager
+{
+ public CDORepositoryManagerImpl()
+ {
+ super(CDORepository.class);
+ }
+
+ public CDORepository[] getRepositories()
+ {
+ return getElements();
+ }
+
+ public CDORepository addRemoteRepository(String label, String repositoryName, String connectorType,
+ String connectorDescription)
+ {
+ RemoteCDORepository repository = new RemoteCDORepository(this, label, repositoryName, connectorType,
+ connectorDescription);
+ addElement(repository);
+ return repository;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/OnlineCDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/OnlineCDOCheckout.java
new file mode 100644
index 0000000000..93211241c2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/OnlineCDOCheckout.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.explorer.CDOCheckoutManager;
+import org.eclipse.emf.cdo.explorer.CDORepository;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.view.CDOView;
+
+/**
+ * @author Eike Stepper
+ */
+public class OnlineCDOCheckout extends CDOCheckoutImpl
+{
+ public OnlineCDOCheckout(CDOCheckoutManager checkoutManager, CDORepository repository, String branchPath,
+ long timeStamp, boolean readOnly, CDOID rootID, String label)
+ {
+ super(checkoutManager, repository, branchPath, timeStamp, readOnly, rootID, label);
+ }
+
+ @Override
+ protected CDOView openView()
+ {
+ CDORepository repository = getRepository();
+ CDOSession session = repository.getSession();
+
+ String branchPath = getBranchPath();
+
+ CDOBranchManager branchManager = session.getBranchManager();
+ CDOBranch branch = branchManager.getBranch(branchPath);
+
+ if (isReadOnly())
+ {
+ long timeStamp = getTimeStamp();
+ return session.openView(branch, timeStamp);
+ }
+
+ return session.openTransaction(branch);
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/RemoteCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/RemoteCDORepository.java
new file mode 100644
index 0000000000..59b79f816b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/RemoteCDORepository.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.internal.explorer;
+
+import org.eclipse.emf.cdo.explorer.CDORepositoryManager;
+
+/**
+ * @author Eike Stepper
+ */
+public class RemoteCDORepository extends CDORepositoryImpl
+{
+ private String connectorType;
+
+ private String connectorDescription;
+
+ public RemoteCDORepository(CDORepositoryManager repositoryManager, String label, String repositoryName,
+ String connectorType, String connectorDescription)
+ {
+ super(repositoryManager, label, repositoryName);
+ this.connectorType = connectorType;
+ this.connectorDescription = connectorDescription;
+ }
+
+ public final String getConnectorType()
+ {
+ return connectorType;
+ }
+
+ public final String getConnectorDescription()
+ {
+ return connectorDescription;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
index ce0551318e..e7c7df1919 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
@@ -11,15 +11,17 @@
*/
package org.eclipse.emf.cdo.internal.explorer.bundle;
+import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
+
import org.eclipse.net4j.util.om.OMBundle;
import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.log.OMLogger;
import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
/**
* The <em>Operations & Maintenance</em> class of this bundle.
- *
+ *
* @author Eike Stepper
*/
public abstract class OM
@@ -35,14 +37,18 @@ public abstract class OM
/**
* @author Eike Stepper
*/
- public static final class Activator extends UIActivator
+ public static final class Activator extends OSGiActivator
{
- public static Activator INSTANCE;
-
public Activator()
{
super(BUNDLE);
- INSTANCE = this;
+ }
+
+ @Override
+ protected void doStop() throws Exception
+ {
+ CDOExplorerUtil.disposeRepositoryManager();
+ super.doStop();
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDOCheckoutProvider.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDOCheckoutProvider.java
new file mode 100644
index 0000000000..b9f0b3991f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDOCheckoutProvider.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.spi.explorer;
+
+import org.eclipse.emf.cdo.explorer.CDOCheckout;
+
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.factory.ProductCreationException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Provides the behaviour of {@link CDOCheckout checkouts}.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ */
+public class CDOCheckoutProvider
+{
+
+ /**
+ * @author Eike Stepper
+ */
+ public static abstract class Factory extends org.eclipse.net4j.util.factory.Factory
+ {
+ public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.explorer.checkoutProviders";
+
+ public Factory(String type)
+ {
+ super(PRODUCT_GROUP, type);
+ }
+
+ public abstract CDOCheckoutProvider create(String description) throws ProductCreationException;
+
+ public static CDOCheckoutProvider getRepositoryProvider(String type)
+ {
+ Object element = IPluginContainer.INSTANCE.getElement(PRODUCT_GROUP, type, null);
+ if (element instanceof CDOCheckoutProvider)
+ {
+ return (CDOCheckoutProvider)element;
+ }
+
+ return null;
+ }
+
+ public static CDOCheckoutProvider[] getRepositoryProviders()
+ {
+ List<CDOCheckoutProvider> providers = new ArrayList<CDOCheckoutProvider>();
+ for (String type : IPluginContainer.INSTANCE.getFactoryTypes(PRODUCT_GROUP))
+ {
+ Object element = IPluginContainer.INSTANCE.getElement(PRODUCT_GROUP, type, null);
+ if (element instanceof CDOCheckoutProvider)
+ {
+ CDOCheckoutProvider provider = (CDOCheckoutProvider)element;
+ providers.add(provider);
+ }
+ }
+
+ return providers.toArray(new CDOCheckoutProvider[providers.size()]);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDORepositoryProvider.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDORepositoryProvider.java
new file mode 100644
index 0000000000..146c792cc1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/spi/explorer/CDORepositoryProvider.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010-2012 Eike Stepper (Berlin, 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.spi.explorer;
+
+import org.eclipse.emf.cdo.explorer.CDORepository;
+
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.factory.ProductCreationException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Provides the behaviour of {@link CDORepository repositories}.
+ *
+ * @author Eike Stepper
+ * @since 4.4
+ */
+public class CDORepositoryProvider
+{
+
+ /**
+ * @author Eike Stepper
+ */
+ public static abstract class Factory extends org.eclipse.net4j.util.factory.Factory
+ {
+ public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.explorer.repositoryProviders";
+
+ public Factory(String type)
+ {
+ super(PRODUCT_GROUP, type);
+ }
+
+ public abstract CDORepositoryProvider create(String description) throws ProductCreationException;
+
+ public static CDORepositoryProvider getRepositoryProvider(String type)
+ {
+ Object element = IPluginContainer.INSTANCE.getElement(PRODUCT_GROUP, type, null);
+ if (element instanceof CDORepositoryProvider)
+ {
+ return (CDORepositoryProvider)element;
+ }
+
+ return null;
+ }
+
+ public static CDORepositoryProvider[] getRepositoryProviders()
+ {
+ List<CDORepositoryProvider> providers = new ArrayList<CDORepositoryProvider>();
+ for (String type : IPluginContainer.INSTANCE.getFactoryTypes(PRODUCT_GROUP))
+ {
+ Object element = IPluginContainer.INSTANCE.getElement(PRODUCT_GROUP, type, null);
+ if (element instanceof CDORepositoryProvider)
+ {
+ CDORepositoryProvider provider = (CDORepositoryProvider)element;
+ providers.add(provider);
+ }
+ }
+
+ return providers.toArray(new CDORepositoryProvider[providers.size()]);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
index 6107ea0e58..c35bbf8a5b 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.migrator;singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.importer;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.emf.cdo.internal.messages;version="3.0.200";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator;version="3.0.400";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.actions;version="3.0.400";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.400";x-internal:=true
+ org.eclipse.emf.cdo.internal.migrator;version="3.0.500";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.actions;version="3.0.500";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif
index dad78b27a8..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif
+++ b/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.release/release.properties b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
index bbe55a05ea..8460c38719 100644
--- a/plugins/org.eclipse.emf.cdo.releng.release/release.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
@@ -1,6 +1,6 @@
#
-#Sun Jan 25 08:11:33 CET 2015
-root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.installer org.eclipse.emf.cdo.releng.ui org.eclipse.net4j.util org.eclipse.emf.cdo.releng.all-feature
+#Sun Jan 25 11:13:10 CET 2015
baseline.for.integration=true
+root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.installer org.eclipse.emf.cdo.releng.ui org.eclipse.net4j.util org.eclipse.emf.cdo.releng.all-feature
+ignored.references=org.eclipse.emf.cdo.examples.installer.client org.eclipse.emf.cdo.examples.installer.clone org.eclipse.emf.cdo.examples.installer.master org.eclipse.net4j.db.derby org.apache.derby org.eclipse.emf.cdo.server.objectivity org.eclipse.emf.cdo.server.objectivity.stub org.eclipse.emf.cdo.tests.objectivity org.eclipse.emf.cdo.efs org.eclipse.emf.cdo.ui.efs org.eclipse.emf.cdo.ui.ide org.eclipse.emf.cdo.ui.team org.eclipse.emf.cdo.ui.workspace org.eclipse.emf.cdo.team org.eclipse.emf.cdo.workspace.efs org.eclipse.emf.cdo.location org.eclipse.emf.cdo.ui.location org.apache.commons.codec
show.deviations=false
-ignored.references=org.eclipse.emf.cdo.examples.installer.client org.eclipse.emf.cdo.examples.installer.clone org.eclipse.emf.cdo.examples.installer.master org.eclipse.net4j.db.derby org.apache.derby org.eclipse.emf.cdo.server.objectivity org.eclipse.emf.cdo.server.objectivity.stub org.eclipse.emf.cdo.tests.objectivity org.eclipse.emf.cdo.efs org.eclipse.emf.cdo.ui.efs org.eclipse.emf.cdo.ui.ide org.eclipse.emf.cdo.ui.team org.eclipse.emf.cdo.ui.workspace org.eclipse.emf.cdo.team org.eclipse.emf.cdo.workspace.efs org.eclipse.emf.cdo.location org.eclipse.emf.cdo.ui.location
diff --git a/plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch
index 9bde997dab..ab905a5e31 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.launch
@@ -26,13 +26,13 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1g&#13;&#10;-Ddebug=true&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c&#10;&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust&#13;&#10;&#10;-Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys&#10;&#13;&#10;-Dorg.eclipse.emf.cdo.server.browser.port=7777&#13;&#10;-Dorg.osgi.service.http.port=8080"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1g&#13;&#10;-Ddebug=true&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c&#10;&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust&#13;&#10;&#10;-Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys&#10;&#13;&#10;-Dorg.eclipse.emf.cdo.server.browser.port=7777&#13;&#10;-Dorg.osgi.service.http.port=8080&#13;&#10;-Dosgi.checkConfiguration=false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.eclipse.emf.cdo.server.product}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.mysql.jdbc@default:default,javax.xml@default:default,org.apache.derby@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi@-1:true,org.h2@default:default,org.hsqldb@default:default,org.postgresql@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j.db.postgresql@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db*4.4.0.qualifier@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j.db.postgresql@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
index 9a216a96fe..a0623e833d 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.product;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_16.gif b/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_16.gif
index dacd1f7db4..b0c61ae9b5 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_16.gif
+++ b/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_16.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_32.gif b/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_32.gif
index a84b5a78f4..03fc3da087 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_32.gif
+++ b/plugins/org.eclipse.emf.cdo.server.product/icons/alt_window_32.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
index f85dfe7ce0..66f9f52853 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.admin;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.ui.internal.admin;version="4.1.200";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.actions;version="4.1.200";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.bundle;version="4.1.200";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.messages;version="4.1.200";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.wizards;version="4.1.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.internal.admin;version="4.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.actions;version="4.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.bundle;version="4.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.messages;version="4.1.300";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.wizards;version="4.1.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/ctool16/create_repo.gif b/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/ctool16/create_repo.gif
index 2a3a2bafb3..a907711090 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/ctool16/create_repo.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/ctool16/create_repo.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/view16/admin_view.gif b/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/view16/admin_view.gif
index fb77b5926c..38e7444e7d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/view16/admin_view.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/icons/full/view16/admin_view.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.efs/META-INF/MANIFEST.MF
index debe67ae98..9a54d1babd 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.efs;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.ui.efs.wizards;version="4.1.100",
- org.eclipse.emf.cdo.ui.internal.efs.bundle;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.efs.wizards;version="4.1.200",
+ org.eclipse.emf.cdo.ui.internal.efs.bundle;version="4.1.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResource.gif
index 6bcbef8bc3..2bd1c182c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResourceFolder.gif
index 0afa73e8b9..6fb9345b2a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/elcl16/NewCDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResource.gif
index acd9c16732..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResourceFolder.gif
index aa98255c29..152ce470c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/CDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/cdo_session.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/cdo_session.gif
index 672ae6ea34..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/cdo_session.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/cdo_session.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository.gif
index 0470e1588d..347acb017a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository_content.gif b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository_content.gif
index 672ae6ea34..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository_content.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.efs/icons/full/obj16/repository_content.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
index de56a1c41c..2164d783f0 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.ide;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.1.100",
- org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.1.200",
+ org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.1.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/cdo_session.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/cdo_session.gif
index 672ae6ea34..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/cdo_session.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/cdo_session.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository.gif
index 0470e1588d..347acb017a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository_content.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository_content.gif
index 672ae6ea34..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository_content.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/repository_content.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
index e7b78b8534..a6b4dbdaf1 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.shared;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
Bundle-Activator: org.eclipse.emf.cdo.ui.internal.shared.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.2.0",
- org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.2.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.2.100",
+ org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.2.100";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif
deleted file mode 100644
index 0b47c128eb..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif
deleted file mode 100644
index 094452ca19..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif
deleted file mode 100644
index 138d0e9853..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif
deleted file mode 100644
index 31d8ff5d8f..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif
deleted file mode 100644
index 4499ad076d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif
deleted file mode 100644
index 52ef67722a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif
deleted file mode 100644
index 061161ae1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif
deleted file mode 100644
index 6b635b03d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif
deleted file mode 100644
index c876ebd2fd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif
deleted file mode 100644
index b226e41c52..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif
deleted file mode 100644
index 2e4de3d12a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif
deleted file mode 100644
index 4499ad076d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif
deleted file mode 100644
index 05ef403308..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif
deleted file mode 100644
index 061161ae1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif
deleted file mode 100644
index 6b635b03d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif
deleted file mode 100644
index c876ebd2fd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif
deleted file mode 100644
index b11bfe201e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif
deleted file mode 100644
index 2a3eb9190a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif
deleted file mode 100644
index ead314f664..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif
deleted file mode 100644
index c77fa1308d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif
deleted file mode 100644
index feb8e94a74..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif
deleted file mode 100644
index c5f904abb8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif
deleted file mode 100644
index 87827af379..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif
deleted file mode 100644
index b2361a3a05..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif
deleted file mode 100644
index c13bea1ca4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif
deleted file mode 100644
index 0470e1588d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif
deleted file mode 100644
index 7ef3c2c80b..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif
deleted file mode 100644
index 753cad744c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif
deleted file mode 100644
index 136235eeaa..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif
deleted file mode 100644
index c984fba703..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif
deleted file mode 100644
index 4fc84e4c3a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif
deleted file mode 100644
index 89c33404b6..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif
deleted file mode 100644
index aca952208a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif
deleted file mode 100644
index 3bd4e36057..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif
deleted file mode 100644
index 2069e1d409..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif
index db46589ff6..f878bfccce 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif
index fb07e41fe6..511947db88 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif
index 6968b7a7ba..995960173e 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif
index 59c8198265..cc894f85d2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif
index ff5fb0b0bc..2f5c593188 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif
index c00723b9dd..d17578de3a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif
index 979c352bbf..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif
index 432505ee12..6ae0d51025 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif
index fc15f1f52c..b7fdc9bf36 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif
index d678903420..347acb017a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif
index dacd1f7db4..b0c61ae9b5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif
index 979c352bbf..aab84f2e0b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gif
index dacd1f7db4..b0c61ae9b5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/locations.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif
index 083c5fcee6..f5cd082e28 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 8bd42cac5c..09097d94b0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -23,7 +23,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -nosplash&#13;&#10;-console"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -nosplash&#13;&#10;-console&#13;&#10;-clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1g&#13;&#10;-Dosgi.console.enable.builtin=true&#13;&#10;-Dosgi.checkConfiguration=false"/>
<stringAttribute key="pde.version" value="3.3"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
index 35b9a252b5..0313f9168e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
@@ -24,7 +24,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -nosplash&#13;&#10;-console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1g&#13;&#10;-Dosgi.console.enable.builtin=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1g&#13;&#10;-Dosgi.console.enable.builtin=true&#13;&#10;-Dosgi.checkConfiguration=false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index fbd44670ee..0dc08c68a3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -31,6 +31,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui;version="4.3.100";
@@ -40,6 +41,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.actions;version="4.3.100";
@@ -49,6 +51,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.dialogs;version="4.3.100";
@@ -58,6 +61,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.dnd;version="4.3.100";
@@ -67,6 +71,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.editor;version="4.3.100";
@@ -76,6 +81,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.filters;version="4.3.100";
@@ -85,6 +91,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.history;version="4.3.100";
@@ -94,6 +101,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.perspectives;version="4.3.100";
@@ -103,6 +111,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.preferences;version="4.3.100";
@@ -112,6 +121,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.transfer;version="4.3.100";
@@ -121,6 +131,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.internal.ui.views;version="4.3.100";
@@ -130,6 +141,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="4.3.100";x-inter
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
+ org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
org.eclipse.emf.cdo.ui;version="4.3.100",
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
index 560f25470f..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index 8ceea9a98e..c59f3650dc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -61,7 +61,7 @@ _WARN_FilenameExtensions = The file name must have one of the following extensio
category.name.0 = CDO
view.name.0 = CDO Sessions
view.name.1 = CDO Watch List
-view.name.2 = CDO Remote Sessions
+view.name.2 = CDO Collaboration
editor.name.0 = CDO Editor
page.name.0 = CDO
page.name.1 = User Interface
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
index 8324c5ee8f..a193aa6b16 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.util.ui;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.5.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -15,19 +15,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.util.internal.ui;version="3.4.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.actions;version="3.4.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.bundle;version="3.4.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.messages;version="3.4.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.views;version="3.4.0";x-internal:=true,
- org.eclipse.net4j.util.ui;version="3.4.0",
- org.eclipse.net4j.util.ui.actions;version="3.4.0",
- org.eclipse.net4j.util.ui.confirmation;version="3.4.0",
- org.eclipse.net4j.util.ui.container;version="3.4.0",
- org.eclipse.net4j.util.ui.dnd;version="3.4.0",
- org.eclipse.net4j.util.ui.handlers;version="3.4.0",
- org.eclipse.net4j.util.ui.prefs;version="3.4.0",
- org.eclipse.net4j.util.ui.proposals;version="3.4.0",
- org.eclipse.net4j.util.ui.security;version="3.4.0",
- org.eclipse.net4j.util.ui.views;version="3.4.0",
- org.eclipse.net4j.util.ui.widgets;version="3.4.0"
+Export-Package: org.eclipse.net4j.util.internal.ui;version="3.5.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.actions;version="3.5.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.bundle;version="3.5.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.messages;version="3.5.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.views;version="3.5.0";x-internal:=true,
+ org.eclipse.net4j.util.ui;version="3.5.0",
+ org.eclipse.net4j.util.ui.actions;version="3.5.0",
+ org.eclipse.net4j.util.ui.confirmation;version="3.5.0",
+ org.eclipse.net4j.util.ui.container;version="3.5.0",
+ org.eclipse.net4j.util.ui.dnd;version="3.5.0",
+ org.eclipse.net4j.util.ui.handlers;version="3.5.0",
+ org.eclipse.net4j.util.ui.prefs;version="3.5.0",
+ org.eclipse.net4j.util.ui.proposals;version="3.5.0",
+ org.eclipse.net4j.util.ui.security;version="3.5.0",
+ org.eclipse.net4j.util.ui.views;version="3.5.0",
+ org.eclipse.net4j.util.ui.widgets;version="3.5.0"
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index 8f820c8f36..9af64046e7 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -70,6 +70,20 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
return rootElementFilter;
}
+ @Override
+ public boolean hasChildren(Object element)
+ {
+ try
+ {
+ Node node = getNode(element);
+ return node.hasChildren();
+ }
+ catch (RuntimeException ex)
+ {
+ return false;
+ }
+ }
+
public Object[] getChildren(Object element)
{
try
@@ -185,6 +199,14 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
{
}
+ /**
+ * @since 3.5
+ */
+ protected Object[] getContainerChildren(IContainer<?> container)
+ {
+ return container.getElements();
+ }
+
protected Node getRoot()
{
return root;
@@ -263,6 +285,15 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
}
/**
+ * @since 3.5
+ */
+ @SuppressWarnings("unchecked")
+ protected ContainerItemProvider<CONTAINER>.LazyElement createLazyElement(IContainer<?> container)
+ {
+ return new LazyElement((IContainer<Object>)container);
+ }
+
+ /**
* @since 3.1
*/
protected boolean isSlow(IContainer<Object> container)
@@ -357,6 +388,8 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
/**
* @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface Node
{
@@ -368,6 +401,11 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
public Node getParent();
+ /**
+ * @since 3.5
+ */
+ public boolean hasChildren();
+
public List<Node> getChildren();
public TreePath getTreePath();
@@ -420,6 +458,14 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
return parentPath.createChildPath(getElement());
}
+ /**
+ * @since 3.5
+ */
+ public boolean hasChildren()
+ {
+ return false;
+ }
+
protected void checkNotDisposed()
{
if (disposed)
@@ -512,6 +558,24 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
}
}
+ /**
+ * @since 3.4
+ */
+ @Override
+ public boolean hasChildren()
+ {
+ checkNotDisposed();
+
+ final IContainer<Object> container = getContainer();
+ if (children == null && isSlow(container))
+ {
+ return true;
+ }
+
+ List<Node> children = getChildren();
+ return children != null && !children.isEmpty();
+ }
+
public final List<Node> getChildren()
{
checkNotDisposed();
@@ -536,8 +600,13 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
if (isSlow(container))
{
- final LazyElement lazyElement = new LazyElement(container);
- addChild(children, lazyElement);
+ final Node[] lazyNode = { null };
+
+ LazyElement lazyElement = createLazyElement(container);
+ if (lazyElement != null)
+ {
+ lazyNode[0] = addChild(children, lazyElement);
+ }
Runnable runnable = new Runnable()
{
@@ -554,8 +623,11 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
}
finally
{
- Node node = removeNode(lazyElement);
- children.remove(node);
+ if (lazyNode[0] != null)
+ {
+ children.remove(lazyNode[0]);
+ }
+
refreshElement(container, false);
}
}
@@ -577,7 +649,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
*/
protected void fillChildren(List<Node> children, IContainer<Object> container)
{
- Object[] elements = container.getElements();
+ Object[] elements = getContainerChildren(container);
for (int i = 0; i < elements.length; i++)
{
Object element = elements[i];
@@ -696,11 +768,22 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
*/
public class LazyElement
{
- private IContainer<Object> container;
+ private final IContainer<Object> container;
- public LazyElement(IContainer<Object> container)
+ private final String text;
+
+ /**
+ * @since 3.5
+ */
+ public LazyElement(IContainer<Object> container, String text)
{
this.container = container;
+ this.text = text;
+ }
+
+ public LazyElement(IContainer<Object> container)
+ {
+ this(container, getSlowText(container));
}
public IContainer<Object> getContainer()
@@ -711,7 +794,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
@Override
public String toString()
{
- return getSlowText(container);
+ return text;
}
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index 4fcbee3944..40e80b78b5 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -101,13 +101,14 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
public void resetInput()
{
+ final IContainer<?> container = getContainer();
+
Runnable runnable = new Runnable()
{
public void run()
{
try
{
- IContainer<?> container = getContainer();
viewer.setInput(container);
}
catch (RuntimeException ignore)
@@ -267,7 +268,7 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
return new ContainerItemProvider<IContainer<Object>>(getRootElementFilter())
- {
+ {
@Override
public Image getImage(Object obj)
{
@@ -327,7 +328,7 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
return font;
}
- };
+ };
}
protected String getElementText(Object element)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java
index 694cccbc3f..a62c78733b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java
@@ -10,6 +10,10 @@
*/
package org.eclipse.net4j.util.concurrent;
+import org.eclipse.net4j.util.container.IManagedContainer;
+
+import java.util.concurrent.ExecutorService;
+
/**
* @author Eike Stepper
*/
@@ -42,4 +46,12 @@ public final class ConcurrencyUtil
return;
}
}
+
+ /**
+ * @since 3.5
+ */
+ public static ExecutorService getExecutorService(IManagedContainer container)
+ {
+ return ExecutorServiceFactory.get(container);
+ }
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerPersistence.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerPersistence.java
index b7a4cd8ed4..de81202291 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerPersistence.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerPersistence.java
@@ -16,9 +16,6 @@ import org.eclipse.net4j.util.io.IOUtil;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
@@ -84,34 +81,4 @@ public abstract class ContainerPersistence<E> implements Persistence<E>
protected abstract InputStream openInputStream() throws IOException;
protected abstract OutputStream openOutputStream() throws IOException;
-
- /**
- * @author Eike Stepper
- */
- public static class FileContainerPersistence<E> extends ContainerPersistence<E>
- {
- private final File file;
-
- public FileContainerPersistence(File file)
- {
- this.file = file;
- }
-
- public final File getFile()
- {
- return file;
- }
-
- @Override
- protected InputStream openInputStream() throws IOException
- {
- return new FileInputStream(file);
- }
-
- @Override
- protected OutputStream openOutputStream() throws IOException
- {
- return new FileOutputStream(file);
- }
- }
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FileContainerPersistence.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FileContainerPersistence.java
new file mode 100644
index 0000000000..cb3fb04989
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FileContainerPersistence.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2004-2014 Eike Stepper (Berlin, 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.net4j.util.container;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * @author Eike Stepper
+ * @since 3.5
+ */
+public class FileContainerPersistence<E> extends ContainerPersistence<E>
+{
+ private final File file;
+
+ public FileContainerPersistence(File file)
+ {
+ this.file = file;
+ }
+
+ public final File getFile()
+ {
+ return file;
+ }
+
+ @Override
+ protected InputStream openInputStream() throws IOException
+ {
+ return new FileInputStream(file);
+ }
+
+ @Override
+ protected OutputStream openOutputStream() throws IOException
+ {
+ return new FileOutputStream(file);
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
index 0d3be1950b..d3b33e8801 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
@@ -113,7 +113,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
{
if (set.add(element))
{
- addedElement(element);
+ elementAdded(element);
event = newContainerEvent(element, IContainerDelta.Kind.ADDED);
notifyAll();
}
@@ -122,7 +122,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
if (event != null)
{
fireEvent(event);
- modifiedContainer();
+ containerModified();
return true;
}
@@ -150,7 +150,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
{
if (set.add(element))
{
- addedElement(element);
+ elementAdded(element);
if (event == null)
{
@@ -170,7 +170,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
if (event != null)
{
fireEvent(event);
- modifiedContainer();
+ containerModified();
return true;
}
@@ -184,7 +184,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
{
if (set.remove(element))
{
- removedElement(element);
+ elementRemoved(element);
event = newContainerEvent(element, IContainerDelta.Kind.REMOVED);
notifyAll();
}
@@ -193,7 +193,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
if (event != null)
{
fireEvent(event);
- modifiedContainer();
+ containerModified();
return true;
}
@@ -212,7 +212,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
{
if (set.remove(element))
{
- removedElement(element);
+ elementRemoved(element);
if (event == null)
{
@@ -232,7 +232,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
if (event != null)
{
fireEvent(event);
- modifiedContainer();
+ containerModified();
return true;
}
@@ -248,7 +248,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
{
if (set.contains(element))
{
- removedElement(element);
+ elementRemoved(element);
if (event == null)
{
@@ -268,7 +268,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
if (event != null)
{
fireEvent(event);
- modifiedContainer();
+ containerModified();
}
}
@@ -341,7 +341,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
*
* @since 3.5
*/
- protected void modifiedContainer()
+ protected void containerModified()
{
if (isSavedWhenModified())
{
@@ -354,7 +354,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
*
* @since 3.5
*/
- protected void addedElement(E element)
+ protected void elementAdded(E element)
{
}
@@ -363,7 +363,7 @@ public class SetContainer<E> extends Container<E> implements IContainer.Modifiab
*
* @since 3.5
*/
- protected void removedElement(E element)
+ protected void elementRemoved(E element)
{
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index 743287d3da..0ca5c2d5e1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -42,16 +42,16 @@ public final class LifecycleUtil
}
/**
- * @since 3.2
+ * @since 3.5
*/
- public static boolean isDeferredActivation(Object object)
+ public static int getRefCount(Object object)
{
- if (object instanceof ILifecycle.DeferrableActivation)
+ if (object instanceof ShareableLifecycle)
{
- return ((ILifecycle.DeferrableActivation)object).isDeferredActivation();
+ return ((ShareableLifecycle)object).refCount.get();
}
- return false;
+ return 0;
}
/**
@@ -67,6 +67,19 @@ public final class LifecycleUtil
return LifecycleState.ACTIVE;
}
+ /**
+ * @since 3.2
+ */
+ public static boolean isDeferredActivation(Object object)
+ {
+ if (object instanceof ILifecycle.DeferrableActivation)
+ {
+ return ((ILifecycle.DeferrableActivation)object).isDeferredActivation();
+ }
+
+ return false;
+ }
+
public static boolean isActive(Object object)
{
if (object instanceof ILifecycle)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ShareableLifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ShareableLifecycle.java
index 55e077a5a4..6a7c6ff3ff 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ShareableLifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ShareableLifecycle.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class ShareableLifecycle extends Lifecycle
{
- private AtomicInteger refCount;
+ AtomicInteger refCount;
public ShareableLifecycle()
{

Back to the top