Attachment #126410 for bug #249240

Lines 23-28 Link Here

(-)src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java (+8 lines)
23	*/	23	*/
24	public interface IRemoteServiceReference {	24	public interface IRemoteServiceReference {
25	/**	25	/**
		26	* Get the remote service ID for this reference. Will not return <code>null</code>.
		27	*
		28	* @return IRemoteServiceID the id for the remote service associated with this
		29	* reference.
		30	*/
		31	public IRemoteServiceID getID();
		32
		33	/**
26	* Get container ID for remote service	34	* Get container ID for remote service
27	*	35	*
28	* @return ID the containerID for this reference (where the service is	36	* @return ID the containerID for this reference (where the service is




package org.eclipse.ecf.remoteservice;

import java.util.Dictionary;

import org.eclipse.ecf.core.identity.ID;

/**

 * 
 */
public interface IRemoteServiceRegistration {

	/**
	 * Get the remote service ID for this registration.  Will not return <code>null</code>.
	 * 
	 * @return IRemoteServiceID the id for the remote service associated with this
	 * registration.
	 */
	public IRemoteServiceID getID();

	/**
	 * Get the container ID for the registration
	 * 





import java.util.Dictionary;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.ecf.core.identity.*;
import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.equinox.concurrent.future.IFuture;
import org.osgi.framework.*;


	public IFuture asyncGetRemoteServiceReferences(ID[] idFilter, String clazz, String filter);

	/**
	 * Get namespace to use for this remote service provider.
	 * @return Namespace to use for creating IRemoteServiceID for this remote service provider.  Will
	 * not return <code>null</code>.
	 * @since 3.0
	 */
	public Namespace getRemoteServiceNamespace();

	/**
	 * Create a remote service ID from a containerID and a containerRelative identifier.
	 * 
	 * @param containerID the containerID to use to create the IRemoteServiceID.  Cannot be <code>null</code>.
	 * @param containerRelativeID the containerRelativeID to use to create the IRemoteServiceID.
	 * @return IRemoteServiceID created
	 */
	public IRemoteServiceID createRemoteServiceID(ID containerID, int containerRelativeID) throws IDCreateException;

	/**
	 * Get the remote service reference known to this container for the given IRemoteServiceID.  Note that
	 * this method must be guaranteed not to block by the provider implementation.
	 * 
	 * @param serviceID the serviceID to retrieve the IRemoteServiceReference for.
	 * @return IRemoteServiceReference the remote service reference associated with the given serviceID.
	 * Will return <code>null</code> if no IRemoteServiceReference found for the given serviceID.
	 */
	public IRemoteServiceReference getRemoteServiceReference(IRemoteServiceID serviceID);

	/**
	 * Get remote service for given IRemoteServiceReference. Note that clients
	 * that call this method successfully should later call
	 * {@link IRemoteServiceContainerAdapter#ungetRemoteService(IRemoteServiceReference)}

	public boolean ungetRemoteService(IRemoteServiceReference reference);

	/**
	 * Get namespace to use for this remote service provider.
	 * @return Namespace to use for creating IDs for this remote service provider.  Will
	 * not return <code>null</code>.
	 * @since 3.0
	 */
	public Namespace getRemoteServiceNamespace();

	/**
	 * Creates a <code>IRemoteFilter</code> object. This <code>IRemoteFilter</code> object may
	 * be used to match a <code>IRemoteServiceReference</code> object or a
	 * <code>Dictionary</code> object.




/*******************************************************************************
* Copyright (c) 2009 EclipseSource 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:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.ecf.remoteservice;

import org.eclipse.ecf.core.identity.ID;

public interface IRemoteServiceID extends ID {
	/**
	 * Get the container ID for this remote service.  Will not return <code>null</code>.
	 * @return ID the ID for the container associated with this remote service.  Will not return <code>null</code>.
	 */
	public ID getContainerID();

	/**
	 * Get container-relative ID for the remote service identified
	 * @return int the container-relative ID.  
	 */
	public int getContainerRelativeID();
}

Return to bug 249240

Lines 13-20 Link Here

(-)src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java (-10 / +28 lines)
13		13
14	import java.util.Dictionary;	14	import java.util.Dictionary;
15	import org.eclipse.core.runtime.IAdaptable;	15	import org.eclipse.core.runtime.IAdaptable;
16	import org.eclipse.ecf.core.identity.ID;	16	import org.eclipse.ecf.core.identity.*;
17	import org.eclipse.ecf.core.identity.Namespace;
18	import org.eclipse.equinox.concurrent.future.IFuture;	17	import org.eclipse.equinox.concurrent.future.IFuture;
19	import org.osgi.framework.*;	18	import org.osgi.framework.*;
20		19
Lines 161-166 Link Here
161	public IFuture asyncGetRemoteServiceReferences(ID[] idFilter, String clazz, String filter);	160	public IFuture asyncGetRemoteServiceReferences(ID[] idFilter, String clazz, String filter);
162		161
163	/**	162	/**
		163	* Get namespace to use for this remote service provider.
		164	* @return Namespace to use for creating IRemoteServiceID for this remote service provider. Will
		165	* not return <code>null</code>.
		166	* @since 3.0
		167	*/
		168	public Namespace getRemoteServiceNamespace();
		169
		170	/**
		171	* Create a remote service ID from a containerID and a containerRelative identifier.
		172	*
		173	* @param containerID the containerID to use to create the IRemoteServiceID. Cannot be <code>null</code>.
		174	* @param containerRelativeID the containerRelativeID to use to create the IRemoteServiceID.
		175	* @return IRemoteServiceID created
		176	*/
		177	public IRemoteServiceID createRemoteServiceID(ID containerID, int containerRelativeID) throws IDCreateException;
		178
		179	/**
		180	* Get the remote service reference known to this container for the given IRemoteServiceID. Note that
		181	* this method must be guaranteed not to block by the provider implementation.
		182	*
		183	* @param serviceID the serviceID to retrieve the IRemoteServiceReference for.
		184	* @return IRemoteServiceReference the remote service reference associated with the given serviceID.
		185	* Will return <code>null</code> if no IRemoteServiceReference found for the given serviceID.
		186	*/
		187	public IRemoteServiceReference getRemoteServiceReference(IRemoteServiceID serviceID);
		188
		189	/**
164	* Get remote service for given IRemoteServiceReference. Note that clients	190	* Get remote service for given IRemoteServiceReference. Note that clients
165	* that call this method successfully should later call	191	* that call this method successfully should later call
166	* {@link IRemoteServiceContainerAdapter#ungetRemoteService(IRemoteServiceReference)}	192	* {@link IRemoteServiceContainerAdapter#ungetRemoteService(IRemoteServiceReference)}
Lines 197-210 Link Here
197	public boolean ungetRemoteService(IRemoteServiceReference reference);	223	public boolean ungetRemoteService(IRemoteServiceReference reference);
198		224
199	/**	225	/**
200	* Get namespace to use for this remote service provider.
201	* @return Namespace to use for creating IDs for this remote service provider. Will
202	* not return <code>null</code>.
203	* @since 3.0
204	*/
205	public Namespace getRemoteServiceNamespace();
206
207	/**
208	* Creates a <code>IRemoteFilter</code> object. This <code>IRemoteFilter</code> object may	226	* Creates a <code>IRemoteFilter</code> object. This <code>IRemoteFilter</code> object may
209	* be used to match a <code>IRemoteServiceReference</code> object or a	227	* be used to match a <code>IRemoteServiceReference</code> object or a
210	* <code>Dictionary</code> object.	228	* <code>Dictionary</code> object.

Lines 12-18 Link Here

(-)src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java (-1 / +9 lines)
12	package org.eclipse.ecf.remoteservice;	12	package org.eclipse.ecf.remoteservice;
13		13
14	import java.util.Dictionary;	14	import java.util.Dictionary;
15
16	import org.eclipse.ecf.core.identity.ID;	15	import org.eclipse.ecf.core.identity.ID;
17		16
18	/**	17	/**
Lines 23-28 Link Here
23	*	22	*
24	*/	23	*/
25	public interface IRemoteServiceRegistration {	24	public interface IRemoteServiceRegistration {
		25
		26	/**
		27	* Get the remote service ID for this registration. Will not return <code>null</code>.
		28	*
		29	* @return IRemoteServiceID the id for the remote service associated with this
		30	* registration.
		31	*/
		32	public IRemoteServiceID getID();
		33
26	/**	34	/**
27	* Get the container ID for the registration	35	* Get the container ID for the registration
28	*	36	*

Added Link Here

(-)src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java (+26 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	package org.eclipse.ecf.remoteservice;
11
12	import org.eclipse.ecf.core.identity.ID;
13
14	public interface IRemoteServiceID extends ID {
15	/**
16	* Get the container ID for this remote service. Will not return <code>null</code>.
17	* @return ID the ID for the container associated with this remote service. Will not return <code>null</code>.
18	*/
19	public ID getContainerID();
20
21	/**
22	* Get container-relative ID for the remote service identified
23	* @return int the container-relative ID.
24	*/
25	public int getContainerRelativeID();
26	}