Added remote service changed event and moved methods up into IRemoteServiceEvent

4 files changed, 48 insertions, 52 deletions

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java
new file mode 100644
index 000000000..8e2c35616
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java
@@ -0,0 +1,19 @@
+/****************************************************************************
+ * Copyright (c) 2004 Composent, Inc. 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:
+ *    Composent, Inc. - initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.ecf.remoteservice.events;
+
+/**
+ * Remote service changed event.
+ */
+public interface IRemoteServiceChangedEvent extends IRemoteServiceEvent {
+
+}
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java
index 114fffee7..ab0def2a8 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java
@@ -11,8 +11,37 @@
 
 package org.eclipse.ecf.remoteservice.events;
 
+import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
+
 /**
  * Super interface for remote service events (registration and unregistration).
  */
 public interface IRemoteServiceEvent {
+	
+	/**
+	 * The ID of the container that registered the service.
+	 * 
+	 * @return ID of container that registered service. Will not be
+	 *         <code>null</code>.
+	 */
+	public ID getContainerID();
+
+	/**
+	 * Get the remote service reference for the unregistered service.
+	 * 
+	 * @return {@link IRemoteServiceReference} the reference for the
+	 *         unregistered service. Will not be <code>null</code>.
+	 */
+	public IRemoteServiceReference getReference();
+
+	/**
+	 * Get the interface classes associated with/exposed by the remote service.
+	 * 
+	 * @return String[] set of interface classes exposed by the unregistered
+	 *         remote service. Will not be <code>null</code>, but may be
+	 *         empty array.
+	 */
+	public String[] getClazzes();
+
 }
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java
index b6d91da67..2b9615178 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java
@@ -10,8 +10,6 @@
  *****************************************************************************/
 package org.eclipse.ecf.remoteservice.events;
 
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
 
 /**
  * Remote service registered event. Instances of this class will be received
@@ -20,28 +18,4 @@ import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
  */
 public interface IRemoteServiceRegisteredEvent extends IRemoteServiceEvent {
 
-	/**
-	 * The ID of the container that registered the service.
-	 * 
-	 * @return ID of container that registered service. Will not be
-	 *         <code>null</code>.
-	 */
-	public ID getContainerID();
-
-	/**
-	 * Get the interface classes associated with/exposed by the remote service.
-	 * 
-	 * @return String[] set of interface classes exposed by the registered
-	 *         remote service. Will not be <code>null</code>, but may be
-	 *         empty array.
-	 */
-	public String[] getClazzes();
-
-	/**
-	 * Get the remote service reference for the registered service.
-	 * 
-	 * @return {@link IRemoteServiceReference} the reference for the registered
-	 *         service. Will not be <code>null</code>.
-	 */
-	public IRemoteServiceReference getReference();
 }
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java
index 4549a8490..98f8d51b3 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java
@@ -10,8 +10,6 @@
  *****************************************************************************/
 package org.eclipse.ecf.remoteservice.events;
 
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
 
 /**
  * Remote service unregistered event. Instances of this class will be received
@@ -20,28 +18,4 @@ import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
  */
 public interface IRemoteServiceUnregisteredEvent extends IRemoteServiceEvent {
 
-	/**
-	 * The ID of the container that unregistered the service.
-	 * 
-	 * @return ID of container that unregistered service. Will not be
-	 *         <code>null</code>.
-	 */
-	public ID getContainerID();
-
-	/**
-	 * Get the interface classes associated with/exposed by the remote service.
-	 * 
-	 * @return String[] set of interface classes exposed by the unregistered
-	 *         remote service. Will not be <code>null</code>, but may be
-	 *         empty array.
-	 */
-	public String[] getClazzes();
-
-	/**
-	 * Get the remote service reference for the unregistered service.
-	 * 
-	 * @return {@link IRemoteServiceReference} the reference for the
-	 *         unregistered service. Will not be <code>null</code>.
-	 */
-	public IRemoteServiceReference getReference();
 }