*** empty log message ***

3 files changed, 97 insertions, 55 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch b/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
index 8006c6f7b8..2adc74cbeb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util.ui"/>
 <stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,com.springsource.antlr,com.springsource.com.mysql.jdbc,com.springsource.javassist,com.springsource.javax.transaction,com.springsource.javax.xml.stream,com.springsource.net.sf.cglib,com.springsource.org.apache.commons.logging,com.springsource.org.dom4j,com.springsource.org.hsqldb,com.springsource.org.objectweb.asm,com.springsource.org.objectweb.asm.attrs,com.springsource.org.objectweb.asm.commons,com.springsource.org.objectweb.asm.tree,com.springsource.org.objectweb.asm.util,com.springsource.org.postgresql.jdbc3,javax.servlet,javax.servlet.jsp,javax.servlet.jsp.source,javax.servlet.source,net.sourceforge.lpg.lpgjavaruntime,net.sourceforge.lpg.lpgjavaruntime.source,org.apache.ant,org.apache.ant.source,org.apache.commons.codec*1.2.0.v20080530-1550,org.apache.commons.codec*1.3.0.v20080530-1600,org.apache.commons.codec.source,org.apache.commons.collections,org.apache.commons.collections.source,org.apache.commons.el,org.apache.commons.el.source,org.apache.commons.httpclient,org.apache.commons.httpclient.source,org.apache.commons.logging,org.apache.commons.logging.source,org.apache.derby,org.apache.derby.source,org.apache.jasper,org.apache.jasper.source,org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.source,org.apache.lucene.source,org.eclipse.ant.core,org.eclipse.ant.core.source,org.eclipse.ant.ui,org.eclipse.ant.ui.source,org.eclipse.compare,org.eclipse.compare.core,org.eclipse.compare.core.source,org.eclipse.compare.source,org.eclipse.compare.win32,org.eclipse.compare.win32.source,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.commands.source,org.eclipse.core.contenttype,org.eclipse.core.contenttype.source,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.databinding.beans.source,org.eclipse.core.databinding.source,org.eclipse.core.expressions,org.eclipse.core.expressions.source,org.eclipse.core.filebuffers,org.eclipse.core.filebuffers.source,org.eclipse.core.filesystem,org.eclipse.core.filesystem.source,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.jobs.source,org.eclipse.core.net,org.eclipse.core.net.source,org.eclipse.core.net.win32.x86,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.compatibility.source,org.eclipse.core.resources.source,org.eclipse.core.resources.win32.x86,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.auth.source,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.runtime.compatibility.registry.source,org.eclipse.core.runtime.compatibility.source,org.eclipse.core.runtime.source,org.eclipse.core.variables,org.eclipse.core.variables.source,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.core.source,org.eclipse.debug.ui,org.eclipse.debug.ui.source,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.converter,org.eclipse.emf.databinding,org.eclipse.emf.databinding.edit,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.example.installer,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore,org.eclipse.emf.mapping.ecore.editor,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.ocl,org.eclipse.emf.ocl.doc,org.eclipse.emf.ocl.examples,org.eclipse.emf.ocl.examples.source,org.eclipse.emf.ocl.source,org.eclipse.emf.source,org.eclipse.emf.teneo,org.eclipse.emf.teneo.annotations,org.eclipse.emf.teneo.doc,org.eclipse.emf.teneo.eclipse,org.eclipse.emf.teneo.hibernate,org.eclipse.emf.teneo.hibernate.eclipse,org.eclipse.emf.teneo.hibernate.mapper,org.eclipse.emf.teneo.jpox,org.eclipse.emf.teneo.jpox.eclipse,org.eclipse.emf.teneo.source,org.eclipse.equinox.app,org.eclipse.equinox.app.source,org.eclipse.equinox.common,org.eclipse.equinox.common.source,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin.equinox.source,org.eclipse.equinox.frameworkadmin.source,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.jetty.source,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.registry.source,org.eclipse.equinox.http.servlet,org.eclipse.equinox.http.servlet.source,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.jsp.jasper.registry.source,org.eclipse.equinox.jsp.jasper.source,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.source,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.artifact.repository.source,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.console.source,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.core.source,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.director.app.source,org.eclipse.equinox.p2.director.source,org.eclipse.equinox.p2.directorywatcher,org.eclipse.equinox.p2.directorywatcher.source,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.engine.source,org.eclipse.equinox.p2.exemplarysetup,org.eclipse.equinox.p2.exemplarysetup.source,org.eclipse.equinox.p2.extensionlocation,org.eclipse.equinox.p2.extensionlocation.source,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.garbagecollector.source,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.jarprocessor.source,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.metadata.generator.source,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.metadata.repository.source,org.eclipse.equinox.p2.metadata.source,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.source,org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.reconciler.dropins.source,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.eclipse.source,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.touchpoint.natives.source,org.eclipse.equinox.p2.ui,org.eclipse.equinox.p2.ui.sdk,org.eclipse.equinox.p2.ui.sdk.scheduler,org.eclipse.equinox.p2.ui.sdk.scheduler.source,org.eclipse.equinox.p2.ui.sdk.source,org.eclipse.equinox.p2.ui.source,org.eclipse.equinox.p2.updatechecker,org.eclipse.equinox.p2.updatechecker.source,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.p2.updatesite.source,org.eclipse.equinox.preferences,org.eclipse.equinox.preferences.source,org.eclipse.equinox.registry,org.eclipse.equinox.registry.source,org.eclipse.equinox.security,org.eclipse.equinox.security.source,org.eclipse.equinox.security.ui,org.eclipse.equinox.security.ui.source,org.eclipse.equinox.security.win32.x86,org.eclipse.equinox.security.win32.x86.source,org.eclipse.equinox.simpleconfigurator,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.equinox.simpleconfigurator.manipulator.source,org.eclipse.equinox.simpleconfigurator.source,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.appserver.source,org.eclipse.help.base,org.eclipse.help.base.source,org.eclipse.help.source,org.eclipse.help.ui,org.eclipse.help.ui.source,org.eclipse.help.webapp,org.eclipse.help.webapp.source,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.core.source,org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.pluggable.core.source,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.ui.source,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.apt.source,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.compiler.tool.source,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.core.manipulation.source,org.eclipse.jdt.core.source,org.eclipse.jdt.debug,org.eclipse.jdt.debug.source,org.eclipse.jdt.debug.ui,org.eclipse.jdt.debug.ui.source,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit.runtime.source,org.eclipse.jdt.junit.source,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.junit4.runtime.source,org.eclipse.jdt.launching,org.eclipse.jdt.launching.source,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jdt.ui.source,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.databinding.source,org.eclipse.jface.source,org.eclipse.jface.text,org.eclipse.jface.text.source,org.eclipse.jsch.core,org.eclipse.jsch.core.source,org.eclipse.jsch.ui,org.eclipse.jsch.ui.source,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.core.refactoring.source,org.eclipse.ltk.ui.refactoring,org.eclipse.ltk.ui.refactoring.source,org.eclipse.ocl,org.eclipse.ocl.doc,org.eclipse.ocl.ecore,org.eclipse.ocl.ecore.source,org.eclipse.ocl.source,org.eclipse.ocl.uml,org.eclipse.ocl.uml.source,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.services.source,org.eclipse.osgi.source,org.eclipse.osgi.util,org.eclipse.osgi.util.source,org.eclipse.pde,org.eclipse.pde.api.tools,org.eclipse.pde.api.tools.source,org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.ui.source,org.eclipse.pde.build,org.eclipse.pde.build.source,org.eclipse.pde.core,org.eclipse.pde.core.source,org.eclipse.pde.doc.user,org.eclipse.pde.ds.core,org.eclipse.pde.ds.core.source,org.eclipse.pde.ds.ui,org.eclipse.pde.ds.ui.source,org.eclipse.pde.junit.runtime,org.eclipse.pde.junit.runtime.source,org.eclipse.pde.runtime,org.eclipse.pde.runtime.source,org.eclipse.pde.source,org.eclipse.pde.ua.core,org.eclipse.pde.ua.core.source,org.eclipse.pde.ua.ui,org.eclipse.pde.ua.ui.source,org.eclipse.pde.ui,org.eclipse.pde.ui.source,org.eclipse.pde.ui.templates,org.eclipse.pde.ui.templates.source,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.sdk,org.eclipse.search,org.eclipse.search.source,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.swt.win32.win32.x86.source,org.eclipse.team.core,org.eclipse.team.core.source,org.eclipse.team.cvs.core,org.eclipse.team.cvs.core.source,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh.source,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ssh2.source,org.eclipse.team.cvs.ui,org.eclipse.team.cvs.ui.source,org.eclipse.team.ui,org.eclipse.team.ui.source,org.eclipse.text,org.eclipse.text.source,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.browser.source,org.eclipse.ui.cheatsheets,org.eclipse.ui.cheatsheets.source,org.eclipse.ui.console,org.eclipse.ui.console.source,org.eclipse.ui.editors,org.eclipse.ui.editors.source,org.eclipse.ui.externaltools,org.eclipse.ui.externaltools.source,org.eclipse.ui.forms,org.eclipse.ui.forms.source,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.ide.application.source,org.eclipse.ui.ide.source,org.eclipse.ui.intro,org.eclipse.ui.intro.source,org.eclipse.ui.intro.universal,org.eclipse.ui.intro.universal.source,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.navigator.resources.source,org.eclipse.ui.navigator.source,org.eclipse.ui.net,org.eclipse.ui.net.source,org.eclipse.ui.presentations.r21,org.eclipse.ui.presentations.r21.source,org.eclipse.ui.source,org.eclipse.ui.views,org.eclipse.ui.views.log,org.eclipse.ui.views.log.source,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.views.properties.tabbed.source,org.eclipse.ui.views.source,org.eclipse.ui.win32,org.eclipse.ui.win32.source,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.compatibility.source,org.eclipse.ui.workbench.source,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.workbench.texteditor.source,org.eclipse.uml2,org.eclipse.uml2.codegen.ecore,org.eclipse.uml2.codegen.ecore.ui,org.eclipse.uml2.common,org.eclipse.uml2.common.edit,org.eclipse.uml2.doc,org.eclipse.uml2.examples,org.eclipse.uml2.examples.source,org.eclipse.uml2.examples.uml.ui,org.eclipse.uml2.source,org.eclipse.uml2.uml,org.eclipse.uml2.uml.ecore.exporter,org.eclipse.uml2.uml.ecore.importer,org.eclipse.uml2.uml.edit,org.eclipse.uml2.uml.editor,org.eclipse.uml2.uml.resources,org.eclipse.update.configurator,org.eclipse.update.configurator.source,org.eclipse.update.core,org.eclipse.update.core.source,org.eclipse.update.core.win32,org.eclipse.update.core.win32.source,org.eclipse.update.scheduler,org.eclipse.update.scheduler.source,org.eclipse.update.ui,org.eclipse.update.ui.source,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.converter,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.example.installer,org.eclipse.xsd.mapping,org.eclipse.xsd.mapping.editor,org.eclipse.xsd.source,org.hibernate,org.junit,org.junit.source,org.junit4,org.junit4.source,org.mortbay.jetty.server,org.mortbay.jetty.server.source,org.mortbay.jetty.util,org.mortbay.jetty.util.source,org.objectweb.asm,org.objectweb.asm.source,org.sat4j.core,org.sat4j.pb,org.springframework.beans,org.springframework.context,org.springframework.core"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common,org.eclipse.net4j.util.ui,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.team,org.eclipse.net4j.util,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.net4j"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.emf.cdo.common,org.eclipse.net4j.util.ui,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.team,org.eclipse.net4j.util,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -40,27 +40,27 @@
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jface.text/assert/TextSelection/validConstructorArguments" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
+<mapEntry key="org.eclipse.jface.text/assert/TextSelection/validConstructorArguments" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.db.postgresql/debug" value="true"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
 <mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
@@ -72,12 +72,12 @@
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
 <mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
@@ -89,15 +89,15 @@
 <mapEntry key="org.eclipse.help/debug/toc" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.store" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
 <mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -105,14 +105,14 @@
 <mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
 <mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
@@ -126,12 +126,12 @@
 <mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
 <mapEntry key="org.eclipse.net4j.util/debug.om.monitor" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.pde.core/debug" value="true"/>
@@ -140,26 +140,26 @@
 <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
 <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
 <mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
 <mapEntry key="org.eclipse.emf.cdo.server.hibernate.id/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/perf.revision" value="false"/>
-<mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
+<mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
 <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/>
@@ -168,21 +168,21 @@
 <mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
 <mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
 <mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
@@ -190,17 +190,17 @@
 <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
 <mapEntry key="org.eclipse.emf.cdo.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
 <mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
@@ -209,11 +209,11 @@
 <mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
 <mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
@@ -235,16 +235,16 @@
 <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
 <mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
 <mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
+<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
 <mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
 <mapEntry key="org.eclipse.help/debug/context" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
@@ -260,12 +260,12 @@
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
@@ -282,19 +282,19 @@
 <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
@@ -311,21 +311,21 @@
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.help/debug/search" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
 <mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
@@ -344,15 +344,15 @@
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
 <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
@@ -363,15 +363,15 @@
 <mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.statemachine" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.statemachine" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
 <mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
@@ -393,10 +393,10 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
 </mapAttribute>
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
index 0eaf7fd9d1..c86ac7d54c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.edit.EMFEditPlugin;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory.Descriptor.Registry;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -76,9 +77,7 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
 
   public RepositoryContentProvider()
   {
-    adapterFactory = new ComposedAdapterFactory(EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry());
-    adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
+    adapterFactory = createAdapterFactory();
     IRepositoryManager.INSTANCE.addListener(repositoryManagerListener);
   }
 
@@ -86,6 +85,7 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
   public void dispose()
   {
     IRepositoryManager.INSTANCE.removeListener(repositoryManagerListener);
+    adapterFactory.dispose();
     super.dispose();
   }
 
@@ -246,6 +246,14 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
     return info;
   }
 
+  public static ComposedAdapterFactory createAdapterFactory()
+  {
+    Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
+    ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(registry);
+    adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+    return adapterFactory;
+  }
+
   /**
    * @author Eike Stepper
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java
index 6d18449c3c..6fe4bfcbee 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java
@@ -12,18 +12,32 @@ package org.eclipse.emf.cdo.ui.ide;
 
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
 
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 
 /**
  * @author Eike Stepper
  */
-public class RepositoryLabelProvider extends LabelProvider implements ILabelProvider
+public class RepositoryLabelProvider extends LabelProvider
 {
+  private ComposedAdapterFactory adapterFactory;
+
   public RepositoryLabelProvider()
   {
+    adapterFactory = RepositoryContentProvider.createAdapterFactory();
+  }
+
+  @Override
+  public void dispose()
+  {
+    adapterFactory.dispose();
+    super.dispose();
   }
 
   @Override
@@ -35,6 +49,16 @@ public class RepositoryLabelProvider extends LabelProvider implements ILabelProv
       return node.getText();
     }
 
+    if (element instanceof Notifier)
+    {
+      Notifier notifier = (Notifier)element;
+      IItemLabelProvider adapter = (IItemLabelProvider)adapterFactory.adapt(notifier, IItemLabelProvider.class);
+      if (adapter != null)
+      {
+        return adapter.getText(notifier);
+      }
+    }
+
     return super.getText(element);
   }
 
@@ -49,6 +73,16 @@ public class RepositoryLabelProvider extends LabelProvider implements ILabelProv
       return imageDescriptor.createImage();
     }
 
+    if (element instanceof Notifier)
+    {
+      Notifier notifier = (Notifier)element;
+      IItemLabelProvider adapter = (IItemLabelProvider)adapterFactory.adapt(notifier, IItemLabelProvider.class);
+      if (adapter != null)
+      {
+        return ExtendedImageRegistry.getInstance().getImage(adapter.getImage(notifier));
+      }
+    }
+
     return super.getImage(element);
   }
 }