Attachment #243138 for bug #270684

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 79-84 Link Here

(-)a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java (+1 lines)
79	public static final ImageDescriptor DESC_PLUGINS_OBJ = create(PATH_OBJ, "plugins_obj.gif"); //$NON-NLS-1$	79	public static final ImageDescriptor DESC_PLUGINS_OBJ = create(PATH_OBJ, "plugins_obj.gif"); //$NON-NLS-1$
80	public static final ImageDescriptor DESC_FRAGMENT_OBJ = create(PATH_OBJ, "frgmt_obj.gif"); //$NON-NLS-1$	80	public static final ImageDescriptor DESC_FRAGMENT_OBJ = create(PATH_OBJ, "frgmt_obj.gif"); //$NON-NLS-1$
81	public static final ImageDescriptor DESC_PACKAGE_OBJ = create(PATH_OBJ, "package_obj.gif"); //$NON-NLS-1$	81	public static final ImageDescriptor DESC_PACKAGE_OBJ = create(PATH_OBJ, "package_obj.gif"); //$NON-NLS-1$
		82	public static final ImageDescriptor DESC_REMOTE_SERVICE_PROXY_OBJ = create(PATH_OBJ, "rsvcproxy_obj.gif"); //$NON-NLS-1$
82		83
83	/*	84	/*
84	* Overlays	85	* Overlays




 *******************************************************************************/
package org.eclipse.pde.internal.runtime.registry;

import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

import java.util.Arrays;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;

import org.eclipse.pde.internal.runtime.registry.model.*;
import org.eclipse.swt.graphics.Image;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;

public class RegistryBrowserLabelProvider extends StyledCellLabelProvider implements ILabelProvider {


	private Image fServicePropertyImage;
	private Image fFragmentImage;
	private Image fPackageImage;
	private Image fRemoteServiceProxyImage;
	private RegistryBrowser fRegistryBrowser;

	public RegistryBrowserLabelProvider(RegistryBrowser browser) {

		fPluginsImage = PDERuntimePluginImages.DESC_PLUGINS_OBJ.createImage();
		fFragmentImage = PDERuntimePluginImages.DESC_FRAGMENT_OBJ.createImage();
		fPackageImage = PDERuntimePluginImages.DESC_PACKAGE_OBJ.createImage();
		fRemoteServiceProxyImage = PDERuntimePluginImages.DESC_REMOTE_SERVICE_PROXY_OBJ.createImage();

		ImageDescriptor activePluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_RUN_CO}});
		fActivePluginImage = activePluginDesc.createImage();

		fPackageImage.dispose();
	}

	private boolean isProxyService(ServiceReference ref) {
		if (ref == null)
			return false;
		Object o = ref.getProperty(Constants.SERVICE_IMPORTED);
		return (o != null);
	}

	private boolean isProxyService(ServiceRegistration reg) {
		if (reg == null)
			return false;
		Object o = reg.getProperty(Constants.SERVICE_IMPORTED);
		return (o != null);
	}

	public Image getImage(Object element) {
		if (element instanceof Bundle) {
			Bundle bundle = (Bundle) element;

		}

		if (element instanceof ServiceName) {
			ServiceName serviceName = (ServiceName) element;
			if (isProxyService(serviceName.getServiceReference()))
				return fRemoteServiceProxyImage;
			return fServiceImage;
		}

		if (element instanceof ServiceRegistration) {
			ServiceRegistration reg = (ServiceRegistration) element;
			if (isProxyService(reg))
				return fRemoteServiceProxyImage;
			return fPluginImage;
		}


Lines 289-295 Link Here

(-)a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java (-1 / +1 lines)
289		289
290	if (classes != null) {	290	if (classes != null) {
291	Arrays.sort(classes);	291	Arrays.sort(classes);
292	service.setName(new ServiceName(classes));	292	service.setName(new ServiceName(classes, ref));
293	service.setProperties(properties);	293	service.setProperties(properties);
294	}	294	}
295	return service;	295	return service;




package org.eclipse.pde.internal.runtime.registry.model;

import java.util.Arrays;
import org.osgi.framework.ServiceReference;

public class ServiceName extends ModelObject implements Comparable {

	private String[] classes;
	private ServiceReference reference;

	public ServiceName(String[] classes, ServiceReference ref) {
		this.classes = classes;
		this.reference = ref;
	}

	public ServiceReference getServiceReference() {
		return this.reference;
	}

	public String[] getClasses() {

Return to bug 270684

Lines 10-17 Link Here

(-)a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java (-2 / +23 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.runtime.registry;	11	package org.eclipse.pde.internal.runtime.registry;
12		12
13	import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
14
15	import java.util.Arrays;	13	import java.util.Arrays;
16	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
17	import org.eclipse.jface.viewers.*;	15	import org.eclipse.jface.viewers.*;
Lines 20-25 Link Here
20	import org.eclipse.pde.internal.runtime.registry.model.*;	18	import org.eclipse.pde.internal.runtime.registry.model.*;
21	import org.eclipse.swt.graphics.Image;	19	import org.eclipse.swt.graphics.Image;
22	import org.osgi.framework.Constants;	20	import org.osgi.framework.Constants;
		21	import org.osgi.framework.ServiceReference;
23		22
24	public class RegistryBrowserLabelProvider extends StyledCellLabelProvider implements ILabelProvider {	23	public class RegistryBrowserLabelProvider extends StyledCellLabelProvider implements ILabelProvider {
25		24
Lines 47-52 Link Here
47	private Image fServicePropertyImage;	46	private Image fServicePropertyImage;
48	private Image fFragmentImage;	47	private Image fFragmentImage;
49	private Image fPackageImage;	48	private Image fPackageImage;
		49	private Image fRemoteServiceProxyImage;
50	private RegistryBrowser fRegistryBrowser;	50	private RegistryBrowser fRegistryBrowser;
51		51
52	public RegistryBrowserLabelProvider(RegistryBrowser browser) {	52	public RegistryBrowserLabelProvider(RegistryBrowser browser) {
Lines 70-75 Link Here
70	fPluginsImage = PDERuntimePluginImages.DESC_PLUGINS_OBJ.createImage();	70	fPluginsImage = PDERuntimePluginImages.DESC_PLUGINS_OBJ.createImage();
71	fFragmentImage = PDERuntimePluginImages.DESC_FRAGMENT_OBJ.createImage();	71	fFragmentImage = PDERuntimePluginImages.DESC_FRAGMENT_OBJ.createImage();
72	fPackageImage = PDERuntimePluginImages.DESC_PACKAGE_OBJ.createImage();	72	fPackageImage = PDERuntimePluginImages.DESC_PACKAGE_OBJ.createImage();
		73	fRemoteServiceProxyImage = PDERuntimePluginImages.DESC_REMOTE_SERVICE_PROXY_OBJ.createImage();
73		74
74	ImageDescriptor activePluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_RUN_CO}});	75	ImageDescriptor activePluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_RUN_CO}});
75	fActivePluginImage = activePluginDesc.createImage();	76	fActivePluginImage = activePluginDesc.createImage();
Lines 115-120 Link Here
115	fPackageImage.dispose();	116	fPackageImage.dispose();
116	}	117	}
117		118
		119	private boolean isProxyService(ServiceReference ref) {
		120	if (ref == null)
		121	return false;
		122	Object o = ref.getProperty(Constants.SERVICE_IMPORTED);
		123	return (o != null);
		124	}
		125
		126	private boolean isProxyService(ServiceRegistration reg) {
		127	if (reg == null)
		128	return false;
		129	Object o = reg.getProperty(Constants.SERVICE_IMPORTED);
		130	return (o != null);
		131	}
		132
118	public Image getImage(Object element) {	133	public Image getImage(Object element) {
119	if (element instanceof Bundle) {	134	if (element instanceof Bundle) {
120	Bundle bundle = (Bundle) element;	135	Bundle bundle = (Bundle) element;
Lines 139-148 Link Here
139	}	154	}
140		155
141	if (element instanceof ServiceName) {	156	if (element instanceof ServiceName) {
		157	ServiceName serviceName = (ServiceName) element;
		158	if (isProxyService(serviceName.getServiceReference()))
		159	return fRemoteServiceProxyImage;
142	return fServiceImage;	160	return fServiceImage;
143	}	161	}
144		162
145	if (element instanceof ServiceRegistration) {	163	if (element instanceof ServiceRegistration) {
		164	ServiceRegistration reg = (ServiceRegistration) element;
		165	if (isProxyService(reg))
		166	return fRemoteServiceProxyImage;
146	return fPluginImage;	167	return fPluginImage;
147	}	168	}
148		169

Lines 12-24 Link Here

(-)a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java (-1 / +8 lines)
12	package org.eclipse.pde.internal.runtime.registry.model;	12	package org.eclipse.pde.internal.runtime.registry.model;
13		13
14	import java.util.Arrays;	14	import java.util.Arrays;
		15	import org.osgi.framework.ServiceReference;
15		16
16	public class ServiceName extends ModelObject implements Comparable {	17	public class ServiceName extends ModelObject implements Comparable {
17		18
18	private String[] classes;	19	private String[] classes;
		20	private ServiceReference reference;
19		21
20	public ServiceName(String[] classes) {	22	public ServiceName(String[] classes, ServiceReference ref) {
21	this.classes = classes;	23	this.classes = classes;
		24	this.reference = ref;
		25	}
		26
		27	public ServiceReference getServiceReference() {
		28	return this.reference;
22	}	29	}
23		30
24	public String[] getClasses() {	31	public String[] getClasses() {