From 97d0bd31426cf58914799d02573fc2ea88f75b31 Mon Sep 17 00:00:00 2001 From: slewis Date: Tue, 21 Apr 2009 18:32:37 +0000 Subject: Changed names of methods in IServiceEndpointDescription --- .../osgi/services/discovery/ECFServiceEndpointDescriptionImpl.java | 6 +++--- .../ecf/osgi/services/discovery/ECFServiceEndpointDescription.java | 4 ++-- .../ecf/osgi/services/discovery/IServiceEndpointDescription.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ECFServiceEndpointDescriptionImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ECFServiceEndpointDescriptionImpl.java index 378dd32b4..b1d608c62 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ECFServiceEndpointDescriptionImpl.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ECFServiceEndpointDescriptionImpl.java @@ -78,7 +78,7 @@ public class ECFServiceEndpointDescriptionImpl extends * org.eclipse.ecf.osgi.services.discovery.ECFServiceEndpointDescription * #getECFTargetID() */ - public ID getECFTargetID() { + public ID getConnectTargetID() { return targetId; } @@ -117,8 +117,8 @@ public class ECFServiceEndpointDescriptionImpl extends sb.append(";serviceid=").append(getServiceID()); //$NON-NLS-1$ sb.append(";osgiEndpointID=").append(getEndpointID()); //$NON-NLS-1$ sb.append(";ecfEndpointID=").append(getECFEndpointID()); //$NON-NLS-1$ - sb.append(";ecfTargetID=").append(getECFTargetID()); //$NON-NLS-1$ - sb.append(";ecfFilter=").append(getECFRemoteServicesFilter()); //$NON-NLS-1$ + sb.append(";ecfTargetID=").append(getConnectTargetID()); //$NON-NLS-1$ + sb.append(";ecfFilter=").append(getRemoteServicesFilter()); //$NON-NLS-1$ sb.append(";props=").append(getProperties()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return sb.toString(); } diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServiceEndpointDescription.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServiceEndpointDescription.java index 386fc08f4..4a3637dd7 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServiceEndpointDescription.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServiceEndpointDescription.java @@ -187,11 +187,11 @@ public abstract class ECFServiceEndpointDescription implements public abstract ID getECFEndpointID(); - public abstract ID getECFTargetID(); + public abstract ID getConnectTargetID(); public abstract IServiceID getServiceID(); - public String getECFRemoteServicesFilter() { + public String getRemoteServicesFilter() { Object o = serviceProperties .get(IServicePublication.PROP_KEY_REMOTE_SERVICE_FILTER); if (o instanceof String) diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IServiceEndpointDescription.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IServiceEndpointDescription.java index 71ca1cdef..df0e8e676 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IServiceEndpointDescription.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IServiceEndpointDescription.java @@ -36,7 +36,7 @@ public interface IServiceEndpointDescription extends ServiceEndpointDescription * @return ID that may be used by local IContainer to connect to remote * target. */ - public ID getECFTargetID(); + public ID getConnectTargetID(); /** * Get the ECF remote services filter string. May return null. @@ -44,7 +44,7 @@ public interface IServiceEndpointDescription extends ServiceEndpointDescription * @return String that is to be used as the filter for the call to * getRemoteServicesReferences(ID,interface,filter); */ - public String getECFRemoteServicesFilter(); + public String getRemoteServicesFilter(); /** * Set the properties for this endpoint description. This allows clients to -- cgit v1.2.3