Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.location/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.location/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.location/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationItemProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/SharedIcons.java98
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.cvsignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.options3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.project44
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs360
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs120
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.pde.api.tools.prefs94
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/build.properties22
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif)bin376 -> 376 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/adapter.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif)bin196 -> 196 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif)bin274 -> 274 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif)bin318 -> 318 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif)bin198 -> 198 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif)bin202 -> 202 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif)bin115 -> 115 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif)bin79 -> 79 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif)bin561 -> 561 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif)bin597 -> 597 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif)bin157 -> 157 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif)bin354 -> 354 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif)bin582 -> 582 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif)bin115 -> 115 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif)bin112 -> 112 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif)bin561 -> 561 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif)bin597 -> 597 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif)bin157 -> 157 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif)bin247 -> 247 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif)bin583 -> 583 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif)bin152 -> 152 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif)bin607 -> 607 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif)bin210 -> 210 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif)bin211 -> 211 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif)bin219 -> 219 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif)bin198 -> 198 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif)bin564 -> 564 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif)bin1027 -> 1027 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif)bin325 -> 325 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif)bin588 -> 588 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif)bin545 -> 545 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif)bin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif)bin591 -> 591 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif)bin235 -> 235 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif)bin368 -> 368 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif)bin594 -> 594 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif)bin560 -> 560 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif)bin1031 -> 1031 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif)bin535 -> 535 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif)bin164 -> 164 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/clock.png (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/clock.png)bin891 -> 891 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/delete.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif)bin351 -> 351 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_editor.gif)bin367 -> 367 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_session.gif)bin375 -> 375 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/slider.png (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/slider.png)bin841 -> 841 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif)bin346 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResource.gif)bin345 -> 345 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResourceFolder.gif)bin342 -> 342 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EClass.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif)bin206 -> 206 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackage.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif)bin207 -> 207 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageConverted.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif)bin211 -> 211 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageDynamic.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageDynamic.gif)bin364 -> 364 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageLegacy.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif)bin207 -> 207 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageNative.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif)bin207 -> 207 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageUnknown.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageUnknown.gif)bin207 -> 207 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EditorModelFile.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif)bin346 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/add.gif (renamed from plugins/org.eclipse.emf.cdo.ui.location/icons/add.gif)bin318 -> 318 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branch.png (renamed from plugins/org.eclipse.emf.cdo.ui.location/icons/branch.png)bin591 -> 591 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor.gif)bin345 -> 345 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_historical.gif)bin372 -> 372 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readonly.gif)bin369 -> 369 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readwrite.gif)bin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session.gif)bin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session_offline.gif)bin380 -> 380 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session_syncing.gif)bin379 -> 379 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif (renamed from plugins/org.eclipse.emf.cdo.ui.location/icons/repo.gif)bin503 -> 503 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif (renamed from plugins/org.eclipse.emf.cdo.ui.location/icons/repos.gif)bin588 -> 588 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/error.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/ovr16/error.gif)bin84 -> 84 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/warning.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/ovr16/warning.gif)bin116 -> 116 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/.cvsignore (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/view16/cdo_sessions.gif)bin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/view16/watch_list.gif)bin582 -> 582 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/BranchBanner.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/BranchBanner.gif)bin2668 -> 2668 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewCDO.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif)bin2462 -> 2462 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewEditor.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif)bin2462 -> 2462 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/PackageManager.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif)bin3028 -> 3028 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/ProtocolProblem.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/ProtocolProblem.gif)bin3072 -> 3072 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/TimeBanner.gif (renamed from plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/TimeBanner.gif)bin3984 -> 3984 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/plugin.properties12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/SharedIcons.java (renamed from plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java)8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/bundle/OM.java53
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF11
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BranchSelectionDialog.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/build.properties1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/plugin.xml2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/SharedIcons.java100
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/build.properties1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gifbin204 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gifbin200 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gifbin192 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gifbin318 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gifbin348 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gifbin330 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gifbin595 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gifbin573 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gifbin351 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gifbin310 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gifbin344 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gifbin215 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gifbin173 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gifbin344 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java105
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.classpath7
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.cvsignore2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.options3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.project44
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs360
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs120
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.pde.api.tools.prefs94
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/about.html28
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/about.ini15
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/about.mappings6
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/about.properties31
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/build.properties26
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/copyright.txt8
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/H.gif (renamed from plugins/org.eclipse.net4j.ui/icons/H.gif)bin101 -> 101 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/call_hierarchy.gif (renamed from plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif)bin209 -> 209 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/chat_32X32.png (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png)bin1680 -> 1680 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/chat_wizard.png (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png)bin4638 -> 4638 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_32x32.png (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png)bin1892 -> 1892 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_wizard.png (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png)bin5828 -> 5828 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/dtool16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/terminate_co.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif)bin152 -> 152 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add.gif)bin318 -> 318 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_acceptor.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif)bin381 -> 381 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_chat.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_chat.gif)bin348 -> 348 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_connector.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif)bin223 -> 223 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_contact.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_contact.gif)bin330 -> 330 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_group.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_group.gif)bin595 -> 595 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/communications.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/communications.gif)bin573 -> 573 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/delete.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/delete.gif)bin351 -> 351 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/horizontal_layout.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/horizontal_layout.gif)bin373 -> 373 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/identity.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/identity.gif)bin310 -> 310 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/messages.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/messages.gif)bin344 -> 344 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/refresh.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif)bin330 -> 330 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/terminate_co.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/terminate_co.gif)bin215 -> 215 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/vertical_layout.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/vertical_layout.gif)bin353 -> 353 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/acceptor.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif)bin376 -> 376 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/adapter.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif)bin196 -> 196 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif)bin603 -> 603 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies_alt.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif)bin598 -> 598 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif)bin308 -> 308 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_away.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif)bin542 -> 542 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_disabled.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif)bin313 -> 313 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_do_not_disturb.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif)bin329 -> 329 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_lonesome.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif)bin334 -> 334 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/channel.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif)bin198 -> 198 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/chat.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/chat.gif)bin306 -> 306 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/collaboration.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif)bin573 -> 573 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/connector.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif)bin202 -> 202 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/error.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/obj16/error.gif)bin353 -> 353 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/factory.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif)bin211 -> 211 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/folder.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif)bin219 -> 219 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/javabean.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif)bin310 -> 310 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/message.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/message.gif)bin173 -> 173 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/messages.gif (renamed from plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/messages.gif)bin344 -> 344 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/open_contacts.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif)bin382 -> 382 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/pending.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/obj16/pending.gif)bin643 -> 643 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/person.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif)bin139 -> 139 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/acceptors.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif)bin376 -> 376 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/buddies_view.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif)bin603 -> 603 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/collaborations_view.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif)bin573 -> 573 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/connectors.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif)bin202 -> 202 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/container.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif)bin202 -> 202 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif)bin159 -> 159 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean_light.gif (renamed from plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif)bin310 -> 310 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/server_explorer.gif (renamed from plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif)bin359 -> 359 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/view16/shared_editor.gif (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif)bin634 -> 634 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/.cvsignore (renamed from plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore)0
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_32X32.pngbin0 -> 1680 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_wizard.pngbin0 -> 4638 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_32x32.pngbin0 -> 1892 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_wizard.pngbin0 -> 5828 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/p2pconn_obj.gif (renamed from plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif)bin141 -> 141 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/plus.gif (renamed from plugins/org.eclipse.net4j.ui/icons/plus.gif)bin171 -> 171 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/sample.gif (renamed from plugins/org.eclipse.net4j.ui/icons/sample.gif)bin983 -> 983 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/modeling32.pngbin0 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/plugin.properties15
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/SharedIcons.java (renamed from plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java)41
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/bundle/OM.java50
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.ui/build.properties1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gifbin318 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gifbin351 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/build.properties1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gifbin318 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gifbin351 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gifbin330 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gifbin196 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gifbin211 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gifbin219 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java110
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java2
286 files changed, 1814 insertions, 509 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.location/META-INF/MANIFEST.MF
index 9fb3f971bd..b02d915207 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.location/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.location;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.util.ui;bundle-version="[3.1.0,4.0.0)";visibility:=reexport
+ org.eclipse.net4j.util.ui;bundle-version="[3.1.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.emf.cdo.ui.internal.location.bundle;version="4.0.0";x-internal:=true,
org.eclipse.emf.cdo.ui.internal.location;version="4.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/build.properties b/plugins/org.eclipse.emf.cdo.ui.location/build.properties
index af1dfc9353..61ec8a8670 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/build.properties
+++ b/plugins/org.eclipse.emf.cdo.ui.location/build.properties
@@ -10,7 +10,6 @@
# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
- icons/,\
META-INF/,\
plugin.xml,\
plugin.properties,\
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.location/plugin.xml
index c9c79c0f14..2096f5a30c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.location/plugin.xml
@@ -19,7 +19,7 @@
allowMultiple="false"
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.ui.internal.location.RepositoryLocationsView"
- icon="icons/repos.gif"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif"
id="org.eclipse.emf.cdo.ui.location.RepositoryLocationsView"
name="CDO Repositories">
</view>
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationItemProvider.java b/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationItemProvider.java
index 049c7a7e9d..5731c9eab4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationItemProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.ui.internal.location;
import org.eclipse.emf.cdo.internal.location.BranchCheckoutSource;
import org.eclipse.emf.cdo.location.IRepositoryLocation;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/SharedIcons.java
deleted file mode 100644
index 677ddda0b4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/SharedIcons.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 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.ui.internal.location;
-
-import org.eclipse.emf.cdo.ui.internal.location.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
- private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
- public static final String REPO = "repo.gif"; //$NON-NLS-1$
-
- public static final String BRANCH = "branch.png"; //$NON-NLS-1$
-
- public static Image getImage(String key)
- {
- key = mangleKey(key);
- Image image = REGISTRY.get(key);
- if (image == null)
- {
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- // For some reason, sometimes images get disposed.
- // In that case, create and put in registry again.
- if (image.isDisposed())
- {
- REGISTRY.remove(key);
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- return image;
- }
-
- public static ImageDescriptor getDescriptor(String key)
- {
- key = mangleKey(key);
- ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
- if (descriptor == null)
- {
- descriptor = createDescriptor(key);
- }
-
- return descriptor;
- }
-
- private static ImageDescriptor createDescriptor(String key)
- {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
- if (descriptor != null)
- {
- REGISTRY.put(key, descriptor);
- }
-
- return descriptor;
- }
-
- private static Display getDisplay()
- {
- Display display = Display.getCurrent();
- if (display == null)
- {
- display = Display.getDefault();
- }
-
- if (display == null)
- {
- throw new IllegalStateException("display == null"); //$NON-NLS-1$
- }
-
- return display;
- }
-
- private static String mangleKey(String key)
- {
- return "icons/" + key; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.classpath b/plugins/org.eclipse.emf.cdo.ui.shared/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.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.ui.shared/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/.cvsignore
new file mode 100644
index 0000000000..7c18d5ded9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.cvsignore
@@ -0,0 +1,2 @@
+bin
+tmp
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.options b/plugins/org.eclipse.emf.cdo.ui.shared/.options
new file mode 100644
index 0000000000..f3c30f920c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.options
@@ -0,0 +1,3 @@
+# Debugging and tracing options
+
+org.eclipse.emf.cdo.ui.shared/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.project b/plugins/org.eclipse.emf.cdo.ui.shared/.project
new file mode 100644
index 0000000000..cda2c60e5c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.ui.shared</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.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng/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.emf.cdo.releng.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..a1cef9a448
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Thu Dec 18 13:30:26 CET 2008
+eclipse.preferences.version=1
+encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f6c5987344
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,360 @@
+#Thu Feb 04 09:44:24 CET 2010
+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=disabled
+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=ignore
+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_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_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_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.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=true
+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.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.format_guardian_clause_on_one_line=false
+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_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..51145884f6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,120 @@
+#Thu Feb 04 09:44:24 CET 2010
+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=11
+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 - 2010 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.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.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.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..b050639a54
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.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.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..2f50f36c0c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.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.ui.shared/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..4fc4ff0069
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#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=Ignore
+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=Warning
+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.ui.shared/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..c6b96bb45e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.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=1
+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.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..2dcc528513
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.cdo.ui.shared;singleton:=true
+Bundle-Version: 4.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.cdo.ui.internal.icons.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.internal.icons;version="4.0.0",
+ org.eclipse.emf.cdo.ui.internal.icons.bundle;version="4.0.0";x-internal:=true
+Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.6.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/about.html b/plugins/org.eclipse.emf.cdo.ui.shared/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/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.ui.shared/build.properties b/plugins/org.eclipse.emf.cdo.ui.shared/build.properties
new file mode 100644
index 0000000000..e9335836b9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/build.properties
@@ -0,0 +1,22 @@
+# Copyright (c) 2004 - 2010 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:
+# Martin Fluegge - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ icons/,\
+ .options,\
+ about.html,\
+ copyright.txt
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/copyright.txt b/plugins/org.eclipse.emf.cdo.ui.shared/copyright.txt
new file mode 100644
index 0000000000..77d945dca6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004 - 2010 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 \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif
index a830867191..a830867191 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/acceptor.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/adapter.gif
index e8c1e6ff7e..e8c1e6ff7e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/adapter.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add.gif
index 7df3bfe7d4..7df3bfe7d4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/add_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif
index df67abd507..df67abd507 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/channel.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif
index 3b3ad7c16e..3b3ad7c16e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/connector.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif
index 4499ad076d..4499ad076d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von deadlock_ovr.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif
index 52ef67722a..52ef67722a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von doc_co.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif
index 061161ae1c..061161ae1c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von file_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif
index 6b635b03d8..6b635b03d8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von pagedmedia_props.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif
index c876ebd2fd..c876ebd2fd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Kopie von read_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif
index b226e41c52..b226e41c52 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/Resource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif
index 2e4de3d12a..2e4de3d12a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/ResourceSet.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif
index 4499ad076d..4499ad076d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/deadlock_ovr.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif
index 05ef403308..05ef403308 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/doc_co.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif
index 061161ae1c..061161ae1c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/file_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif
index 6b635b03d8..6b635b03d8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/pagedmedia_props.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif
index c876ebd2fd..c876ebd2fd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/read_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif
index b11bfe201e..b11bfe201e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/readwrite_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif
index 2a3eb9190a..2a3eb9190a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/resource_persp.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif
index ead314f664..ead314f664 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/searchhit_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif
index c77fa1308d..c77fa1308d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/textpane_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif
index feb8e94a74..feb8e94a74 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/edit/write_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif
index 955d5e87a5..955d5e87a5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/factory.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif
index 42e027c933..42e027c933 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/folder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif
index df67abd507..df67abd507 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/channel.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif
index c5f904abb8..c5f904abb8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/history_view.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif
index 87827af379..87827af379 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/launch_publish.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif
index b2361a3a05..b2361a3a05 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/properties.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif
index c13bea1ca4..c13bea1ca4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repo_rep.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif
index 0470e1588d..0470e1588d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/repository_rep.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif
index 7ef3c2c80b..7ef3c2c80b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/repo/server_explorer.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif
index 753cad744c..753cad744c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/app_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif
index 136235eeaa..136235eeaa 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/apply.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif
index c984fba703..c984fba703 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/config_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif
index 4fc84e4c3a..4fc84e4c3a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/history_working_set_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif
index 89c33404b6..89c33404b6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/launch_profile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif
index aca952208a..aca952208a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/profile_on_server.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif
index 3bd4e36057..3bd4e36057 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/resource_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif
index 2069e1d409..2069e1d409 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/time/synch_co.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/clock.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/clock.png
index 24b8ec870b..24b8ec870b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/clock.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/clock.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/delete.gif
index b6922ac11c..b6922ac11c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/delete.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_editor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_editor.gif
index db46589ff6..db46589ff6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/etool16/open_session.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/open_session.gif
index fb07e41fe6..fb07e41fe6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/etool16/slider.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/slider.png
index 518bdc1166..518bdc1166 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/slider.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/slider.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif
index d5cfa16f12..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif
index 560f25470f..560f25470f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif
index aa98255c29..aa98255c29 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EClass.gif
index 2b8da630d8..2b8da630d8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EClass.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackage.gif
index 30c5c10cc4..30c5c10cc4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackage.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageConverted.gif
index f7c0a7608a..f7c0a7608a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageConverted.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageDynamic.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageDynamic.gif
index 0b60dcc395..0b60dcc395 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageDynamic.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageDynamic.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageLegacy.gif
index ffd66cfcbe..ffd66cfcbe 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageLegacy.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageNative.gif
index 30c5c10cc4..30c5c10cc4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageNative.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageUnknown.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageUnknown.gif
index 459efb43ce..459efb43ce 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageUnknown.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EPackageUnknown.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EditorModelFile.gif
index d5cfa16f12..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/EditorModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/icons/add.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/add.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/icons/add.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/add.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/icons/branch.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branch.png
index 2dbb84a9c4..2dbb84a9c4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/icons/branch.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branch.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif
index 560f25470f..560f25470f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_editor_historical.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_historical.gif
index 59c8198265..59c8198265 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_editor_readonly.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readonly.gif
index ff5fb0b0bc..ff5fb0b0bc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_editor_readwrite.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor_readwrite.gif
index c00723b9dd..c00723b9dd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_session.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session.gif
index 979c352bbf..979c352bbf 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_session_offline.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_offline.gif
index 432505ee12..432505ee12 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/obj16/cdo_session_syncing.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_session_syncing.gif
index fc15f1f52c..fc15f1f52c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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.location/icons/repo.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repo.gif
index d678903420..d678903420 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/icons/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.location/icons/repos.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/repos.gif
index dacd1f7db4..dacd1f7db4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/icons/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/icons/full/ovr16/error.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/error.gif
index 8612eaff59..8612eaff59 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/ovr16/error.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/error.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/ovr16/warning.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/warning.gif
index 3af228ceac..3af228ceac 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/ovr16/warning.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/ovr16/warning.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/.cvsignore
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/cdo_sessions.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif
index 979c352bbf..979c352bbf 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/view16/watch_list.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif
index 083c5fcee6..083c5fcee6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/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/icons/full/wizban/BranchBanner.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/BranchBanner.gif
index a0c0971605..a0c0971605 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/BranchBanner.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/BranchBanner.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewCDO.gif
index 2054126392..2054126392 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewCDO.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewEditor.gif
index 2054126392..2054126392 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/NewEditor.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/PackageManager.gif
index 25980e99a5..25980e99a5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/PackageManager.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/ProtocolProblem.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/ProtocolProblem.gif
index 3a9dadbf25..3a9dadbf25 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/ProtocolProblem.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/ProtocolProblem.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/TimeBanner.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/TimeBanner.gif
index c2bf6ddee2..c2bf6ddee2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/TimeBanner.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/TimeBanner.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.shared/plugin.properties
new file mode 100644
index 0000000000..fa40b8015f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/plugin.properties
@@ -0,0 +1,12 @@
+# Copyright (c) 2004 - 2010 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 Client UI Shared
+providerName = Eclipse Modeling Project
+
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/SharedIcons.java
index 07dee35919..543c634430 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/SharedIcons.java
@@ -9,9 +9,9 @@
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - maintenance
*/
-package org.eclipse.emf.cdo.internal.ui;
+package org.eclipse.emf.cdo.ui.internal.icons;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
+import org.eclipse.emf.cdo.ui.internal.icons.bundle.OM;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@@ -88,6 +88,10 @@ public class SharedIcons
public static final String ETOOL_SLIDER_ICON = ETOOL + "slider" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+ public static final String REPO = OBJ + "repo.gif"; //$NON-NLS-1$
+
+ public static final String BRANCH = OBJ + "branch.png"; //$NON-NLS-1$
+
public static Image getImage(String key)
{
key = mangleKey(key);
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/bundle/OM.java
new file mode 100644
index 0000000000..6b18fbcd2c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/icons/bundle/OM.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2004 - 2010 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.ui.internal.icons.bundle;
+
+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.pref.OMPreferences;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
+/**
+ * The <em>Operations & Maintenance</em> class of this bundle.
+ *
+ * @author Martin Fluegge
+ */
+public abstract class OM
+{
+ public static final String BUNDLE_ID = "org.eclipse.emf.cdo.ui.shared"; //$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 OMTracer TEST = BUNDLE.tracer("test"); //$NON-NLS-1$
+
+ public static final OMLogger LOG = BUNDLE.logger();
+
+ public static final OMPreferences PREFS = BUNDLE.preferences();
+
+ /**
+ * @author Eike Stepper
+ */
+ public static final class Activator extends OSGiActivator
+ {
+ public static Activator INSTANCE;
+
+ public Activator()
+ {
+ super(BUNDLE);
+ INSTANCE = this;
+ }
+ }
+}
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 f983076ebb..bed0ab1794 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -18,8 +18,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
+ org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
+Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.ui.location",
org.eclipse.emf.cdo.internal.ui.actions;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
org.eclipse.emf.cdo.internal.ui.bundle;version="4.0.0";x-internal:=true,
org.eclipse.emf.cdo.internal.ui.dialogs;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.tests.ui",
@@ -30,6 +31,10 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.0.0";x-friends:="org.
org.eclipse.emf.cdo.internal.ui.perspectives;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide",
org.eclipse.emf.cdo.internal.ui.preferences;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
org.eclipse.emf.cdo.internal.ui.properties;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide",
- org.eclipse.emf.cdo.internal.ui.views;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.dawn.ui,org.eclipse.emf.cdo.tests.ui",
+ org.eclipse.emf.cdo.internal.ui.views;version="4.0.0";
+ x-friends:="org.eclipse.emf.cdo.ui.defs,
+ org.eclipse.emf.cdo.ui.ide,
+ org.eclipse.emf.cdo.dawn.ui,
+ org.eclipse.emf.cdo.tests.ui",
org.eclipse.emf.cdo.ui;version="4.0.0",
org.eclipse.emf.cdo.ui.widgets;version="4.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.ui/build.properties b/plugins/org.eclipse.emf.cdo.ui/build.properties
index 17010017ab..131314d781 100644
--- a/plugins/org.eclipse.emf.cdo.ui/build.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/build.properties
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
model/,\
- icons/,\
.options,\
about.html,\
copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 3e3132efdd..5a30fb780e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -27,21 +27,21 @@
<view
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView"
- icon="icons/full/view16/cdo_sessions.gif"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
id="org.eclipse.emf.cdo.ui.CDOSessionsView"
name="%view.name.0">
</view>
<view
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.internal.ui.views.CDOWatchListView"
- icon="icons/full/view16/watch_list.gif"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif"
id="org.eclipse.emf.cdo.ui.CDOWatchListView"
name="%view.name.1">
</view>
<view
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.internal.ui.views.CDORemoteSessionsView"
- icon="icons/full/view16/watch_list.gif"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/watch_list.gif"
id="org.eclipse.emf.cdo.ui.CDORemoteSessionsView"
name="%view.name.2">
</view>
@@ -64,7 +64,7 @@
<editor
id = "org.eclipse.emf.cdo.ui.CDOEditor"
name = "%editor.name.0"
- icon = "icons/full/obj16/cdo_editor.gif"
+ icon = "platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif"
extensions = "*"
class = "org.eclipse.emf.cdo.internal.ui.editor.CDOEditor"
contributorClass="org.eclipse.emf.cdo.internal.ui.editor.CDOActionBarContributor" >
@@ -125,7 +125,7 @@
point="org.eclipse.ui.perspectives">
<perspective
class="org.eclipse.emf.cdo.internal.ui.perspectives.CDOExplorerPerspective"
- icon="icons/full/view16/cdo_sessions.gif"
+ icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
id="org.eclipse.emf.cdo.ui.CDOExplorerPerspective"
name="%perspective.name">
</perspective>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
index 146928ebfc..d343a7b640 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.internal.ui;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.view.CDOView;
-
import org.eclipse.emf.spi.cdo.FSMUtil;
import org.eclipse.emf.spi.cdo.InternalCDOObject;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
index df2acbb61c..e00932738b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
@@ -89,10 +89,9 @@ public abstract class AbstractLockObjectsAction extends EditingDomainAction
{
public void run()
{
- MessageDialog
- .openError(
- getShell(),
- Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog.openError(
+ getShell(),
+ Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
}
});
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
index 7c1d389379..fd2440eb38 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
@@ -93,8 +93,8 @@ public class ExportResourceAction extends ViewAction
{
// Target Resource
ResourceSet resourceSet = new ResourceSetImpl();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
- Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+ .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
Resource resource = resourceSet.createResource(sourceURI);
Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
index 97de983dd0..23cb8412f1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
@@ -11,10 +11,10 @@
*/
package org.eclipse.emf.cdo.internal.ui.actions;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.dialogs.OpenAuditDialog;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index 8130c01032..15d31f1230 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -12,9 +12,9 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.LegacyModeRegistry;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
index 0853f24931..6ad336d0b1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
@@ -11,9 +11,9 @@
*/
package org.eclipse.emf.cdo.internal.ui.actions;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index 05e4465125..743e8a86c6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -87,8 +87,8 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
return ""; //$NON-NLS-1$
}
- return registry.containsKey(uri) ? null : MessageFormat.format(Messages
- .getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
+ return registry.containsKey(uri) ? null : MessageFormat.format(
+ Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
index ac3c8b6dee..f8fe671e68 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
@@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.CDOPackageTypeRegistry;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit.Type;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.ecore.EPackage;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BranchSelectionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BranchSelectionDialog.java
index 2023fae100..64b96b9f45 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BranchSelectionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BranchSelectionDialog.java
@@ -14,8 +14,8 @@ package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.common.branch.CDOBranch;
import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.ui.UIUtil;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
index 69faa9e98f..c820342e16 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
@@ -11,8 +11,8 @@
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.ui.UIUtil;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
index 017dec1a84..1f8ab76cab 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
@@ -11,8 +11,8 @@
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.cdo.ui.widgets.SessionComposite;
import org.eclipse.jface.dialogs.TitleAreaDialog;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
index f1495c8de3..975a922b09 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
@@ -13,15 +13,15 @@ package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.common.model.CDOModelUtil;
import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
-import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit.Type;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
+import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.internal.ui.actions.RegisterFilesystemPackagesAction;
import org.eclipse.emf.cdo.internal.ui.actions.RegisterGeneratedPackagesAction;
import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.ui.CDOItemProvider;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -52,8 +52,8 @@ import javax.swing.text.AbstractDocument.Content;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
index dc86ce88b0..b84cb30839 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
@@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.common.model.CDOPackageTypeRegistry;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit.Type;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.ui.UIUtil;
import org.eclipse.net4j.util.ui.widgets.BaseDialog;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index 1e5cae902d..986a4ae0b4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -120,8 +120,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
*
* @generated
*/
- protected IAction showPropertiesViewAction = new Action(PluginDelegator.INSTANCE
- .getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+ protected IAction showPropertiesViewAction = new Action(
+ PluginDelegator.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
{
@Override
public void run()
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 93d8e75e49..b5e87b401c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.dialogs.BulkAddDialog;
import org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog;
@@ -26,6 +25,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.CDOEditorInput;
import org.eclipse.emf.cdo.ui.CDOEventHandler;
import org.eclipse.emf.cdo.ui.CDOLabelProvider;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.cdo.util.CDOURIUtil;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOView;
@@ -482,8 +482,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
&& delta.getFlags() != IResourceDelta.MARKERS)
{
- Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath()
- .toString(), true), false);
+ Resource resource = resourceSet.getResource(
+ URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
if (resource != null)
{
if (delta.getKind() == IResourceDelta.REMOVED)
@@ -1551,8 +1551,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
// Select the root object in the view.
//
- contentOutlineViewer.setSelection(new StructuredSelection(CDOUtil.getResources(
- editingDomain.getResourceSet()).get(0)), true);
+ contentOutlineViewer.setSelection(
+ new StructuredSelection(CDOUtil.getResources(editingDomain.getResourceSet()).get(0)), true);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
index 9f953621eb..903f8b72a3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
@@ -84,8 +84,8 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
static public boolean isCurrent()
{
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId().equals(
- CDOExplorerPerspective.ID);
+ return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
+ .equals(CDOExplorerPerspective.ID);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
index b3f4f7ff00..196eb6d58e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
@@ -84,8 +84,8 @@ public class CDOPreferencePage extends OMPreferencePage
viewGroup.setLayoutData(UIUtil.createGridData(true, false));
new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.6")); //$NON-NLS-1$
- preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER, String
- .valueOf(CDOView.Options.NO_REVISION_PREFETCHING));
+ preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER,
+ String.valueOf(CDOView.Options.NO_REVISION_PREFETCHING));
preloadChunkSize.setLayoutData(UIUtil.createGridData(true, false));
new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.7")); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
index 7411084c67..b73246cb63 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/properties/CDOSessionPropertySource.java
@@ -55,19 +55,24 @@ public class CDOSessionPropertySource extends CDOPropertySource<CDOSession>
public CDOSessionPropertySource(CDOSession object)
{
super(object);
- addPropertyDescriptor(CATEGORY_SESSION, SESSION_ID, Messages.getString("CDOSessionPropertySource_0"), Messages.getString("CDOSessionPropertySource_3")); //$NON-NLS-1$ //$NON-NLS-2$
- addPropertyDescriptor(CATEGORY_SESSION, USER_ID, Messages.getString("CDOSessionPropertySource_4"), Messages.getString("CDOSessionPropertySource_5")); //$NON-NLS-1$ //$NON-NLS-2$
+ addPropertyDescriptor(CATEGORY_SESSION, SESSION_ID,
+ Messages.getString("CDOSessionPropertySource_0"), Messages.getString("CDOSessionPropertySource_3")); //$NON-NLS-1$ //$NON-NLS-2$
+ addPropertyDescriptor(CATEGORY_SESSION, USER_ID,
+ Messages.getString("CDOSessionPropertySource_4"), Messages.getString("CDOSessionPropertySource_5")); //$NON-NLS-1$ //$NON-NLS-2$
addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_ENABLED, Messages.getString("CDOSessionPropertySource_6"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_7")); //$NON-NLS-1$
addPropertyDescriptor(CATEGORY_SESSION, PASSIVE_UPDATE_MODE, Messages.getString("CDOSessionPropertySource_8"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_9")); //$NON-NLS-1$
- addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_NAME, Messages.getString("CDOSessionPropertySource_10"), Messages.getString("CDOSessionPropertySource_11")); //$NON-NLS-1$ //$NON-NLS-2$
- addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_UUID, Messages.getString("CDOSessionPropertySource_12"), Messages.getString("CDOSessionPropertySource_13")); //$NON-NLS-1$ //$NON-NLS-2$
+ addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_NAME,
+ Messages.getString("CDOSessionPropertySource_10"), Messages.getString("CDOSessionPropertySource_11")); //$NON-NLS-1$ //$NON-NLS-2$
+ addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_UUID,
+ Messages.getString("CDOSessionPropertySource_12"), Messages.getString("CDOSessionPropertySource_13")); //$NON-NLS-1$ //$NON-NLS-2$
addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_TYPE, Messages.getString("CDOSessionPropertySource_14"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_15")); //$NON-NLS-1$
addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_STATE, Messages.getString("CDOSessionPropertySource_16"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_17")); //$NON-NLS-1$
- addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_CREATION_TIME, Messages.getString("CDOSessionPropertySource_18"), //$NON-NLS-1$
+ addPropertyDescriptor(CATEGORY_REPOSITORY, REPOSITORY_CREATION_TIME,
+ Messages.getString("CDOSessionPropertySource_18"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_19")); //$NON-NLS-1$
addPropertyDescriptor(CATEGORY_REPOSITORY, SUPPORTING_AUDITS, Messages.getString("CDOSessionPropertySource_20"), //$NON-NLS-1$
Messages.getString("CDOSessionPropertySource_21")); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
index 09c33e785d..7bfeca7e05 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
@@ -91,8 +91,8 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio
{
try
{
- MessageDialog.openInformation(getShell(), MessageFormat.format(Messages
- .getString("CDORemoteSessionsView_0"), remoteSession), //$NON-NLS-1$
+ MessageDialog.openInformation(getShell(),
+ MessageFormat.format(Messages.getString("CDORemoteSessionsView_0"), remoteSession), //$NON-NLS-1$
new String(message.getData()));
}
catch (RuntimeException ignore)
@@ -159,8 +159,8 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio
CDORemoteSession remoteSession = (CDORemoteSession)element;
if (remoteSession.isSubscribed())
{
- InputDialog dlg = new InputDialog(getShell(), MessageFormat.format(Messages
- .getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
+ InputDialog dlg = new InputDialog(getShell(), MessageFormat.format(
+ Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
Messages.getString("CDORemoteSessionsView_2"), "", null); //$NON-NLS-1$ //$NON-NLS-2$
if (dlg.open() == InputDialog.OK)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
index 5474d2f1b3..94f34893f1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
@@ -10,9 +10,9 @@
*/
package org.eclipse.emf.cdo.ui;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IElementProcessor;
import org.eclipse.net4j.util.container.IManagedContainer;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index e9742fdb21..c1d83e84b8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.common.model.CDOPackageUnit.Type;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.actions.ChangeViewTargetAction;
import org.eclipse.emf.cdo.internal.ui.actions.CloseSessionAction;
import org.eclipse.emf.cdo.internal.ui.actions.CloseViewAction;
@@ -43,6 +42,7 @@ import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.internal.icons.SharedIcons;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.cdo.view.CDOViewTargetChangedEvent;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
index 5d43d67c33..ac95469c75 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.StringUtil;
import org.eclipse.net4j.util.event.IEvent;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
index a6579ed1fa..8ce4477f02 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.ui;
import org.eclipse.emf.cdo.view.CDOView;
-
import org.eclipse.net4j.util.ui.UIUtil;
import org.eclipse.emf.common.notify.AdapterFactory;
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
index 09ee6e0a87..b422f1a398 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.buddies.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
+ org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.net4j.ui;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.net4j.buddies.chat.internal.ui;version="4.0.0",
org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.0";x-internal:=true,
org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/build.properties b/plugins/org.eclipse.net4j.buddies.chat.ui/build.properties
index b78262fd0f..55f5f157df 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/build.properties
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/build.properties
@@ -15,7 +15,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
plugin.properties,\
- icons/,\
.options,\
about.html,\
copyright.txt
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/plugin.xml b/plugins/org.eclipse.net4j.buddies.chat.ui/plugin.xml
index 02814bffd1..592efb4f57 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/plugin.xml
@@ -17,7 +17,7 @@
point="org.eclipse.net4j.buddies.ui.facilityPaneCreators">
<facilityPaneCreator
class="org.eclipse.net4j.buddies.chat.internal.ui.ChatPaneCreator"
- icon="icons/full/obj16/chat.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/obj16/chat.gif"
type="chat"/>
</extension>
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
index 664f7f1581..e2723126da 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.buddies.chat.internal.ui.messages.Messages;
import org.eclipse.net4j.buddies.internal.chat.CommentEvent;
import org.eclipse.net4j.buddies.internal.ui.views.CollaborationsPane;
import org.eclipse.net4j.buddies.internal.ui.views.FacilityPane;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.StringUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.ui.actions.SafeAction;
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
index ca4bfe5618..2719f0b8a1 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.buddies.chat.IChat;
import org.eclipse.net4j.buddies.internal.ui.views.CollaborationsPane;
import org.eclipse.net4j.buddies.internal.ui.views.FacilityPane;
import org.eclipse.net4j.buddies.ui.IFacilityPaneCreator;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/SharedIcons.java
deleted file mode 100644
index b0f7e8fb70..0000000000
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 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.buddies.chat.internal.ui;
-
-import org.eclipse.net4j.buddies.chat.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
- private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
- private static final String ETOOL = "etool16/"; //$NON-NLS-1$
-
- private static final String OBJ = "obj16/"; //$NON-NLS-1$
-
- @SuppressWarnings("unused")
- private static final String VIEW = "view16/"; //$NON-NLS-1$
-
- @SuppressWarnings("unused")
- private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
-
- public static final String OBJ_CHAT = OBJ + "chat"; //$NON-NLS-1$
-
- public static final String ETOOL_HORIZONTAL = ETOOL + "horizontal_layout"; //$NON-NLS-1$
-
- public static final String ETOOL_VERTICAL = ETOOL + "vertical_layout"; //$NON-NLS-1$
-
- public static Image getImage(String key)
- {
- key = mangleKey(key);
- Image image = REGISTRY.get(key);
- if (image == null)
- {
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- return image;
- }
-
- public static ImageDescriptor getDescriptor(String key)
- {
- key = mangleKey(key);
- ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
- if (descriptor == null)
- {
- descriptor = createDescriptor(key);
- }
-
- return descriptor;
- }
-
- private static ImageDescriptor createDescriptor(String key)
- {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
- if (descriptor != null)
- {
- REGISTRY.put(key, descriptor);
- }
-
- return descriptor;
- }
-
- private static Display getDisplay()
- {
- Display display = Display.getCurrent();
- if (display == null)
- {
- display = Display.getDefault();
- }
-
- if (display == null)
- {
- throw new IllegalStateException("display == null"); //$NON-NLS-1$
- }
-
- return display;
- }
-
- private static String mangleKey(String key)
- {
- return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
index af33832654..15971a808a 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.buddies;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";resolution:=optional
+ org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
+ org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.0",
org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.0",
org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.0";x-internal:=true,
diff --git a/plugins/org.eclipse.net4j.buddies.ui/build.properties b/plugins/org.eclipse.net4j.buddies.ui/build.properties
index 360df6a1f9..30ccc70f18 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/build.properties
+++ b/plugins/org.eclipse.net4j.buddies.ui/build.properties
@@ -15,7 +15,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
plugin.properties,\
- icons/,\
.options,\
copyright.txt,\
about.html,\
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif
deleted file mode 100644
index 67439553a1..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif
deleted file mode 100644
index c19520b095..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif
deleted file mode 100644
index 470336009a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif
deleted file mode 100644
index 0840bc6094..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif
deleted file mode 100644
index d3323e64fc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif
deleted file mode 100644
index 7492f8ac10..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif
deleted file mode 100644
index 21a902fd1a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif
deleted file mode 100644
index cf78a9d75b..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif
deleted file mode 100644
index 27d15cc3cc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif
deleted file mode 100644
index dc47edf069..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif
deleted file mode 100644
index b949ac948a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif
deleted file mode 100644
index 27d15cc3cc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/plugin.xml b/plugins/org.eclipse.net4j.buddies.ui/plugin.xml
index d8903bff82..a9d43b7b42 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.buddies.ui/plugin.xml
@@ -32,13 +32,13 @@
<view
category="org.eclipse.net4j.buddies"
class="org.eclipse.net4j.buddies.internal.ui.views.BuddiesView"
- icon="icons/full/view16/buddies_view.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/buddies_view.gif"
id="org.eclipse.net4j.BuddiesView"
name="%view.name"/>
<view
category="org.eclipse.net4j.buddies"
class="org.eclipse.net4j.buddies.internal.ui.views.CollaborationsView"
- icon="icons/full/view16/collaborations_view.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/collaborations_view.gif"
id="org.eclipse.net4j.CollaborationsView"
name="%view.name.0"/>
</extension>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index d70c780809..3f462d4310 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -15,6 +15,7 @@ import org.eclipse.net4j.buddies.common.IBuddy;
import org.eclipse.net4j.buddies.common.ICollaboration;
import org.eclipse.net4j.buddies.common.IMembership;
import org.eclipse.net4j.buddies.internal.ui.messages.Messages;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.UIUtil;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java
deleted file mode 100644
index 122fe80e4d..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 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.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
- private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
- @SuppressWarnings("unused")
- private static final String ETOOL = "etool16/"; //$NON-NLS-1$
-
- private static final String OBJ = "obj16/"; //$NON-NLS-1$
-
- @SuppressWarnings("unused")
- private static final String VIEW = "view16/"; //$NON-NLS-1$
-
- @SuppressWarnings("unused")
- private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
-
- public static final String OBJ_COLLABORATION = OBJ + "collaboration"; //$NON-NLS-1$
-
- public static final String OBJ_BUDDY = OBJ + "buddy"; //$NON-NLS-1$
-
- public static final String OBJ_BUDDY_LONESOME = OBJ + "buddy_lonesome"; //$NON-NLS-1$
-
- public static final String OBJ_BUDDY_AWAY = OBJ + "buddy_away"; //$NON-NLS-1$
-
- public static final String OBJ_BUDDY_DO_NOT_DISTURB = OBJ + "buddy_do_not_disturb"; //$NON-NLS-1$
-
- public static Image getImage(String key)
- {
- key = mangleKey(key);
- Image image = REGISTRY.get(key);
- if (image == null)
- {
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- return image;
- }
-
- public static ImageDescriptor getDescriptor(String key)
- {
- key = mangleKey(key);
- ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
- if (descriptor == null)
- {
- descriptor = createDescriptor(key);
- }
-
- return descriptor;
- }
-
- private static ImageDescriptor createDescriptor(String key)
- {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
- if (descriptor != null)
- {
- REGISTRY.put(key, descriptor);
- }
-
- return descriptor;
- }
-
- private static Display getDisplay()
- {
- Display display = Display.getCurrent();
- if (display == null)
- {
- display = Display.getDefault();
- }
-
- if (display == null)
- {
- throw new IllegalStateException("display == null"); //$NON-NLS-1$
- }
-
- return display;
- }
-
- private static String mangleKey(String key)
- {
- return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
index 5c904a7000..a170fde825 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
@@ -13,9 +13,9 @@ package org.eclipse.net4j.buddies.internal.ui.actions;
import org.eclipse.net4j.buddies.IBuddySession;
import org.eclipse.net4j.buddies.ISessionManager;
import org.eclipse.net4j.buddies.common.IBuddy.State;
-import org.eclipse.net4j.buddies.internal.ui.SharedIcons;
import org.eclipse.net4j.buddies.internal.ui.messages.Messages;
import org.eclipse.net4j.internal.buddies.Self;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.ui.actions.SafeAction;
import org.eclipse.jface.action.Action;
diff --git a/plugins/org.eclipse.net4j.ui.shared/.classpath b/plugins/org.eclipse.net4j.ui.shared/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.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.net4j.ui.shared/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/.cvsignore
new file mode 100644
index 0000000000..7c18d5ded9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.cvsignore
@@ -0,0 +1,2 @@
+bin
+tmp
diff --git a/plugins/org.eclipse.net4j.ui.shared/.options b/plugins/org.eclipse.net4j.ui.shared/.options
new file mode 100644
index 0000000000..a5d9180718
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.options
@@ -0,0 +1,3 @@
+# Debugging and tracing options
+
+org.eclipse.net4j.ui.shared/debug = true
diff --git a/plugins/org.eclipse.net4j.ui.shared/.project b/plugins/org.eclipse.net4j.ui.shared/.project
new file mode 100644
index 0000000000..70779b9cab
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.net4j.ui.shared</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.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng/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.emf.cdo.releng.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..a1cef9a448
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Thu Dec 18 13:30:26 CET 2008
+eclipse.preferences.version=1
+encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f6c5987344
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,360 @@
+#Thu Feb 04 09:44:24 CET 2010
+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=disabled
+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=ignore
+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_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_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_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.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=true
+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.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.format_guardian_clause_on_one_line=false
+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_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..51145884f6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,120 @@
+#Thu Feb 04 09:44:24 CET 2010
+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=11
+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 - 2010 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.net4j.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.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.net4j.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..b050639a54
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.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.net4j.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..2f50f36c0c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.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.net4j.ui.shared/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..4fc4ff0069
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#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=Ignore
+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=Warning
+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.net4j.ui.shared/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..c6b96bb45e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/.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=1
+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.net4j.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..ce39816aa9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.net4j.ui.shared;singleton:=true
+Bundle-Version: 4.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.net4j.ui.internal.icons.bundle.OM$Activator
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
+Export-Package: org.eclipse.net4j.ui.internal.icons;version="4.0.0";uses:="org.eclipse.jface.resource,org.eclipse.swt.graphics",
+ org.eclipse.net4j.ui.internal.icons.bundle;version="4.0.0";x-internal:=true
+Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)"
diff --git a/plugins/org.eclipse.net4j.ui.shared/about.html b/plugins/org.eclipse.net4j.ui.shared/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/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.net4j.ui.shared/about.ini b/plugins/org.eclipse.net4j.ui.shared/about.ini
new file mode 100644
index 0000000000..b7e87ca285
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/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.net4j.ui.shared/about.mappings b/plugins/org.eclipse.net4j.ui.shared/about.mappings
new file mode 100644
index 0000000000..720ca870fa
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/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.net4j.ui.shared/about.properties b/plugins/org.eclipse.net4j.ui.shared/about.properties
new file mode 100644
index 0000000000..7eca7d5d2f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/about.properties
@@ -0,0 +1,31 @@
+# Copyright (c) 2004 - 2010 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 = Net4j Signalling Platform UI
+featureText = Net4j Signalling Platform UI\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
+\n\
+Visit http://wiki.eclipse.org/Net4j
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.ui.shared/build.properties b/plugins/org.eclipse.net4j.ui.shared/build.properties
new file mode 100644
index 0000000000..4b7ad007e1
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/build.properties
@@ -0,0 +1,26 @@
+# Copyright (c) 2004 - 2010 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:
+# Martin Fluegge - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ .options,\
+ about.html,\
+ copyright.txt,\
+ icons/,\
+ plugin.properties,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ modeling32.png
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.net4j.ui.shared/copyright.txt b/plugins/org.eclipse.net4j.ui.shared/copyright.txt
new file mode 100644
index 0000000000..77d945dca6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004 - 2010 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 \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/.cvsignore
diff --git a/plugins/org.eclipse.net4j.ui/icons/H.gif b/plugins/org.eclipse.net4j.ui.shared/icons/H.gif
index 5d86350a54..5d86350a54 100644
--- a/plugins/org.eclipse.net4j.ui/icons/H.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/H.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif b/plugins/org.eclipse.net4j.ui.shared/icons/call_hierarchy.gif
index 7c7dca802e..7c7dca802e 100644
--- a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/call_hierarchy.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/.cvsignore
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/chat_32X32.png
index 21d3eed256..21d3eed256 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/chat_32X32.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/chat_wizard.png
index 74aee56b21..74aee56b21 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/chat_wizard.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_32x32.png
index 134a1a97b3..134a1a97b3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_32x32.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_wizard.png
index 8b468507c0..8b468507c0 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/collaboration_wizard.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/dtool16/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/dtool16/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/.cvsignore
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/terminate_co.gif
index 4f3dcba276..4f3dcba276 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/dtool16/terminate_co.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/.cvsignore
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add.gif
index 252d7ebcb8..252d7ebcb8 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_acceptor.gif
index 5af19b1240..5af19b1240 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_acceptor.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_chat.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_chat.gif
index 0840bc6094..0840bc6094 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_chat.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_chat.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_connector.gif
index 8fbb69bae8..8fbb69bae8 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_connector.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_contact.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_contact.gif
index d3323e64fc..d3323e64fc 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_contact.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_contact.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_group.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_group.gif
index 7492f8ac10..7492f8ac10 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/add_group.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/add_group.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/communications.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/communications.gif
index 21a902fd1a..21a902fd1a 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/communications.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/communications.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/delete.gif
index b6922ac11c..b6922ac11c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/delete.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/delete.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/horizontal_layout.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/horizontal_layout.gif
index 86bfc482dd..86bfc482dd 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/horizontal_layout.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/horizontal_layout.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/identity.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/identity.gif
index cf78a9d75b..cf78a9d75b 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/identity.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/identity.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/messages.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/messages.gif
index 27d15cc3cc..27d15cc3cc 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/messages.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/messages.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/refresh.gif
index e3831471a6..e3831471a6 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/refresh.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/terminate_co.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/terminate_co.gif
index dc47edf069..dc47edf069 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/terminate_co.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/terminate_co.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/vertical_layout.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/vertical_layout.gif
index 493c2fbd5f..493c2fbd5f 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/etool16/vertical_layout.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/vertical_layout.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/.cvsignore
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/acceptor.gif
index a830867191..a830867191 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/acceptor.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/adapter.gif
index e8c1e6ff7e..e8c1e6ff7e 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/adapter.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies.gif
index 952ed084bd..952ed084bd 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies_alt.gif
index a60af4ec90..a60af4ec90 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddies_alt.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy.gif
index 5eed04350e..5eed04350e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_away.gif
index 93bd424131..93bd424131 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_away.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_disabled.gif
index c684f405b5..c684f405b5 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_disabled.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_do_not_disturb.gif
index 86c8cb915e..86c8cb915e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_do_not_disturb.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_lonesome.gif
index 1b87e3ccc4..1b87e3ccc4 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/buddy_lonesome.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/channel.gif
index df67abd507..df67abd507 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/channel.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/chat.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/chat.gif
index 62c9921751..62c9921751 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/chat.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/chat.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/collaboration.gif
index 21a902fd1a..21a902fd1a 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/collaboration.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/connector.gif
index 3b3ad7c16e..3b3ad7c16e 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/connector.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/error.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/error.gif
index 9b048d6053..9b048d6053 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/error.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/error.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/factory.gif
index 955d5e87a5..955d5e87a5 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/factory.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/folder.gif
index 42e027c933..42e027c933 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/folder.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/javabean.gif
index d9bfbd0541..d9bfbd0541 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/javabean.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/message.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/message.gif
index b949ac948a..b949ac948a 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/message.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/message.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/messages.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/messages.gif
index 27d15cc3cc..27d15cc3cc 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/icons/full/obj16/messages.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/messages.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/open_contacts.gif
index 1ab317a1c3..1ab317a1c3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/open_contacts.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/pending.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/pending.gif
index 0cb9751233..0cb9751233 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/pending.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/pending.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/person.gif
index 608d2d165c..608d2d165c 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/obj16/person.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/.cvsignore
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/acceptors.gif
index a830867191..a830867191 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/acceptors.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/buddies_view.gif
index 952ed084bd..952ed084bd 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/buddies_view.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/collaborations_view.gif
index 21a902fd1a..21a902fd1a 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/collaborations_view.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/connectors.gif
index 3b3ad7c16e..3b3ad7c16e 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/connectors.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/container.gif
index 6a2267e6cc..6a2267e6cc 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/container.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean.gif
index 854e13912e..854e13912e 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean_light.gif
index d9bfbd0541..d9bfbd0541 100644
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/javabean_light.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/server_explorer.gif
index 7ef3c2c80b..7ef3c2c80b 100644
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/server_explorer.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/shared_editor.gif
index 9226c49630..9226c49630 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/view16/shared_editor.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/.cvsignore
index 085e8baf0c..085e8baf0c 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/.cvsignore
diff --git a/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_32X32.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_32X32.png
new file mode 100644
index 0000000000..21d3eed256
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_32X32.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_wizard.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_wizard.png
new file mode 100644
index 0000000000..74aee56b21
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/chat_wizard.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_32x32.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_32x32.png
new file mode 100644
index 0000000000..134a1a97b3
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_32x32.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_wizard.png b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_wizard.png
new file mode 100644
index 0000000000..8b468507c0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/wizban/collaboration_wizard.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif b/plugins/org.eclipse.net4j.ui.shared/icons/p2pconn_obj.gif
index 405fda6480..405fda6480 100644
--- a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/p2pconn_obj.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/plus.gif b/plugins/org.eclipse.net4j.ui.shared/icons/plus.gif
index 571b553ecd..571b553ecd 100644
--- a/plugins/org.eclipse.net4j.ui/icons/plus.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/plus.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/sample.gif b/plugins/org.eclipse.net4j.ui.shared/icons/sample.gif
index 34fb3c9d8c..34fb3c9d8c 100644
--- a/plugins/org.eclipse.net4j.ui/icons/sample.gif
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/sample.gif
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui.shared/modeling32.png b/plugins/org.eclipse.net4j.ui.shared/modeling32.png
new file mode 100644
index 0000000000..6b08de2ada
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui.shared/plugin.properties b/plugins/org.eclipse.net4j.ui.shared/plugin.properties
new file mode 100644
index 0000000000..06353a852d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/plugin.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2004 - 2010 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 = Net4j Signalling Platform UI Shared
+providerName = Eclipse Modeling Project
+
+category.name = Net4j
+view.name = Acceptors
+view.name.0 = Connectors \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/SharedIcons.java
index 213915ebfd..a56ca7be92 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java
+++ b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/SharedIcons.java
@@ -8,9 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.net4j.internal.ui;
+package org.eclipse.net4j.ui.internal.icons;
-import org.eclipse.net4j.internal.ui.bundle.OM;
+import org.eclipse.net4j.ui.internal.icons.bundle.OM;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@@ -51,6 +51,43 @@ public class SharedIcons
public static final String ETOOL_REFRESH = ETOOL + "refresh"; //$NON-NLS-1$
+ private static final String TOOL = "etool16/"; //$NON-NLS-1$
+
+ private static final String VIEW = "view16/"; //$NON-NLS-1$
+
+ public static final String OBJ_BEAN = OBJ + "javabean"; //$NON-NLS-1$
+
+ public static final String OBJ_ERROR = OBJ + "error"; //$NON-NLS-1$
+
+ public static final String OBJ_PENDING = OBJ + "pending"; //$NON-NLS-1$
+
+ public static final String VIEW_CONTAINER = VIEW + "container"; //$NON-NLS-1$
+
+ public static final String TOOL_ADD = TOOL + "add"; //$NON-NLS-1$
+
+ public static final String TOOL_DELETE = TOOL + "delete"; //$NON-NLS-1$
+
+ public static final String TOOL_REFRESH = TOOL + "refresh"; //$NON-NLS-1$
+
+ @SuppressWarnings("unused")
+ private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
+
+ public static final String OBJ_COLLABORATION = OBJ + "collaboration"; //$NON-NLS-1$
+
+ public static final String OBJ_BUDDY = OBJ + "buddy"; //$NON-NLS-1$
+
+ public static final String OBJ_BUDDY_LONESOME = OBJ + "buddy_lonesome"; //$NON-NLS-1$
+
+ public static final String OBJ_BUDDY_AWAY = OBJ + "buddy_away"; //$NON-NLS-1$
+
+ public static final String OBJ_BUDDY_DO_NOT_DISTURB = OBJ + "buddy_do_not_disturb"; //$NON-NLS-1$
+
+ public static final String OBJ_CHAT = OBJ + "chat"; //$NON-NLS-1$
+
+ public static final String ETOOL_HORIZONTAL = ETOOL + "horizontal_layout"; //$NON-NLS-1$
+
+ public static final String ETOOL_VERTICAL = ETOOL + "vertical_layout"; //$NON-NLS-1$
+
public static Image getImage(String key)
{
key = mangleKey(key);
diff --git a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/bundle/OM.java b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/bundle/OM.java
new file mode 100644
index 0000000000..d98ae742f9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/icons/bundle/OM.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2004 - 2010 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.net4j.ui.internal.icons.bundle;
+
+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.pref.OMPreferences;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
+/**
+ * The <em>Operations & Maintenance</em> class of this bundle.
+ *
+ * @author Martin Fluegge
+ */
+public abstract class OM
+{
+ public static final String BUNDLE_ID = "org.eclipse.net4j.ui.shared"; //$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 final OMPreferences PREFS = BUNDLE.preferences();
+
+ /**
+ * @author Eike Stepper
+ */
+ public static final class Activator extends OSGiActivator
+ {
+ public static Activator INSTANCE;
+
+ public Activator()
+ {
+ super(BUNDLE);
+ INSTANCE = this;
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 3e2af8b2e7..9062127dda 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+ org.eclipse.net4j.util.ui;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.internal.ui;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs",
org.eclipse.net4j.internal.ui.bundle;version="4.0.0";x-internal:=true,
org.eclipse.net4j.internal.ui.container;version="4.0.0",
diff --git a/plugins/org.eclipse.net4j.ui/build.properties b/plugins/org.eclipse.net4j.ui/build.properties
index 6fb61dea7c..df5a3d5e02 100644
--- a/plugins/org.eclipse.net4j.ui/build.properties
+++ b/plugins/org.eclipse.net4j.ui/build.properties
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
.options,\
about.html,\
copyright.txt,\
- icons/,\
plugin.properties,\
plugin.xml,\
about.ini,\
diff --git a/plugins/org.eclipse.net4j.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/plugin.xml b/plugins/org.eclipse.net4j.ui/plugin.xml
index bbe835119e..482afee800 100644
--- a/plugins/org.eclipse.net4j.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.ui/plugin.xml
@@ -22,14 +22,14 @@
<view
category="org.eclipse.net4j"
class="org.eclipse.net4j.internal.ui.views.AcceptorsView"
- icon="icons/full/view16/acceptors.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/acceptors.gif"
id="org.eclipse.net4j.AcceptorsView"
name="%view.name">
</view>
<view
category="org.eclipse.net4j"
class="org.eclipse.net4j.internal.ui.views.ConnectorsView"
- icon="icons/full/view16/connectors.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/connectors.gif"
id="org.eclipse.net4j.ConnectorsView"
name="%view.name.0">
</view>
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
index 7c443f3792..4e0b08a65f 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.ui.views;
import org.eclipse.net4j.acceptor.IAcceptor;
import org.eclipse.net4j.channel.IChannel;
import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.ui.SharedIcons;
import org.eclipse.net4j.internal.ui.messages.Messages;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
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 1eafefe205..e5f40bdccb 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.net4j.util;bundle-version="[3.0.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.1.0";x-internal:=true,
org.eclipse.net4j.util.internal.ui.actions;version="3.1.0";x-internal:=true,
org.eclipse.net4j.util.internal.ui.bundle;version="3.1.0";x-internal:=true,
diff --git a/plugins/org.eclipse.net4j.util.ui/build.properties b/plugins/org.eclipse.net4j.util.ui/build.properties
index 89485309a9..34fa3a83e3 100644
--- a/plugins/org.eclipse.net4j.util.ui/build.properties
+++ b/plugins/org.eclipse.net4j.util.ui/build.properties
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
.options,\
about.html,\
copyright.txt,\
- icons/,\
plugin.properties,\
plugin.xml
src.includes = about.html,\
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif
deleted file mode 100644
index e3831471a6..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif
deleted file mode 100644
index e8c1e6ff7e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.xml b/plugins/org.eclipse.net4j.util.ui/plugin.xml
index fdda8a0fcd..e68217f9e1 100644
--- a/plugins/org.eclipse.net4j.util.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.util.ui/plugin.xml
@@ -24,13 +24,13 @@
id="org.eclipse.net4j.util.Net4jContainerView"
class="org.eclipse.net4j.util.internal.ui.views.Net4jContainerView"
name="%view.name"
- icon="icons/full/view16/container.gif"/>
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/container.gif"/>
<view
category="org.eclipse.net4j.debug"
id="org.eclipse.net4j.util.Net4jIntrospectorView"
class="org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView"
name="%view.name.0"
- icon="icons/full/view16/javabean.gif"/>
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/javabean.gif"/>
</extension>
<extension
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
deleted file mode 100644
index 204ced5afd..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 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.internal.ui;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
- private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
- private static final String TOOL = "etool16/"; //$NON-NLS-1$
-
- private static final String OBJ = "obj16/"; //$NON-NLS-1$
-
- private static final String VIEW = "view16/"; //$NON-NLS-1$
-
- public static final String OBJ_ADAPTER = OBJ + "adapter"; //$NON-NLS-1$
-
- public static final String OBJ_FACTORY = OBJ + "factory"; //$NON-NLS-1$
-
- public static final String OBJ_FOLDER = OBJ + "folder"; //$NON-NLS-1$
-
- public static final String OBJ_BEAN = OBJ + "javabean"; //$NON-NLS-1$
-
- public static final String OBJ_ERROR = OBJ + "error"; //$NON-NLS-1$
-
- public static final String OBJ_PENDING = OBJ + "pending"; //$NON-NLS-1$
-
- public static final String VIEW_CONTAINER = VIEW + "container"; //$NON-NLS-1$
-
- public static final String TOOL_ADD = TOOL + "add"; //$NON-NLS-1$
-
- public static final String TOOL_DELETE = TOOL + "delete"; //$NON-NLS-1$
-
- public static final String TOOL_REFRESH = TOOL + "refresh"; //$NON-NLS-1$
-
- public static Image getImage(String key)
- {
- key = mangleKey(key);
- Image image = REGISTRY.get(key);
- if (image == null)
- {
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- return image;
- }
-
- public static ImageDescriptor getDescriptor(String key)
- {
- key = mangleKey(key);
- ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
- if (descriptor == null)
- {
- descriptor = createDescriptor(key);
- }
-
- return descriptor;
- }
-
- private static ImageDescriptor createDescriptor(String key)
- {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
- if (descriptor != null)
- {
- REGISTRY.put(key, descriptor);
- }
-
- return descriptor;
- }
-
- private static Display getDisplay()
- {
- Display display = Display.getCurrent();
- if (display == null)
- {
- display = Display.getDefault();
- }
-
- if (display == null)
- {
- throw new IllegalStateException("display == null"); //$NON-NLS-1$
- }
-
- return display;
- }
-
- private static String mangleKey(String key)
- {
- return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
index 019880f23e..64cd8d334b 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
@@ -10,8 +10,8 @@
*/
package org.eclipse.net4j.util.internal.ui.views;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.internal.ui.messages.Messages;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index 8c3621a559..dfced303e6 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -10,6 +10,7 @@
*/
package org.eclipse.net4j.util.internal.ui.views;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.WrappedException;
import org.eclipse.net4j.util.collection.Pair;
@@ -17,7 +18,6 @@ import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.internal.ui.bundle.OM;
import org.eclipse.net4j.util.internal.ui.messages.Messages;
import org.eclipse.net4j.util.ui.UIUtil;
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 9797a733bc..482e114e1f 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
@@ -11,13 +11,13 @@
package org.eclipse.net4j.util.ui.views;
import org.eclipse.net4j.internal.util.bundle.OM;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.ContainerEventAdapter;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.ISlow;
import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.lifecycle.LifecycleState;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.UIUtil;
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 d8cca0525f..48f91393ed 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
@@ -10,9 +10,9 @@
*/
package org.eclipse.net4j.util.ui.views;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.internal.ui.actions.IntrospectAction;
import org.eclipse.net4j.util.internal.ui.bundle.OM;
import org.eclipse.net4j.util.internal.ui.messages.Messages;

Back to the top