Attachment #65838 for bug #141540

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




							if(null != registryEntry)
							{
								registryEntries.add(registryEntry);
								deployProbes(registryEntry, registryEntries.size()-1);
							}
						}
					}// end if
				}// end while
				// once we have all of the information for all of the selected probes, call deployProbes
				//deployProbes(registryEntries);
		}// end method
	
	

	 * 
	 * @param RegsitryEntries - Vector of selected probes' Regsitry Entries
	 */
	public void deployProbes(ProbeRegistryEntry  probeRegistryEntry, int probeNumber) throws LaunchPadException
	{
		try 
		{
			
			Vector classPathVector = new Vector();
			
			{
				if (probeRegistryEntries.get(i) instanceof ProbeRegistryEntry)
				{
					probeRegistryEntry = (ProbeRegistryEntry)probeRegistryEntries.get(i);
					File probeScript = probeRegistryEntry.getProbescript();
			
					File probeFiles[] = probeRegistryEntry.getFiles();

				
					}
			
				
			
			prepareFileArrays(classPathVector.toArray(), agent, probeNumber);
		}
		
		catch (InvalidProbeBundleException ex)

	 * @param agent- the active agent we will use to send commands
	 */
	
	public void prepareFileArrays(Object [] probeClassPath, ICollector agent, int probeNumber)throws LaunchPadException
	{
		try{
			Vector classNames = new Vector();

			}
			}
			
			deployProbeClasses(bytes, classNames, agent, probeNumber);
		}
		catch(FileNotFoundException e)
		{

	  * @param agent - The currently active agent
	  * @throws LaunchPadException
	  */
	 public static void deployProbeClasses(Vector bytes, Vector classNames, IAgent agent, int probeNumber) throws LaunchPadException
	 {
	   try 
	   {		 		 		   

	 		   CommandFragment command = new CommandFragment();
	 		   command.setCommand(
	 		 		 		   "<applyOptions iid='org.eclipse.tptp.jvmti'>" +
	 		 		 		   "<option><name>PROBEKIT_DATA_" + String.valueOf(probeNumber)+"</name>" + 
	 		 		 		   "<value>" + commandData + "</value></option></applyOptions>");

	 		   // Invoke RAC command- this is using the new sendCommand from the new execution framework

Return to bug 141540

Lines 156-168 Link Here

(-)src/org/eclipse/tptp/platform/probekit/launch/launchpad/LaunchPadJVMTI.java (-16 / +12 lines)
156	if(null != registryEntry)	156	if(null != registryEntry)
157	{	157	{
158	registryEntries.add(registryEntry);	158	registryEntries.add(registryEntry);
159		159	deployProbes(registryEntry, registryEntries.size()-1);
160	}	160	}
161	}	161	}
162	}// end if	162	}// end if
163	}// end while	163	}// end while
164	// once we have all of the information for all of the selected probes, call deployProbes	164	// once we have all of the information for all of the selected probes, call deployProbes
165	deployProbes(registryEntries);	165	//deployProbes(registryEntries);
166	}// end method	166	}// end method
167		167
168		168
Lines 352-368 Link Here
352	*	352	*
353	* @param RegsitryEntries - Vector of selected probes' Regsitry Entries	353	* @param RegsitryEntries - Vector of selected probes' Regsitry Entries
354	*/	354	*/
355	public void deployProbes(Vector probeRegistryEntries) throws LaunchPadException	355	public void deployProbes(ProbeRegistryEntry probeRegistryEntry, int probeNumber) throws LaunchPadException
356	{	356	{
357	try	357	try
358	{	358	{
359	ProbeRegistryEntry probeRegistryEntry = null;	359
360	Vector classPathVector = new Vector();	360	Vector classPathVector = new Vector();
361	for ( int i=0; i< probeRegistryEntries.size(); i++)	361
362	{
363	if (probeRegistryEntries.get(i) instanceof ProbeRegistryEntry)
364	{
365	probeRegistryEntry = (ProbeRegistryEntry)probeRegistryEntries.get(i);
366	File probeScript = probeRegistryEntry.getProbescript();	362	File probeScript = probeRegistryEntry.getProbescript();
367		363
368	File probeFiles[] = probeRegistryEntry.getFiles();	364	File probeFiles[] = probeRegistryEntry.getFiles();
Lines 386-394 Link Here
386		382
387	}	383	}
388		384
389	}	385
390	}	386
391	prepareFileArrays(classPathVector.toArray(), agent);	387	prepareFileArrays(classPathVector.toArray(), agent, probeNumber);
392	}	388	}
393		389
394	catch (InvalidProbeBundleException ex)	390	catch (InvalidProbeBundleException ex)
Lines 408-414 Link Here
408	* @param agent- the active agent we will use to send commands	404	* @param agent- the active agent we will use to send commands
409	*/	405	*/
410		406
411	public void prepareFileArrays(Object [] probeClassPath, ICollector agent)throws LaunchPadException	407	public void prepareFileArrays(Object [] probeClassPath, ICollector agent, int probeNumber)throws LaunchPadException
412	{	408	{
413	try{	409	try{
414	Vector classNames = new Vector();	410	Vector classNames = new Vector();
Lines 434-440 Link Here
434	}	430	}
435	}	431	}
436		432
437	deployProbeClasses(bytes, classNames, agent);	433	deployProbeClasses(bytes, classNames, agent, probeNumber);
438	}	434	}
439	catch(FileNotFoundException e)	435	catch(FileNotFoundException e)
440	{	436	{
Lines 458-464 Link Here
458	* @param agent - The currently active agent	454	* @param agent - The currently active agent
459	* @throws LaunchPadException	455	* @throws LaunchPadException
460	*/	456	*/
461	public static void deployProbeClasses(Vector bytes, Vector classNames, IAgent agent) throws LaunchPadException	457	public static void deployProbeClasses(Vector bytes, Vector classNames, IAgent agent, int probeNumber) throws LaunchPadException
462	{	458	{
463	try	459	try
464	{	460	{
Lines 501-507 Link Here
501	CommandFragment command = new CommandFragment();	497	CommandFragment command = new CommandFragment();
502	command.setCommand(	498	command.setCommand(
503	"<applyOptions iid='org.eclipse.tptp.jvmti'>" +	499	"<applyOptions iid='org.eclipse.tptp.jvmti'>" +
504	"<option><name>PROBEKIT_CLASS</name>" +	500	"<option><name>PROBEKIT_DATA_" + String.valueOf(probeNumber)+"</name>" +
505	"<value>" + commandData + "</value></option></applyOptions>");	501	"<value>" + commandData + "</value></option></applyOptions>");
506		502
507	// Invoke RAC command- this is using the new sendCommand from the new execution framework	503	// Invoke RAC command- this is using the new sendCommand from the new execution framework