### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.ui
Index: src/org/eclipse/pde/internal/ui/PDELabelProvider.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java,v
retrieving revision 1.92
diff -u -r1.92 PDELabelProvider.java
--- src/org/eclipse/pde/internal/ui/PDELabelProvider.java	19 Feb 2008 00:00:39 -0000	1.92
+++ src/org/eclipse/pde/internal/ui/PDELabelProvider.java	19 Feb 2008 23:28:13 -0000
@@ -20,6 +20,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.osgi.service.resolver.ResolverError;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.pde.core.build.IBuildEntry;
 import org.eclipse.pde.core.plugin.*;
 import org.eclipse.pde.internal.core.*;
@@ -50,6 +51,8 @@
 import org.osgi.framework.Version;
 
 public class PDELabelProvider extends SharedLabelProvider {
+	private static final String SYSTEM_BUNDLE = "system.bundle"; //$NON-NLS-1$
+
 	public PDELabelProvider() {
 	}
 
@@ -162,11 +165,19 @@
 			text = name + ' ' + formatVersion(pluginBase.getVersion());
 		else
 			text = name;
+		if (SYSTEM_BUNDLE.equals(pluginBase.getId())) {
+			text += getSystemBundleInfo();
+		}
 		if (pluginBase.getModel() != null && !pluginBase.getModel().isInSync())
 			text += " " + PDEUIMessages.PluginModelManager_outOfSync; //$NON-NLS-1$
 		return text;
 	}
 
+	private String getSystemBundleInfo() {
+		IPluginBase systemBundle = PluginRegistry.findModel(SYSTEM_BUNDLE).getPluginBase();
+		return NLS.bind(" [{0} ({1})]", systemBundle.getId(), systemBundle.getVersion()); //$NON-NLS-1$
+	}
+
 	private String preventNull(String text) {
 		return text != null ? text : ""; //$NON-NLS-1$
 	}
@@ -185,6 +196,8 @@
 			version = formatVersion(version);
 
 		String text = isFullNameModeEnabled() ? obj.toString() : preventNull(obj.getId());
+		if (SYSTEM_BUNDLE.equals(obj.getId()))
+			return text + getSystemBundleInfo();
 		return version == null || version.length() == 0 ? text : text + " " + version; //$NON-NLS-1$
 	}
 
@@ -577,6 +590,8 @@
 		if (javaSearch)
 			flags |= F_JAVA;
 		ImageDescriptor desc = PDEPluginImages.DESC_PLUGIN_OBJ;
+		if (SYSTEM_BUNDLE.equals(plugin.getId()))
+			desc = PDEPluginImages.DESC_SYSPLUGIN_OBJ;
 		if (checkEnabled && model.isEnabled() == false)
 			desc = PDEPluginImages.DESC_EXT_PLUGIN_OBJ;
 		return get(desc, flags);
@@ -642,7 +657,7 @@
 	}
 
 	protected ImageDescriptor getRequiredPluginImageDescriptor(IPluginImport iobj) {
-		return PDEPluginImages.DESC_REQ_PLUGIN_OBJ;
+		return (SYSTEM_BUNDLE.equals(iobj.getId()) ? PDEPluginImages.DESC_REQ_SYSPLUGIN_OBJ : PDEPluginImages.DESC_REQ_PLUGIN_OBJ);
 	}
 
 	private Image getObjectImage(IPluginImport obj) {
Index: src/org/eclipse/pde/internal/ui/PDEPluginImages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java,v
retrieving revision 1.107
diff -u -r1.107 PDEPluginImages.java
--- src/org/eclipse/pde/internal/ui/PDEPluginImages.java	19 Feb 2008 00:00:39 -0000	1.107
+++ src/org/eclipse/pde/internal/ui/PDEPluginImages.java	19 Feb 2008 23:28:13 -0000
@@ -120,6 +120,7 @@
 	public static final ImageDescriptor DESC_COMGROUP_OBJ = create(PATH_OBJ, "keygroups_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_GENCOM_OBJ = create(PATH_OBJ, "command_obj.gif"); //$NON-NLS-1$
 
+	public static final ImageDescriptor DESC_SYSPLUGIN_OBJ = create(PATH_OBJ, "sysplugin_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_PLUGIN_OBJ = create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_PLUGIN_DIS_OBJ = create(PATH_OBJ, "plugin_dis_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OPERATING_SYSTEM_OBJ = create(PATH_OBJ, "operating_system_obj.gif"); //$NON-NLS-1$
@@ -128,6 +129,7 @@
 	public static final ImageDescriptor DESC_FRAGMENT_DIS_OBJ = create(PATH_OBJ, "frgmt_dis_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_REQ_PLUGINS_OBJ = create(PATH_OBJ, "req_plugins_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_FRAGMENTS_OBJ = create(PATH_OBJ, "frgmts_obj.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor DESC_REQ_SYSPLUGIN_OBJ = create(PATH_OBJ, "req_sysplugin_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_REQ_PLUGIN_OBJ = create(PATH_OBJ, "req_plugin_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_RUNTIME_OBJ = create(PATH_OBJ, "runtime_obj.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_SCHEMA_OBJ = create(PATH_OBJ, "schema_obj.gif"); //$NON-NLS-1$