# HG changeset patch
# User dadubrow
# Date 1277733515 18000
# Node ID d666d0a984db5033e1edffeccaae40bb9cf9644e
# Parent  84e4ca0e2d585bb4edc6a55fac011c1a7e66ff2e
Bug 11222

diff -r 84e4ca0e2d58 -r d666d0a984db connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java	Mon Jun 28 08:58:26 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java	Mon Jun 28 08:58:35 2010 -0500
@@ -350,4 +350,12 @@
 		
 		return loadStatus;
 	}
+
+	public boolean isRunning() {
+		return pccsConnection != null && pccsConnection.isOpen();
+	}
+
+	public String getId() {
+		return getClass().getName();
+	}
 }
diff -r 84e4ca0e2d58 -r d666d0a984db connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/messages.properties
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/messages.properties	Mon Jun 28 08:58:26 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/messages.properties	Mon Jun 28 08:58:35 2010 -0500
@@ -1,4 +1,4 @@
-Activator_Agent_Name=PC Suite Device Discovery Agent
+Activator_Agent_Name=PC Suite Device Discovery
 Activator_PCCS_Location=http://www2.connecting.nokia.com/nmp/swp/pcsuite.nsf/document/ES336ZAHVY?OpenDocument
 Activator_PCSuite_Location=https://tools.ext.nokia.com/PCsuite
 ConnAPILibrary_PCCS_Not_Found_Error=Carbide could not find the PC Connectivity Solution (PCCS) installation. For more information go to: 
diff -r 84e4ca0e2d58 -r d666d0a984db connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/PCCSConnection.java
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/PCCSConnection.java	Mon Jun 28 08:58:26 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/PCCSConnection.java	Mon Jun 28 08:58:35 2010 -0500
@@ -1300,4 +1300,11 @@
     		throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, PCCS_WRONG_VERSION, msg, null));
     	}
 	}
+	
+	/**
+	 * @return whether we have a valid handle
+	 */
+	public boolean isOpen() {
+		return dmHandle != APIHANDLE.INVALID_HANDLE_VALUE;
+	}
 }