Attachment #64202 for bug #141540

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

Lines 31-33 Link Here

(-)plugin.properties (+2 lines)
31	JVMTI_ANALYSIS_TYPE_THRD_NAME = Thread Analysis	31	JVMTI_ANALYSIS_TYPE_THRD_NAME = Thread Analysis
32	JVMTI_ANALYSIS_TYPE_THRD_DESC = Analyze the execution of your application threads	32	JVMTI_ANALYSIS_TYPE_THRD_DESC = Analyze the execution of your application threads
33		33
		34	JVMTI_ANALYSIS_TYPE_PROBE_NAME = Probe Insertion
		35	JVMTI_ANALYSIS_TYPE_PROBE_DESC = Insert user-defined or imported probes into your class at runtime

Lines 14-19 Link Here

(-)plugin.xml (+37 lines)
14	<applicableType id = "org.eclipse.tptp.analysisType.jvmti.execution"/>	14	<applicableType id = "org.eclipse.tptp.analysisType.jvmti.execution"/>
15	<applicableType id="org.eclipse.tptp.analysisType.jvmti.heap"/>	15	<applicableType id="org.eclipse.tptp.analysisType.jvmti.heap"/>
16	<applicableType id="org.eclipse.tptp.analysisType.jvmti.thread"/>	16	<applicableType id="org.eclipse.tptp.analysisType.jvmti.thread"/>
		17	<applicableType id="org.eclipse.tptp.analysisType.jvmti.probe"/>
17	</analysis>	18	</analysis>
18		19
19	<!-- This data collector can't co-exist with the jvmpi data collector -->	20	<!-- This data collector can't co-exist with the jvmpi data collector -->
Lines 42-47 Link Here
42	<coexistanceViolation>	43	<coexistanceViolation>
43	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.thread"/>	44	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.thread"/>
44	</coexistanceViolation>	45	</coexistanceViolation>
		46	<coexistanceViolation>
		47	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.probeInsertion"/>
		48	</coexistanceViolation>
45	</analysisType>	49	</analysisType>
46	<analysisType	50	<analysisType
47	configurationId="org.eclipse.tptp.trace.jvmti.heapConfiguration"	51	configurationId="org.eclipse.tptp.trace.jvmti.heapConfiguration"
Lines 55-60 Link Here
55	<coexistanceViolation>	59	<coexistanceViolation>
56	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.execution"/>	60	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.execution"/>
57	</coexistanceViolation>	61	</coexistanceViolation>
		62	<coexistanceViolation>
		63	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.probeInsertion"/>
		64	</coexistanceViolation>
58	</analysisType>	65	</analysisType>
59	<analysisType	66	<analysisType
60	configurationId="org.eclipse.tptp.trace.jvmti.threadConfiguration"	67	configurationId="org.eclipse.tptp.trace.jvmti.threadConfiguration"
Lines 68-73 Link Here
68	<coexistanceViolation>	75	<coexistanceViolation>
69	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.execution"/>	76	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.execution"/>
70	</coexistanceViolation>	77	</coexistanceViolation>
		78	<coexistanceViolation>
		79	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.probeInsertion"/>
		80	</coexistanceViolation>
		81	</analysisType>
		82	<!-- The analysis type for Probe Insertion in JVMTI -->
		83	<!-- added for enhancement 141450-->
		84	<analysisType
		85	configurationId="org.eclipse.tptp.trace.jvmti.probeInsertion"
		86	validator ="org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIProbekitLaunchValidator"
		87	description="%JVMTI_ANALYSIS_TYPE_PROBE_DESC"
		88	icon="icons/full/obj16/probekitinst.gif"
		89	id="org.eclipse.tptp.analysisType.jvmti.probe"
		90	name="%JVMTI_ANALYSIS_TYPE_PROBE_NAME">
		91	<coexistanceViolation>
		92	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.heap"/>
		93	</coexistanceViolation>
		94	<coexistanceViolation>
		95	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.thread"/>
		96	</coexistanceViolation>
		97	<coexistanceViolation>
		98	<rule analysisTypeId="org.eclipse.tptp.analysisType.jvmti.execution"/>
		99	</coexistanceViolation>
71	</analysisType>	100	</analysisType>
72	</extension>	101	</extension>
73		102
Lines 97-106 Link Here
97	class = "org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TITimeAnalysisConfig"	126	class = "org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TITimeAnalysisConfig"
98	dialogTitle = "%JVMTI_DATA_COLLECTOR_CONF_TITILE">	127	dialogTitle = "%JVMTI_DATA_COLLECTOR_CONF_TITILE">
99	</configuration>	128	</configuration>
		129	<!--Commented out to disable the Edit Options page until the remainder of the code is committed -->
		130	<!--Liz Dancy-->
		131	<configuration
		132	id = "org.eclipse.tptp.trace.jvmti.probeInsertion"
		133	class = "org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIProbeInsertionAnalysisConfig"
		134	dialogTitle = "%JVMTI_DATA_COLLECTOR_CONF_TITILE">
		135	</configuration>
100	<configuration	136	<configuration
101	class="org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIHeapAnalysisConfig"	137	class="org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIHeapAnalysisConfig"
102	dialogTitle="%JVMTI_DATA_COLLECTOR_CONF_TITILE"	138	dialogTitle="%JVMTI_DATA_COLLECTOR_CONF_TITILE"
103	id="org.eclipse.tptp.trace.jvmti.heapConfiguration"/>	139	id="org.eclipse.tptp.trace.jvmti.heapConfiguration"/>
		140
104	</extension>	141	</extension>
105		142
106	<!-- Declare the agent for the JVMTI agent -->	143	<!-- Declare the agent for the JVMTI agent -->

Lines 14-20 Link Here

(-)META-INF/MANIFEST.MF (-1 / +3 lines)
14	org.eclipse.tptp.platform.models;bundle-version="[4.2.0,5.0.0)",	14	org.eclipse.tptp.platform.models;bundle-version="[4.2.0,5.0.0)",
15	org.eclipse.ui.console,	15	org.eclipse.ui.console,
16	org.eclipse.debug.ui,	16	org.eclipse.debug.ui,
17	org.eclipse.jface.text	17	org.eclipse.jface.text,
		18	org.eclipse.tptp.platform.probekit.launch,
		19	org.eclipse.hyades.probekit
18	Eclipse-LazyStart: true	20	Eclipse-LazyStart: true
19	Bundle-Vendor: %providerName	21	Bundle-Vendor: %providerName
20	Bundle-RequiredExecutionEnvironment: J2SE-1.4	22	Bundle-RequiredExecutionEnvironment: J2SE-1.4




/**********************************************************************
 * Copyright (c) 2007 IBM Corporation 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: 
 * IBM - Initial API and implementation
 * @author ldancy
 **********************************************************************/

package org.eclipse.tptp.platform.jvmti.client.internal.analysistypes;

import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIProbeInsertionConfPage.ProbeInsertionConfigurationPage;
import org.eclipse.tptp.trace.ui.internal.launcher.application.AbstractConfiguration;
public class TIProbeInsertionAnalysisConfig extends AbstractConfiguration 
{
	
	 public  TIProbeInsertionAnalysisConfig() 
	 {
			super(new Class[] { TIProbeInsertionAnalysisOpt.class });		
	 }

	 public static class TIProbeInsertionAnalysisOpt extends ProbeInsertionConfigurationPage
	 {
		 private  TIProbeInsertionAnalysisUI probeUI ; 
		private ILaunchConfiguration launchConfiguration;
		
		
			public TIProbeInsertionAnalysisOpt()
			{
				probeUI = new TIProbeInsertionAnalysisUI(); 
			}
			 public void reset(ILaunchConfiguration launchConfiguration)
			{
					this.launchConfiguration = launchConfiguration;
					
			}
			 
			public void createControl(Composite parent)
			{
				try{
				probeUI.createControl(parent);
				
				}
				catch(Exception e)
				{
					//TODO:Handle Exception
				}
			}
			
			
			
		}	
		
}






/**********************************************************************
 * Copyright (c) 2007 IBM Corporation 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: 
 * IBM - Initial API and implementation
 * @author ldancy
 **********************************************************************/


package org.eclipse.tptp.platform.jvmti.client.internal.analysistypes;

import java.util.ArrayList;
import java.util.List;
import java.util.Vector;

import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.hyades.trace.ui.internal.util.FilterSetElement;
import org.eclipse.hyades.trace.ui.internal.util.FilterTableElement;
import org.eclipse.hyades.trace.ui.launcher.ProfilingAttribute;
import org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.tptp.platform.probekit.launch.internal.ProbekitLaunchUI;
import org.eclipse.tptp.platform.probekit.registry.ProbeRegistryEntry;
import org.eclipse.tptp.platform.probekit.util.ProbeLaunchConfigString;
import org.eclipse.tptp.trace.ui.provisional.launcher.DataCollectionEngineAttribute;

	public class TIProbeInsertionAnalysisUI 
	{
		private static ProbekitLaunchUI probeUI = new ProbekitLaunchUI();
		
		
		public Composite createControl (Composite parent)
		{
		 return probeUI.CreateControl(parent, null, false);
		}
		
		/**
		 * Returns the launch configuration attrributes associated with this
		 * Probe or set of probes
		 * @return
		 */
		public Vector getAttributes()
		{
			Vector attributes = new Vector();
			int iCheckedCount = 0;
			if (probeUI.getProbeSets()!=null &&! probeUI.getProbeSets().isDisposed()){
			int iNumProbeSets = probeUI.getProbeSets().getItemCount();
			if (iNumProbeSets > 0) {
				TableItem[] items = probeUI.getProbeSets().getItems();
				for (int i = 0; i < iNumProbeSets; i++) {
					ProbeRegistryEntry entry = (ProbeRegistryEntry) items[i]
							.getData();
					if (entry != null) {
						String strValueID = entry.getId();

						ProbeLaunchConfigString probe = new ProbeLaunchConfigString();
						probe.addProbeID(strValueID);
						if (items[i].getChecked()) {
							// ProbeLaunchConfigString probe = new
							// ProbeLaunchConfigString();
							// probe.addProbeID(strValueID);
							//
							// /RATLC00379812 - Probekit launch UI needs to be
							// updated to support 2-tier filtering.
							// /if (!entry.hasTargets())
							// /{
							boolean bMatchingSetFound = false;
							FilterSetElement set = probeUI.getManager()
									.getDefaultFilterSet();

							// build filter string
							ArrayList attrs = null;
							StringBuffer filterStr = new StringBuffer();
							if (set != null) {
								attrs = set.getChildren();
								for (int idx = 0; idx < attrs.size(); idx++) {
									FilterTableElement elem = (FilterTableElement) attrs
											.get(idx);
									filterStr.append(elem.getText());
									if (elem.getMethod().length() > 0)
										filterStr
												.append(":").append(elem.getMethod()); //$NON-NLS-1$
									filterStr
											.append(":").append(elem.getVisibility()); //$NON-NLS-1$
									filterStr.append("&"); //$NON-NLS-1$
								}
							}

							if (bMatchingSetFound) {
								probe.addFilters(filterStr.toString());
							} else {
								// Filter set was deleted or renamed or set to null
								// to use profiling filters
								probe.useDefaultFilters();
							}
							// /}

							String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
									+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX
									+ iCheckedCount;
							String strValueProbeLaunch = probe.toString();

							DataCollectionEngineAttribute attributeProbe = new DataCollectionEngineAttribute(
									strName, strValueProbeLaunch);
							
							attributes.add(attributeProbe);

							iCheckedCount++;


						}
					}
					
					
				}
			}}
			
				return attributes;
			
			
		}
		
		public boolean storeAttributes (ILaunchConfigurationWorkingCopy configurationWC){
			boolean probesSelected = false;
			int iSelectedProbes = 0;
			int iAvailableProbes = probeUI.getProbeSets().getItemCount();
			List namesOfSelected = null ;
			if (iAvailableProbes > 0) {
				TableItem[] items = probeUI.getProbeSets().getItems();
				for (int i = 0; i < iAvailableProbes; i++) {
					if (items[i].getChecked()) {
						//namesOfSelected.add(items[i].getText());
						iSelectedProbes++;
					}
				}
			}
			if (iAvailableProbes == 0 || iSelectedProbes == 0) {
				// create a new attribute to keep track of whether any probes have 
				//been selected for insertion or not
				configurationWC.setAttribute("anyProbesSelected",false);
				
			} else {
				// this will be retrieved by validateConfiguration
				// if there are no probes selected the Profile button will be disabled
				// and an approprite error message will be displayed
				configurationWC.setAttribute("anyProbesSelected", true);
				configurationWC.setAttribute("saved", true);
				configurationWC.setAttribute("selectedItems",namesOfSelected );
				probesSelected = true;
			}
			probeUI.saveSelections();
			return probesSelected;
		}
				
		
			
	}
	
	




/**********************************************************************
 * Copyright (c) 2007 IBM Corporation 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: 
 * IBM - Initial API and implementation
 * @author ldancy
 **********************************************************************/
package org.eclipse.tptp.platform.jvmti.client.internal.analysistypes;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.hyades.trace.ui.UIPlugin;
import org.eclipse.tptp.trace.ui.internal.launcher.core.LauncherMessages;
import org.eclipse.tptp.trace.ui.provisional.launcher.ILaunchValidator;

public class TIProbekitLaunchValidator implements ILaunchValidator {

	public IStatus validateConfiguration(ILaunchConfiguration configuration){
		Status noProbesSelected = null;
		try{
			boolean probesSelected = configuration.getAttribute("anyProbesSelected", false);
			if (!probesSelected)
			{
				// then we want to display an error message indicating that no probes have been selected for insertion 
				// and we want the Profile button to be disabled
				 noProbesSelected = new Status(Status.ERROR, UIPlugin.getPluginId(),LauncherMessages.ERROR_NO_PROBES_SELECTED);
			}
		}
		catch(Exception e){
			
		}
		return noProbesSelected;
	}
	public IStatus launchNotification(ILaunchConfiguration config){
		return null;
	}
}




/**********************************************************************
 * Copyright (c) 2007 IBM Corporation 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: 
 * IBM - Initial API and implementation
 * @author ldancy
 **********************************************************************/

package org.eclipse.tptp.platform.jvmti.client.internal.analysistypes;

import java.util.Vector;

import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.hyades.trace.ui.internal.core.TraceUIImages;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tptp.platform.jvmti.client.internal.TIPlugin;
import org.eclipse.tptp.trace.ui.internal.launcher.application.AbstractConfiguration;
import org.eclipse.tptp.trace.ui.internal.launcher.core.LauncherMessages;
import org.eclipse.tptp.trace.ui.provisional.launcher.IStatusListener;

public class TIProbeInsertionConfPage extends AbstractConfiguration
{	
	/**
	 * Constructor - Add the execution time configuration page
	 */
	public TIProbeInsertionConfPage()
	{
		super(new Class[] {ProbeInsertionConfigurationPage.class});
	}

	
	/**
	 * The probe insertion configuration page.
	 * 
	 * @author Liz Dancy
	 */
	public static class ProbeInsertionConfigurationPage extends ExtendedConfigurationPage
	{
		private ILaunchConfiguration launchConfiguration;
		public TIProbeInsertionAnalysisUI pr;
		public ProbeInsertionConfigurationPage()
		{
			pr = new TIProbeInsertionAnalysisUI(); 
		}
		
		public ImageDescriptor getWizardBanner()
		{
			return TraceUIImages.INSTANCE.getImageDescriptor(TraceUIImages.IMG_PROF_SET_WIZ_BAN);
		}
		
		public void addErrorListener(final IStatusListener statusListener)
		{
			
		}
		/*
		 * Returns the title of the page
		 * @see org.eclipse.tptp.trace.ui.provisional.launcher.IConfigurationPage#getTitle()
		 */
		public String getTitle()
		{
			 String title = TIPlugin
			    .getResourceString("JVMTI_ANALYSIS_TYPE_PROBE_NAME");
			return title;
		}
		public void reset(ILaunchConfiguration launchConfiguration)
		{
			this.launchConfiguration = launchConfiguration;
			
		}
		/**
		 * Returns the name of this configuration page
		 */
		public String getPageName()
		{
			return this.getClass().getName();
		}
		/**
		 * Return the description associated with this configuration page. 
		 * This may eventually move out to the ProbekitLaunchUI
		 * getDescription().
		 */
		public String getDescription()
		{
			// to keep the same LAF as the JVMPI probe analysis description
		return  LauncherMessages.CONFIGURATION_PROFILING_TYPE_DESC;
		}
		
		public boolean storeAttributes(ILaunchConfigurationWorkingCopy configurationWC)
		{
			
			return pr.storeAttributes(configurationWC);
			    
		}
		/**
		 * Calls the JVMTI-specific getAttributes()method
		 */
		public Vector getAttributes()
		{
			return pr.getAttributes();
		}
		
		public void createControl(Composite parent)
		{
			pr.createControl(parent);
		}
		
	}
}

Lines 13-18 Link Here

(-)src/org/eclipse/tptp/platform/probekit/launch/internal/ProbekitLaunchImages.java (+1 lines)
13		13
14	import org.eclipse.hyades.ui.internal.util.ImageManager;	14	import org.eclipse.hyades.ui.internal.util.ImageManager;
15		15
		16
16	/**	17	/**
17	* Image manager for the Probekit Launch plugin.	18	* Image manager for the Probekit Launch plugin.
18	*/	19	*/




import org.eclipse.tptp.platform.probekit.builder.ProbeNature;
import org.eclipse.tptp.platform.probekit.launch.internal.ProbekitLaunchImages;
import org.eclipse.tptp.platform.probekit.launch.internal.ProbekitLaunchPlugin;
import org.eclipse.tptp.platform.probekit.launch.internal.ProbekitLaunchUI;
import org.eclipse.tptp.platform.probekit.registry.ProbeRegistry;
import org.eclipse.tptp.platform.probekit.registry.ProbeRegistryEntry;
import org.eclipse.tptp.platform.probekit.util.InvalidProbeBundleException;


/**
 * @author gweidner
 * @modified by ldancy
 * See also org.eclipse.hyades.trace.ui.internal.core.TraceProfileOverviewUI.
 */
public class ProbekitProfilingType implements IExtendedProfilingType {
	
	/**
	 * Class variables necessary for keeping the IProfilingType
	 * interfcaes happy as well as for those IProfilingType
	 * methods we which to keep separate from the
	 * JVMTI implementation. The remainder of the old class variables have
	 * been moved to org.eclipse.tptp.platform.probekit.launch.ProbekitLaunchUI
	 * Liz Dancy; Enhancement 141540
	 */
	
	private Composite _form;

 	private ProbePropertiesUI _propertiesUI;

	private Button _refreshData;
 
	private ProbePropertiesUI _propertiesUI;

	private Text _lblTitle;

	private TabFolder _folder;

	private ProfilingSetsManagerCopy _managerCopy;

	private ProbeRegistry _registry;

	private IDialogSettings _settings;

	private ProbekitLaunchUI probeUI;
	
	
	
	
	
	protected Map _filterSetsCopy;

	private final static int PROBE_NAME_INDEX = 0;

	private final static int PROBE_PREFILTERED_INDEX = 1;

	private final static int PROBE_IMPORTED_INDEX = 2;

	private final static int PROBE_ID_INDEX = 3;

	public final static String PROBE_LAUNCH_SELECTION_ATTRIBUTE_STRING = "org.eclipse.tptp.platform.probekit.launch.internal.PROBEUI"; //$NON-NLS-1$

	public final static String PROBE_LAUNCH_SETOPTION_ATTRIBUTE_PREFIX = "SETOPTION_"; //$NON-NLS-1$

	public final static String PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX = "PROBEUI"; //$NON-NLS-1$

	/* Navid Mehregani; Enhancement: 143251 */
	/* @see org.eclipse.hyades.trace.ui.internal.launcher.IExtendedProfilingType */
	public String getVMArguments(ILaunchConfiguration conf) 
	{
		
		/* Will hold the final VM argument */
		String vmArgument = "";

			String strProbeSpec = (String) activeProbes.get(key);
			ProbeLaunchConfigString probeConfigDeploy = ProbeLaunchConfigString.fromString(strProbeSpec);
			String strProbeID = probeConfigDeploy.getRegistryId();
			ProbeRegistryEntry registryEntry = (ProbeRegistryEntry) probeUI.getRegistry().lookupById(strProbeID);
			IResource probeSource = null;			
			
			/* Extract the probe source file */

	/**
	 * 
	 */
	public ProbekitProfilingType() 
	{
		super();
		
		//_registry = ProbeRegistry.getRegistry();

		AbstractUIPlugin plugin = (AbstractUIPlugin) ProbekitLaunchPlugin
				.getDefault();

			section = workbenchSettings.addNewSection("ProbeLaunchDialog");//$NON-NLS-1$
		}
		_settings = section;
		
		probeUI = new ProbekitLaunchUI();

		_mapProbeFilters = new HashMap();
		_filterSetsCopy = new HashMap();

		_warning = new String(ProbekitLaunchMessages._18); //$NON-NLS-1$
	}

	/*

	 * @see org.eclipse.hyades.trace.ui.launcher.IProfilingType#createControl(org.eclipse.swt.widgets.Composite,
	 *      org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy)
	 */
	public Control createControl(Composite parent, ProfilingSetsManagerCopy config) 
	{
		return probeUI.CreateControl(parent, config, true);
		PlatformUI.getWorkbench().getHelpSystem().setHelp(_form,
				ProbekitLaunchPlugin.getPluginId() + "pb_launch1");

		GridData data = GridUtil.createFill();
		_form.setLayoutData(data);

		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		_form.setLayout(layout);

		_lblTitle = new Text(_form, SWT.LEFT /* | SWT.BORDER */| SWT.READ_ONLY);
		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.grabExcessHorizontalSpace = true;
		gd.horizontalSpan = 2;
		_lblTitle.setLayoutData(gd);

		Composite childTop = new Composite(_form, SWT.NONE);
		data = GridUtil.createVerticalFill();
		data.widthHint = 200;
		childTop.setLayoutData(data);

		layout = new GridLayout();
		layout.numColumns = 1;
		childTop.setLayout(layout);

		// _lblTitle.setFont(JFaceResources.getBannerFont());
		Font font = _lblTitle.getFont();
		if (font != null) {
			FontData[] fonts = font.getFontData();
			if (fonts != null && fonts.length >= 1) {
				// Maintain consistency with built-in Hyades profiling type UIs
				// while still inheriting system font
				_lblTitle.setFont(new Font(Display.getDefault(), fonts[0]
						.getName(), fonts[0].getHeight() + 3, SWT.BOLD));
			}
		}
		_lblTitle.setText(ProbekitLaunchMessages._25); //$NON-NLS-1$

		_tblProbeSets = new Table(childTop, SWT.CHECK | SWT.SINGLE
				| SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
		data = GridUtil.createFill();
		_tblProbeSets.setLayoutData(data);

		_refreshData = new Button(childTop, SWT.PUSH);
		_refreshData.setText(ProbekitLaunchMessages._1);
		_refreshData.addSelectionListener(this);

		// new Label(childTop, SWT.NULL);

		TableLayout layoutTable = new TableLayout();
		layoutTable.addColumnData(new ColumnPixelData(170, true));
		_tblProbeSets.setLayout(layoutTable);
		_tblProbeSets.setHeaderVisible(true);

		// begin adding columns
		TableColumn tc1 = new TableColumn(_tblProbeSets, SWT.LEFT);
		tc1.setText(ProbekitLaunchMessages._21); //$NON-NLS-1$
		// end adding columns

		this.populateTableFromRegistry();

		_tblProbeSets.addListener(SWT.Selection, new Listener() {
			public void handleEvent(Event event) {
				if (event.item instanceof TableItem) {
					ProbeRegistryEntry entry = (ProbeRegistryEntry) event.item
							.getData();
					if (entry != null) {
						_propertiesUI.updateWidgetValues(entry);
						// commented out for bugzilla_145401
						// _filtersUI.updateWidgetValues(entry);

						int index = _tblProbeSets
								.indexOf((TableItem) event.item);
						_tblProbeSets.setSelection(index);
					}
				}
			}
		});

		Composite childBottom = new Composite(_form, SWT.NONE);
		data = GridUtil.createFill();

		childBottom.setLayoutData(data);

		layout = new GridLayout();
		layout.numColumns = 1;
		layout.marginHeight = 0;
		childBottom.setLayout(layout);

		// _folder = new CTabFolder(childBottom, SWT.BORDER);
		_folder = new TabFolder(childBottom, SWT.TOP);
		data = GridUtil.createFill();
		// bugzilla_145401 required the uncommenting of this code
		data.heightHint = 320;
		data.grabExcessHorizontalSpace = true;
		_folder.setLayoutData(data);

		TabItem item = new TabItem(_folder, SWT.NONE);
		item.setText(ProbekitLaunchMessages._20); //$NON-NLS-1$
		_propertiesUI = new ProbePropertiesUI();
		item.setControl(_propertiesUI.createControl(_folder));
		if (_tblProbeSets.getItemCount() == 0) {
			// Display text pointing user to import
			_propertiesUI.showHint(true);
		}

		item.setImage(ProbekitLaunchImages.INSTANCE
				.getImage(ProbekitLaunchImages.IMG_PROP));

		_folder.setSelection(0);

		// commented out for bugzilla_145401
		// TabItem item2 = new TabItem(_folder, SWT.NONE);
		// item2.setText(ProbekitLaunchMessages._19); //$NON-NLS-1$
		// _filtersUI = new ProbeFiltersUI();
		// item2.setControl(_propertiesUI.createControl(_folder));
		// item2.setImage(ProbekitLaunchImages.INSTANCE.getImage(ProbekitLaunchImages.IMG_FILTER));

		if (config != null) {
			_managerCopy = config;
		} else {
			_managerCopy = new ProfilingSetsManagerCopy();
		}

		initializeValues(config);

		int sel = _tblProbeSets.getSelectionIndex();
		if (sel != -1) {
			ProbeRegistryEntry entry = (ProbeRegistryEntry) _tblProbeSets
					.getItem(sel).getData();
			if (entry != null) {
				_propertiesUI.updateWidgetValues(entry);
			}
		}

		_tblProbeSets.setFocus();

		return _form;
	}

	/*

	 * @see org.eclipse.hyades.trace.ui.launcher.IProfilingType#getControl(java.lang.String)
	 */
	public Control getControl(String profilingSetName) {
		Table _tblProbeSets = probeUI.getProbeSets();
		if (_tblProbeSets.getItemCount() > 0) {
			int indexSelection = _tblProbeSets.getSelectionIndex();
			if (indexSelection < 0) {

	}

	protected void restoreSelections() {
		Table _tblProbeSets = probeUI.getProbeSets();
		String strSelection = ""; //$NON-NLS-1$
		String strTab = ""; //$NON-NLS-1$


		// else defaults to "Properties" in createControl()
	}

	
		int indexSelection = _tblProbeSets.getSelectionIndex();

		if (indexSelection >= 0) {
			TableItem tableItem = _tblProbeSets.getItem(indexSelection);
			if (tableItem != null) {
				ProbeRegistryEntry entry = (ProbeRegistryEntry) tableItem
						.getData();
				if (entry != null) {
					String strID = entry.getId();
					if (_settings != null) {
						// Store table selection
						_settings.put("ProbeTableSelection", strID); //$NON-NLS-1$
					}
				}
			}
		} else {
			if (_settings != null) {
				_settings.put("ProbeTableSelection", ""); //$NON-NLS-1$ //$NON-NLS-2$
			}
		}

		// CTabItem item = _folder.getSelection();
		TabItem[] item = _folder.getSelection();
		if (item[0] != null) {
			String strName = item[0].getText();
			if (_settings != null) {
				// Store folder selection
				_settings.put("ProbeFolderSelection", strName); //$NON-NLS-1$
			}
		} else {
			_settings.put("ProbeFolderSelection", ""); //$NON-NLS-1$ //$NON-NLS-2$
		}
	}

	protected void initializeValues(ProfilingSetsManagerCopy config) {
		int iNumProbeSets = probeUI.getProbeSets().getItemCount();
		TableItem[] items = probeUI.getProbeSets().getItems();

		Map configAttributes = config.getDefaultSet().getAttributes();
		// ProfilingAttribute attribute = (ProfilingAttribute)
		// configAttributes.get("com.ibm.rational.pd.probekit.PROBEKIT_COUNT");
		int index = 0;
		String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
				+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
		ProfilingAttribute attribute = (ProfilingAttribute) configAttributes
				.get(strName);
		// if (attribute != null)

			index++;

			strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
					+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
			attribute = (ProfilingAttribute) configAttributes.get(strName);
			// }
		}

	 */
	protected Map getActiveProbes(ILaunchConfiguration launchConfig) {
		String strProbeDeployPrefix = ProbeLaunchConfigString.AGENT_CONFIG_NAME_PREFIX
				+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX;
		Map map = getOptions(launchConfig, strProbeDeployPrefix);
		return map;
	}

	public ProfilingAttribute[] getAttributes() {
		List config = new ArrayList();
		int iCheckedCount = 0;
		
		int iNumProbeSets = probeUI.getProbeSets().getItemCount();
		if (iNumProbeSets > 0) {
			TableItem[] items = probeUI.getProbeSets().getItems();
			for (int i = 0; i < iNumProbeSets; i++) {
				ProbeRegistryEntry entry = (ProbeRegistryEntry) items[i]
						.getData();

						// /if (!entry.hasTargets())
						// /{
						boolean bMatchingSetFound = false;
						FilterSetElement set = probeUI.getManager()
								.getDefaultFilterSet();

						// build filter string

						// /}

						String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
								+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX
								+ iCheckedCount;
						String strValueProbeLaunch = probe.toString();


		ProfilingAttribute[] pOptions = new ProfilingAttribute[config.size()];
		config.toArray(pOptions);

		probeUI.saveSelections();

		return pOptions;
	}

	 * 
	 * @see org.eclipse.hyades.trace.ui.launcher.IProfilingType#validateConfiguration(org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy)
	 */
	public String validateConfiguration(ProfilingSetsManagerCopy managerCopy) 
	{
		return probeUI.validateConfiguration(managerCopy);
		int iSelectedProbes = 0;
		int iAvailableProbes = _tblProbeSets.getItemCount();
		if (iAvailableProbes > 0) {
			TableItem[] items = _tblProbeSets.getItems();
			for (int i = 0; i < iAvailableProbes; i++) {
				if (items[i].getChecked()) {
					iSelectedProbes++;
				}
			}
		}

		if (iAvailableProbes == 0 || iSelectedProbes == 0) {
			return _warning;
		} else {
			return null;
		}
	}

	/*

				ProbeLaunchConfigString probeConfigDeploy = ProbeLaunchConfigString
						.fromString(strProbeSpec);
				String strProbeID = probeConfigDeploy.getRegistryId();
				ProbeRegistryEntry entry = (ProbeRegistryEntry) probeUI.getRegistry()
						.lookupById(strProbeID);
				if (entry == null) {
					strMissingOrInvalidProbes = strMissingOrInvalidProbes


						// Silently remove from registry so it will not show up
						// in subsequent lists, etc.
						probeUI.getRegistry().remove(entry);
					}
				}
			}

									.getProfilingSets().get(setID);
							if (set != null) {
								String strProbeOptionPrefix = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
										+ probeUI.PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX;
								boolean bRemovedProbes = false;
								Map attributes = set.getAttributes();
								Iterator iterKeys = attributes.keySet()

		return null;
	}

	
		_tblProbeSets.removeAll();
		_mapProbeFilters.clear();
		_registry = null;

		if (_registry == null) {
			_registry = ProbeRegistry.getRegistry();
		}

		if (_registry != null) {
			// Enumeration iter = _registry.contents();
			ProbeRegistryEntry[] probes = getProbesSortedByName();
			// while (iter.hasMoreElements())
			for (int i = 0; i < probes.length; i++) {
				// ProbeRegistryEntry probeEntry = (ProbeRegistryEntry)
				// iter.nextElement();
				ProbeRegistryEntry probeEntry = probes[i];
				TableItem item = new TableItem(_tblProbeSets, SWT.NONE);

				// Name
				item.setText(PROBE_NAME_INDEX, probeEntry.getName());

				// Pre-filtered
				if (probeEntry.hasTargets()) {
					item.setText(PROBE_PREFILTERED_INDEX,
							ProbekitLaunchMessages._7); //$NON-NLS-1$
				} else {
					item.setText(PROBE_PREFILTERED_INDEX,
							ProbekitLaunchMessages._8); //$NON-NLS-1$					
				}

				// /RATLC00379812 - Probekit launch UI needs to be updated to
				// support 2-tier filtering.
				// Build map for tracking filter selection with initial default
				// values
				// (later updated with any saved settings)
				_mapProbeFilters.put(probeEntry.getId(), null);// "D", ""

				// Imported
				if (probeEntry.isAuthored()) {
					item.setText(PROBE_IMPORTED_INDEX,
							ProbekitLaunchMessages._8); //$NON-NLS-1$
				} else {
					item.setText(PROBE_IMPORTED_INDEX,
							ProbekitLaunchMessages._7); //$NON-NLS-1$
				}

				// ID
				item.setText(PROBE_ID_INDEX, probeEntry.getId());

				// Data
				item.setData(probeEntry);
			}
		}
	}

	public ProbeRegistryEntry[] getProbesSortedByName() {
		Collection probes = new ArrayList();
		Iterator iter = _registry.iterator();
		while (iter.hasNext()) {
			ProbeRegistryEntry entry = (ProbeRegistryEntry) iter.next();
			probes.add(entry);
		}

	
				.size()];
		probes.toArray(sortedProbes);
		Arrays.sort(sortedProbes, new Comparator() {
			public int compare(Object obj1, Object obj2) {
				ProbeRegistryEntry probe1 = (ProbeRegistryEntry) obj1;
				ProbeRegistryEntry probe2 = (ProbeRegistryEntry) obj2;
				return probe1.getName().compareTo(probe2.getName());
			}
		});

		return sortedProbes;
	}

	/*
	 * (non-Javadoc)

	 * @see org.eclipse.hyades.trace.ui.launcher.IProfilingType#getDescription()
	 */
	public String getDescription(ProfilingSetsManagerCopy config) {
		return probeUI.getDescription(config);
		String strDelim = "\n"; //$NON-NLS-1$
		String strIndent = "    "; //$NON-NLS-1$

		// Empty previous description
		_description = ""; //$NON-NLS-1$

		if (_registry == null) {
			_registry = ProbeRegistry.getRegistry();
		}

		if (config != null && config.getDefaultSet() != null) {
			int index = 0;
			String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
					+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;

			Map configAttributes = config.getDefaultSet().getAttributes();
			ProfilingAttribute attribute = (ProfilingAttribute) configAttributes
					.get(strName);

			while (attribute != null) {
				String strValue = attribute.getValue();
				ProbeLaunchConfigString probeString = ProbeLaunchConfigString
						.fromString(strValue);

				String strProbeID = probeString.getRegistryId();

				if (strProbeID != null && strProbeID.length() > 0) {
					if (_registry != null) {
						ProbeRegistryEntry probeEntry = _registry
								.lookupById(strProbeID);

						if (probeEntry != null) {
							String strProbeName = probeEntry.getName();

							if (strProbeName != null) {
								_description = _description + strIndent
										+ strProbeName + strDelim;
							}
						}
					}
				}

				index++;
				strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
						+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
				attribute = (ProfilingAttribute) configAttributes.get(strName);
			}
		}

		if (_description != null && _description.length() > 0) {
			// Remove extra new-line at end of string
			int iLastNewLineIndex = _description.lastIndexOf(strDelim);
			if (iLastNewLineIndex >= 0) {
				_description = _description.substring(0, iLastNewLineIndex);
			}
		} else {
			// Return null instead of zero-length string to prevent blank line
			// _description = null;
			_description = strIndent + ProbekitLaunchMessages._28; //$NON-NLS-1$
		}

		return _description;
	}

	public void widgetSelected(SelectionEvent e) {
		final ArrayList list = new ArrayList();
		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
				.getProjects();
		for (int idx = 0; idx < projects.length; idx++) {
			try {
				IProject project = projects[idx];
				if (project.isOpen() && project.hasNature(JavaCore.NATURE_ID)
						&& !project.hasNature(ProbeNature.NATURE_NAME)) {
					IJavaProject jProject = JavaCore.create(project);
					Object[] resources = jProject.getNonJavaResources();

					boolean hasProbe = false;
					int i = 0;
					while (i < resources.length && !hasProbe) {
						String extension = ((IResource) resources[i])
								.getFileExtension();
						if (extension != null && (extension.equals("probe"))) {
							hasProbe = true;
						}
						i++;

					}

					if (hasProbe) {
						list.add(project);
						continue;
					}

					List sources = JavaUtil.getSourceContainerEntries(jProject);
					i = 0;
					while (i < sources.size() && !hasProbe) {
						IPath path = ((IClasspathEntry) sources.get(i))
								.getPath();
						IFolder folder = ResourcesPlugin.getWorkspace()
								.getRoot().getFolder(path);
						resources = folder.members();
						int j = 0;
						while (!hasProbe && j < resources.length) {

							String extension = ((IResource) resources[j])
									.getFileExtension();
							if (extension != null
									&& (extension.equals("probe") || extension
											.equals("probescript"))) {
								hasProbe = true;
							}
							j++;
						}

						i++;
					}

					if (hasProbe)
						list.add(project);
				}
			} catch (Exception exc) {
			}

		}

		/*
		 * N.M. Need to populate the list before checking for list.size().
		 * bugzilla_140821
		 */
		populateTableFromRegistry();

		if (list.size() == 0)
			return;

		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
			public void execute(IProgressMonitor monitor) {
				try {
					AddProbeNatureOperation addProbeNature = new AddProbeNatureOperation(
							list);
					addProbeNature.run(monitor);

				} catch (CoreException ex) {
					// TODO Auto-generated catch block
					ex.printStackTrace();
				} finally {
					monitor.done();
				}
			}
		};

		try {
			new ProgressMonitorDialog(Display.getCurrent().getActiveShell())
					.run(true, true, operation);
		} catch (InvocationTargetException exec) {
			// TODO Auto-generated catch block
			exec.printStackTrace();
		} catch (InterruptedException exec) {
			// TODO Auto-generated catch block
			exec.printStackTrace();
		}

	}

	public void widgetDefaultSelected(SelectionEvent e) {

	}

	
}




/**********************************************************************
 * Copyright (c) 2007 IBM Corporation 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: 
 * IBM - Initial API and implementation
 * @author ldancy
 **********************************************************************/

package org.eclipse.tptp.platform.probekit.launch.internal;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.hyades.probekit.editor.internal.core.util.JavaUtil;
import org.eclipse.hyades.trace.ui.launcher.ProfilingAttribute;
import org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy;
import org.eclipse.hyades.ui.util.GridUtil;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.ColumnPixelData;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.tptp.platform.probekit.builder.ProbeNature;
import org.eclipse.tptp.platform.probekit.launch.internal.config.ProbePropertiesUI;
import org.eclipse.tptp.platform.probekit.launch.internal.config.ProbekitLaunchMessages;
import org.eclipse.tptp.platform.probekit.registry.ProbeRegistry;
import org.eclipse.tptp.platform.probekit.registry.ProbeRegistryEntry;
import org.eclipse.tptp.platform.probekit.util.ProbeLaunchConfigString;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
 * A class to isolate the shared UI code for both the JVMPI and JVMTI
 * dynamic probekit profiling launch configurations. This was created in TPTP
 * 4.4 in order to support the JVMTI launch configuration without duplicating 
 * the UI code.
 * 
 * @author ldancy
 *
 */
public class ProbekitLaunchUI implements SelectionListener
{ 
	private Composite _form;

	private  Table _tblProbeSets;

	private Button _refreshData;
 
	private ProbePropertiesUI _propertiesUI;

	private Text _lblTitle;

	private TabFolder _folder;

	private ProfilingSetsManagerCopy _managerCopy;

	private ProbeRegistry _registry  ;

	private IDialogSettings _settings;

	private String _warning;
	
	private String _description = ""; // Non-NLS

	protected HashMap _mapProbeFilters;

	protected Map _filterSetsCopy;

	private final static int PROBE_NAME_INDEX = 0;

	private final static int PROBE_PREFILTERED_INDEX = 1;

	private final static int PROBE_IMPORTED_INDEX = 2;

	private final static int PROBE_ID_INDEX = 3;

	public final static String PROBE_LAUNCH_SELECTION_ATTRIBUTE_STRING = "org.eclipse.tptp.platform.probekit.launch.internal.PROBEUI"; //$NON-NLS-1$

	public final static String PROBE_LAUNCH_SETOPTION_ATTRIBUTE_PREFIX = "SETOPTION_"; //$NON-NLS-1$

	public final String PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX = "PROBEUI"; 
	//$NON-NLS-1$
	
	/**
	 * Constructor to create a ProbekitLaunchUI for a JVMTI or JVMPI launch
	 * configuration. Added for enahncement 141540
	 * Liz Dancy
	 */
	public ProbekitLaunchUI()
	{
		_registry = ProbeRegistry.getRegistry();

		AbstractUIPlugin plugin = (AbstractUIPlugin) ProbekitLaunchPlugin
				.getDefault();
		IDialogSettings workbenchSettings = plugin.getDialogSettings();
		IDialogSettings section = workbenchSettings
				.getSection("ProbeLaunchDialog");//$NON-NLS-1$
		if (section == null) {
			section = workbenchSettings.addNewSection("ProbeLaunchDialog");//$NON-NLS-1$
		}
		_settings = section;


		_mapProbeFilters = new HashMap();
		_filterSetsCopy = new HashMap();

		_warning = new String(ProbekitLaunchMessages._18); //$NON-NLS-1$
	}
	
	
	
	public Composite CreateControl(Composite parent, ProfilingSetsManagerCopy config, boolean enabled)
	{
		
		_form = new Composite(parent, SWT.NULL);
		GridData data = GridUtil.createFill();
		_form.setLayoutData(data);

		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		_form.setLayout(layout);

		_lblTitle = new Text(_form, SWT.LEFT /* | SWT.BORDER */| SWT.READ_ONLY);
		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.grabExcessHorizontalSpace = true;
		gd.horizontalSpan = 2;
		_lblTitle.setLayoutData(gd);

		Composite childTop = new Composite(_form, SWT.NONE);
		data = GridUtil.createVerticalFill();
		data.widthHint = 200;
		childTop.setLayoutData(data);

		layout = new GridLayout();
		layout.numColumns = 1;
		childTop.setLayout(layout);

		// _lblTitle.setFont(JFaceResources.getBannerFont());
		Font font = _lblTitle.getFont();
		if (font != null) 
		{
			FontData[] fonts = font.getFontData();
			if (fonts != null && fonts.length >= 1) 
			{
				// Maintain consistency with built-in Hyades profiling type UIs
				// while still inheriting system font
				_lblTitle.setFont(new Font(Display.getDefault(), fonts[0]
				    .getName(), fonts[0].getHeight() + 3, SWT.BOLD));
			}
		}
		_lblTitle.setText(ProbekitLaunchMessages._25); //$NON-NLS-1$

		_tblProbeSets = new Table(childTop, SWT.CHECK | SWT.SINGLE
				| SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
		data = GridUtil.createFill();
		_tblProbeSets.setLayoutData(data);

		_refreshData = new Button(childTop, SWT.PUSH);
		_refreshData.setText(ProbekitLaunchMessages._1);
		_refreshData.addSelectionListener(this);

		// new Label(childTop, SWT.NULL);

		TableLayout layoutTable = new TableLayout();
		layoutTable.addColumnData(new ColumnPixelData(170, true));
		_tblProbeSets.setLayout(layoutTable);
		_tblProbeSets.setHeaderVisible(true);

		// begin adding columns
		TableColumn tc1 = new TableColumn(_tblProbeSets, SWT.LEFT);
		tc1.setText(ProbekitLaunchMessages._21); //$NON-NLS-1$
		// end adding columns

		populateTableFromRegistry();

		_tblProbeSets.addListener(SWT.Selection, new Listener() 
		{
			
			public void handleEvent(Event event) 
			{
				if (event.item instanceof TableItem) 
				{
					ProbeRegistryEntry entry = (ProbeRegistryEntry) event.item
						.getData();
					if (entry != null) 
					{
						_propertiesUI.updateWidgetValues(entry);
						// commented out for bugzilla_145401
						// _filtersUI.updateWidgetValues(entry);

						int index = _tblProbeSets
							.indexOf((TableItem) event.item);
						_tblProbeSets.setSelection(index);
					}
				}
			}
		});

		Composite childBottom = new Composite(_form, SWT.NONE);
		data = GridUtil.createFill();

		childBottom.setLayoutData(data);
	
		layout = new GridLayout();
		layout.numColumns = 1;
		layout.marginHeight = 0;
		childBottom.setLayout(layout);

		// _folder = new CTabFolder(childBottom, SWT.BORDER);
		_folder = new TabFolder(childBottom, SWT.TOP);
		data = GridUtil.createFill();
		// bugzilla_145401 required the uncommenting of this code
		data.heightHint = 320;
		data.grabExcessHorizontalSpace = true;
		_folder.setLayoutData(data);
	
		TabItem item = new TabItem(_folder, SWT.NONE);
		item.setText(ProbekitLaunchMessages._20); //$NON-NLS-1$
		_propertiesUI = new ProbePropertiesUI();
		item.setControl(_propertiesUI.createControl(_folder));
		if (_tblProbeSets.getItemCount() == 0) 
		{
			// Display text pointing user to import
			_propertiesUI.showHint(true);
		}

		item.setImage(ProbekitLaunchImages.INSTANCE
			.getImage(ProbekitLaunchImages.IMG_PROP));

		_folder.setSelection(0);
	
		// commented out for bugzilla_145401
		// TabItem item2 = new TabItem(_folder, SWT.NONE);
		// item2.setText(ProbekitLaunchMessages._19); //$NON-NLS-1$
		// _filtersUI = new ProbeFiltersUI();
		// item2.setControl(_propertiesUI.createControl(_folder));
		// item2.setImage(ProbekitLaunchImages.INSTANCE.getImage(ProbekitLaunchImages.IMG_FILTER));
	
		if (config != null) 
		{
			_managerCopy = config;
		} 
		else 
		{
			_managerCopy = new ProfilingSetsManagerCopy();
		}
		initializeValues(config);
	

		int sel = _tblProbeSets.getSelectionIndex();
		if (sel != -1) 
		{
			ProbeRegistryEntry entry = (ProbeRegistryEntry) _tblProbeSets
				.getItem(sel).getData();
		if (entry != null) 
		{
			_propertiesUI.updateWidgetValues(entry);
		}
		}

		_tblProbeSets.setFocus();
		
		return _form;
	}

	protected void initializeValues(ProfilingSetsManagerCopy config) 
	{
		int iNumProbeSets = _tblProbeSets.getItemCount();
		TableItem[] items = _tblProbeSets.getItems();

		Map configAttributes = config.getDefaultSet().getAttributes();
		int index = 0;
		String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
				+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
		ProfilingAttribute attribute = (ProfilingAttribute) configAttributes
				.get(strName);
		while (attribute != null) 
		{
			// String strCheckedCount = attribute.getValue();
			// int iCheckedCount = Integer.parseInt(strCheckedCount);
			// for (int i = 0; i < iCheckedCount; i++)
			// {
			// attribute = (ProfilingAttribute)
			// configAttributes.get("com.ibm.rational.pd.probekit.PROBEKIT_ID" +
			// i);
			String strValue = attribute.getValue();
			ProbeLaunchConfigString probeConfig = ProbeLaunchConfigString
					.fromString(strValue);
			// if (attribute != null)
			if (probeConfig != null) 
			{
				// String strProbeKitID = attribute.getValue();
				String strProbeKitID = probeConfig.getRegistryId();
				for (int j = 0; j < iNumProbeSets; j++) 
				{
					ProbeRegistryEntry entry = (ProbeRegistryEntry) items[j]
							.getData();
					if (entry != null) 
					{
						String strEntryID = entry.getId();
						if (strEntryID.equals(strProbeKitID)) 
						{
							items[j].setChecked(true);

							break;
						}
					}
				}
			}

			index++;

			strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
					+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
			attribute = (ProfilingAttribute) configAttributes.get(strName);
			// }
		}
	}
	
	public void widgetSelected(SelectionEvent e) 
	{
		final ArrayList list = new ArrayList();
		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
				.getProjects();
		for (int idx = 0; idx < projects.length; idx++) 
		{
			try {
				IProject project = projects[idx];
				if (project.isOpen() && project.hasNature(JavaCore.NATURE_ID)
						&& !project.hasNature(ProbeNature.NATURE_NAME)) {
					IJavaProject jProject = JavaCore.create(project);
					Object[] resources = jProject.getNonJavaResources();

					boolean hasProbe = false;
					int i = 0;
					while (i < resources.length && !hasProbe) 
					{
						String extension = ((IResource) resources[i])
								.getFileExtension();
						if (extension != null && (extension.equals("probe"))) 
						{
							hasProbe = true;
						}
						i++;

					}

					if (hasProbe) 
					{
						list.add(project);
						continue;
					}

					List sources = JavaUtil.getSourceContainerEntries(jProject);
					i = 0;
					while (i < sources.size() && !hasProbe) 
					{
						IPath path = ((IClasspathEntry) sources.get(i))
								.getPath();
						IFolder folder = ResourcesPlugin.getWorkspace()
								.getRoot().getFolder(path);
						resources = folder.members();
						int j = 0;
						while (!hasProbe && j < resources.length) {

							String extension = ((IResource) resources[j])
									.getFileExtension();
							if (extension != null
									&& (extension.equals("probe") || extension
											.equals("probescript"))) 
							{
								hasProbe = true;
							}
							j++;
						}

						i++;
					}

					if (hasProbe)
						list.add(project);
				}
			} 
			catch (Exception exc) 
			{
				
			}

		}
	}
		
		public void widgetDefaultSelected(SelectionEvent e) 
		{
			//Does not need to be implemented
		}
		
		public void populateTableFromRegistry() 
		{
			_tblProbeSets.removeAll();
			_mapProbeFilters.clear();
			_registry = null;

			if (_registry == null) 
			{
				_registry = ProbeRegistry.getRegistry();
			}

			if (_registry != null) 
			{
				// Enumeration iter = _registry.contents();
				ProbeRegistryEntry[] probes = getProbesSortedByName();
				// while (iter.hasMoreElements())
				for (int i = 0; i < probes.length; i++) 
				{
					ProbeRegistryEntry probeEntry = probes[i];
					TableItem item = new TableItem(_tblProbeSets, SWT.NONE);

					// Name
					item.setText(PROBE_NAME_INDEX, probeEntry.getName());

					// Pre-filtered
					if (probeEntry.hasTargets()) 
					{
						item.setText(PROBE_PREFILTERED_INDEX,
								ProbekitLaunchMessages._7); //$NON-NLS-1$
					} 
					else 
					{
						item.setText(PROBE_PREFILTERED_INDEX,
								ProbekitLaunchMessages._8); //$NON-NLS-1$					
					}

					// /RATLC00379812 - Probekit launch UI needs to be updated to
					// support 2-tier filtering.
					// Build map for tracking filter selection with initial default
					// values
					// (later updated with any saved settings)
					_mapProbeFilters.put(probeEntry.getId(), null);// "D", ""

					// Imported
					if (probeEntry.isAuthored()) 
					{
						item.setText(PROBE_IMPORTED_INDEX,
								ProbekitLaunchMessages._8); //$NON-NLS-1$
					} else 
					{
						item.setText(PROBE_IMPORTED_INDEX,
								ProbekitLaunchMessages._7); //$NON-NLS-1$
					}
					// ID
					item.setText(PROBE_ID_INDEX, probeEntry.getId());

					// Data
					item.setData(probeEntry);
				}
			}
		}
		/**
		 * Returns the set of Probes sorted alphabetically by name
		 * These values are taken from the ProbeRegistry
		 * @return
		 */
		public ProbeRegistryEntry[] getProbesSortedByName() 
		{
			Collection probes = new ArrayList();
			Iterator iter = _registry.iterator();
			while (iter.hasNext()) 
			{
				ProbeRegistryEntry entry = (ProbeRegistryEntry) iter.next();
				probes.add(entry);
			}

			ProbeRegistryEntry[] sortedProbes = new ProbeRegistryEntry[probes
					.size()];
			probes.toArray(sortedProbes);
			Arrays.sort(sortedProbes, new Comparator() 
			{
				public int compare(Object obj1, Object obj2) 
				{
					ProbeRegistryEntry probe1 = (ProbeRegistryEntry) obj1;
					ProbeRegistryEntry probe2 = (ProbeRegistryEntry) obj2;
					return probe1.getName().compareTo(probe2.getName());
				}
			});

			return sortedProbes;
		}
		
		public String validateConfiguration(ProfilingSetsManagerCopy managerCopy) 
		{
			// RATLC00379729 - we should warn, if Probe insertion has no probe
			// selected or has no probe import.
			int iSelectedProbes = 0;
			int iAvailableProbes = _tblProbeSets.getItemCount();
			if (iAvailableProbes > 0) {
				TableItem[] items = _tblProbeSets.getItems();
				for (int i = 0; i < iAvailableProbes; i++) {
					if (items[i].getChecked()) {
						iSelectedProbes++;
					}
				}
			}

			if (iAvailableProbes == 0 || iSelectedProbes == 0) {
				return _warning;
			} else {
				return null;
			}
		}
		
		
		
		public void saveSelections() {
		
			int indexSelection =_tblProbeSets.getSelectionIndex();

			if (indexSelection >= 0) {
				TableItem tableItem = _tblProbeSets.getItem(indexSelection);
				if (tableItem != null) {
					ProbeRegistryEntry entry = (ProbeRegistryEntry) tableItem
							.getData();
					if (entry != null) {
						String strID = entry.getId();
						if (_settings != null) {
							// Store table selection
							_settings.put("ProbeTableSelection", strID); //$NON-NLS-1$
						}
					}
				}
			} else {
				if (_settings != null) {
					_settings.put("ProbeTableSelection", ""); //$NON-NLS-1$ //$NON-NLS-2$
				}
			}

			
			TabItem[] item = _folder.getSelection();
			if (item[0] != null) {
				String strName = item[0].getText();
				if (_settings != null) {
					// Store folder selection
					_settings.put("ProbeFolderSelection", strName); //$NON-NLS-1$
				}
			} else {
				_settings.put("ProbeFolderSelection", ""); //$NON-NLS-1$ //$NON-NLS-2$
			}
			
		}
		
		public String getDescription(ProfilingSetsManagerCopy config) {
			
			String strDelim = "\n"; //$NON-NLS-1$
			String strIndent = "    "; //$NON-NLS-1$

			// Empty previous description
			_description = ""; //$NON-NLS-1$

			if (_registry == null) {
				_registry = ProbeRegistry.getRegistry();
			}

			if (config != null && config.getDefaultSet() != null) {
				int index = 0;
				String strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
						+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;

				Map configAttributes = config.getDefaultSet().getAttributes();
				ProfilingAttribute attribute = (ProfilingAttribute) configAttributes
						.get(strName);

				while (attribute != null) {
					String strValue = attribute.getValue();
					ProbeLaunchConfigString probeString = ProbeLaunchConfigString
							.fromString(strValue);

					String strProbeID = probeString.getRegistryId();

					if (strProbeID != null && strProbeID.length() > 0) {
						if (_registry != null) {
							ProbeRegistryEntry probeEntry = _registry
									.lookupById(strProbeID);

							if (probeEntry != null) {
								String strProbeName = probeEntry.getName();

								if (strProbeName != null) {
									_description = _description + strIndent
											+ strProbeName + strDelim;
								}
							}
						}
					}

					index++;
					strName = ProbeLaunchConfigString.LAUNCH_CONFIG_NAME_PREFIX
							+ PROBE_LAUNCH_UNIQUE_PROBESPEC_SUFFIX + index;
					attribute = (ProfilingAttribute) configAttributes.get(strName);
				}
			}

			if (_description != null && _description.length() > 0) {
				// Remove extra new-line at end of string
				int iLastNewLineIndex = _description.lastIndexOf(strDelim);
				if (iLastNewLineIndex >= 0) {
					_description = _description.substring(0, iLastNewLineIndex);
				}
			} else {
				// Return null instead of zero-length string to prevent blank line
				// _description = null;
				_description = strIndent + ProbekitLaunchMessages._28; //$NON-NLS-1$
			}

			return _description;
		}

		
		/**
		 * Accessor and mutator methods for fields in the UI
		 * Necssary so that the PI and TI-specific methods can access these fields
		 * @return
		 */
		public Table getProbeSets(){
			return _tblProbeSets;
		}
		public ProfilingSetsManagerCopy getManager(){
			return _managerCopy;
		}
		public ProbeRegistry getRegistry(){
			return _registry;
		}
		
		public IDialogSettings getSettings(){
			return _settings;
		}
		
		public void setSettings(IDialogSettings givenSettings){
			_settings = givenSettings;
		}
	
}

Lines 44-49 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/messages.properties (+2 lines)
44	ERROR_LOG_DISCOVER_FILTER = The filter set is invalid. Make sure that the agent name and visibility columns have valid values and don't contain characters ; or ,	44	ERROR_LOG_DISCOVER_FILTER = The filter set is invalid. Make sure that the agent name and visibility columns have valid values and don't contain characters ; or ,
45	ERROR_LOG_DISCOVER_NO_FILTER = There must at least be one filter entry	45	ERROR_LOG_DISCOVER_NO_FILTER = There must at least be one filter entry
46		46
		47	ERROR_NO_PROBES_SELECTED =No probes are selected for probe insertion
		48
47	WARNING_DCM_UNRESOLVED_DELEGATE = Could not resolve the launch delegate of the data collector {0}.	49	WARNING_DCM_UNRESOLVED_DELEGATE = Could not resolve the launch delegate of the data collector {0}.
48	WARNING_DCM_FAILED_DELEGATE = One of the selected launch delegates has failed.	50	WARNING_DCM_FAILED_DELEGATE = One of the selected launch delegates has failed.
49		51

Lines 128-133 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/DataCollector.java (+1 lines)
128	dataCollector.setDefaultAnalysisTypes(defaultAnalysisTypes);	128	dataCollector.setDefaultAnalysisTypes(defaultAnalysisTypes);
129	dataCollector.setIcon(icon);	129	dataCollector.setIcon(icon);
130		130
		131
131	return dataCollector;	132	return dataCollector;
132	}	133	}
133		134

Lines 51-56 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherMessages.java (+1 lines)
51	public static String ERROR_LOG_DISCOVER_FILTER;	51	public static String ERROR_LOG_DISCOVER_FILTER;
52	public static String ERROR_LOG_DISCOVER_NO_FILTER;	52	public static String ERROR_LOG_DISCOVER_NO_FILTER;
53		53
		54	public static String ERROR_NO_PROBES_SELECTED;
54	public static String WARNING_DCM_UNRESOLVED_DELEGATE;	55	public static String WARNING_DCM_UNRESOLVED_DELEGATE;
55	public static String WARNING_DCM_FAILED_DELEGATE;	56	public static String WARNING_DCM_FAILED_DELEGATE;
56		57

Lines 241-246 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/EditOptionDelegate.java (-3 / +14 lines)
241	* <code>isInputProfilingType</code> must be set for this to have any meaning */	241	* <code>isInputProfilingType</code> must be set for this to have any meaning */
242	private ConfigurationPageWrapper dummyConfigurationPage;	242	private ConfigurationPageWrapper dummyConfigurationPage;
243		243
		244	private ConfigurationPageWrapper confPageWrapperLastPage;
244	/**	245	/**
245	* Constructs this wizard based on the input.	246	* Constructs this wizard based on the input.
246	*	247	*
Lines 320-331 Link Here
320	if (confPages == null)	321	if (confPages == null)
321	return;	322	return;
322		323
323	for (int i = 0; i < confPages.length; i++)	324	for (int i = 0; i < confPages.length -1; i++)
324	{	325	{
325	confPages[i].reset (launchConfigurationWC);	326	confPages[i].reset (launchConfigurationWC);
326	ConfigurationPageWrapper confPageWrapper = new ConfigurationPageWrapper(confPages[i]);	327	ConfigurationPageWrapper confPageWrapper = new ConfigurationPageWrapper(confPages[i]);
327	super.addPage (confPageWrapper);	328	super.addPage (confPageWrapper);
328	}	329	}
		330	confPageWrapperLastPage = new ConfigurationPageWrapper(confPages[confPages.length -1]);
		331	super.addPage (confPageWrapperLastPage);
329	}	332	}
330	}	333	}
331		334
Lines 410-416 Link Here
410	else	413	else
411	{	414	{
412	status = ((IConfiguration)configurationLoader.getConfigurationClass()).finishConfiguration(launchConfigurationWC);	415	status = ((IConfiguration)configurationLoader.getConfigurationClass()).finishConfiguration(launchConfigurationWC);
413		416
		417	if (status == false)
		418	{
		419
		420	confPageWrapperLastPage.setErrorMessage(LauncherMessages.ERROR_NO_PROBES_SELECTED);
		421
		422	}
		423	IConfigurationPage currentPage = ((IConfiguration)configurationLoader.getConfigurationClass()).getConfigurationPages()[0];
		424
414	/* We have to save our changes if we manually constructed the working copy */	425	/* We have to save our changes if we manually constructed the working copy */
415	if (isWorkingCopyConstructed && status)	426	if (isWorkingCopyConstructed && status)
416	launchConfigurationWC.doSave();	427	launchConfigurationWC.doSave();




				confPage = null;
			} 
			
			if (confPage != null && confPage instanceof IExtendedConfigurationPage )
				confPageVec.add(confPage);
		}
		confPageContainer = new IExtendedConfigurationPage[confPageVec.size()];

	 */
	public boolean finishConfiguration(ILaunchConfigurationWorkingCopy workingCopy)
	{
		
		/* Give all pages the chance of storing their own attributes */
		boolean status = true;
		for (int i = 0; i < confPageContainer.length; i++)
		{
			status = status && confPageContainer[i].storeAttributes(workingCopy);
		}
		
		return status;
	}

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java (-5 / +40 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005, 2006 IBM Corporation and others.	2	* Copyright (c) 2005, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 65-70 Link Here
65	import org.eclipse.swt.widgets.TabFolder;	65	import org.eclipse.swt.widgets.TabFolder;
66	import org.eclipse.swt.widgets.TabItem;	66	import org.eclipse.swt.widgets.TabItem;
67	import org.eclipse.swt.widgets.Text;	67	import org.eclipse.swt.widgets.Text;
		68	import org.eclipse.swt.widgets.Tree;
		69	import org.eclipse.swt.widgets.TreeItem;
68	import org.eclipse.tptp.trace.ui.internal.launcher.core.AnalysisType;	70	import org.eclipse.tptp.trace.ui.internal.launcher.core.AnalysisType;
69	import org.eclipse.tptp.trace.ui.internal.launcher.core.AvailabilityTesterDelegate;	71	import org.eclipse.tptp.trace.ui.internal.launcher.core.AvailabilityTesterDelegate;
70	import org.eclipse.tptp.trace.ui.internal.launcher.core.DataCollector;	72	import org.eclipse.tptp.trace.ui.internal.launcher.core.DataCollector;
Lines 266-271 Link Here
266	checkBoxTreeViewer.getTree().addKeyListener(this);	268	checkBoxTreeViewer.getTree().addKeyListener(this);
267	checkBoxTreeViewer.addDoubleClickListener(this);	269	checkBoxTreeViewer.addDoubleClickListener(this);
268		270
		271
269	/* Create the control buttons */	272	/* Create the control buttons */
270	Composite controlButtonComposite = new Composite(treeComposite, SWT.NONE);	273	Composite controlButtonComposite = new Composite(treeComposite, SWT.NONE);
271	controlButtonComposite.setLayout(new GridLayout());	274	controlButtonComposite.setLayout(new GridLayout());
Lines 289-294 Link Here
289		292
290	public void checkStateChanged(CheckStateChangedEvent event)	293	public void checkStateChanged(CheckStateChangedEvent event)
291	{	294	{
		295
292	Object checkedElement = event.getElement();	296	Object checkedElement = event.getElement();
293	if (checkedElement instanceof DataCollector)	297	if (checkedElement instanceof DataCollector)
294	{	298	{
Lines 299-304 Link Here
299	if (event.getChecked())	303	if (event.getChecked())
300	{	304	{
301	selectedDatacollector = (DataCollector)checkedElement;	305	selectedDatacollector = (DataCollector)checkedElement;
		306
302	deselectTreeItems(checkedElement, selectedDatacollector.getCoexistanceViolators(), 0);	307	deselectTreeItems(checkedElement, selectedDatacollector.getCoexistanceViolators(), 0);
303	deselectIndirectViolators(checkedElement, 0);	308	deselectIndirectViolators(checkedElement, 0);
304	}	309	}
Lines 332-337 Link Here
332	Object childNode;	337	Object childNode;
333	if (event.getChecked() && (childNode = ((ParentChildNode)checkedElement).child) instanceof AnalysisType)	338	if (event.getChecked() && (childNode = ((ParentChildNode)checkedElement).child) instanceof AnalysisType)
334	{	339	{
		340
335	deselectTreeItems(checkedElement, ((AnalysisType)childNode).getCoexistanceViolators(), 1);	341	deselectTreeItems(checkedElement, ((AnalysisType)childNode).getCoexistanceViolators(), 1);
336	deselectIndirectViolators(checkedElement, 1);	342	deselectIndirectViolators(checkedElement, 1);
337	}	343	}
Lines 538-551 Link Here
538	checkBoxTreeViewer.setInput(conf);	544	checkBoxTreeViewer.setInput(conf);
539	getProfilingSetWC().initializeFrom(conf);	545	getProfilingSetWC().initializeFrom(conf);
540		546
		547
		548
		549
541	/* Try to restore the previous selection for the configuration */	550	/* Try to restore the previous selection for the configuration */
542	boolean isConfigurationNew = false;	551	boolean isConfigurationNew = false;
543		552
544	checkBoxTreeViewer.setAllChecked(false);	553	checkBoxTreeViewer.setAllChecked(false);
		554
		555
545	Hashtable entitySelection = LauncherUtility.unserializeSelection(conf);	556	Hashtable entitySelection = LauncherUtility.unserializeSelection(conf);
546	if (entitySelection == null)	557	if (entitySelection == null){
547	isConfigurationNew = true;	558	isConfigurationNew = true;
548		559	}
549	else	560	else
550	{	561	{
551	/* Walk through each data collector and select its children */	562	/* Walk through each data collector and select its children */
Lines 566-573 Link Here
566	for (int i = 0; i < chilrenCount; changeItemCheckedState (new ParentChildNode(currentDataCollector, selectedChildren.get(i++)), true));	577	for (int i = 0; i < chilrenCount; changeItemCheckedState (new ParentChildNode(currentDataCollector, selectedChildren.get(i++)), true));
567	}	578	}
568	}	579	}
		580	// added for enhancement 141540 preliminary commit of code. Need to grey out this option until the remainder of the code
		581	// is checked in
		582	// Liz Dancy
		583	try
		584	{
		585	DataCollectorAssociation dataCollectorAssociatorGrey = DataCollectorManager.getInstance().getDataCollectorAssociator(conf.getType().getIdentifier());
		586	DataCollector[] dataCollectorsGrey = dataCollectorAssociatorGrey.getDataCollectors();
569		587
		588	AnalysisType[] defaultAnalysisTypesGrey = dataCollectorsGrey[1].getApplicableAnalysisTypes();
		589	if (defaultAnalysisTypesGrey != null)
		590	{
		591	ParentChildNode JVMTIProbe = new ParentChildNode(dataCollectorsGrey[1], defaultAnalysisTypesGrey[3]);
		592	checkBoxTreeViewer.setGrayed(JVMTIProbe, true);
		593	}
		594	}
570		595
		596	catch (Exception e){
		597
		598	}
571	/* If the configuration is new then make default selections if the configuration doesn't have an associated	599	/* If the configuration is new then make default selections if the configuration doesn't have an associated
572	* profiling set. If the configuration happens to have a profiling set, then we'll need to support backward compatibility	600	* profiling set. If the configuration happens to have a profiling set, then we'll need to support backward compatibility
573	* and select the profiling types under the profiling set. */	601	* and select the profiling types under the profiling set. */
Lines 621-626 Link Here
621	if (conf instanceof ILaunchConfigurationWorkingCopy)	649	if (conf instanceof ILaunchConfigurationWorkingCopy)
622	performApply((ILaunchConfigurationWorkingCopy)conf);	650	performApply((ILaunchConfigurationWorkingCopy)conf);
623		651
		652
		653
		654
624	}	655	}
625	catch (Exception e)	656	catch (Exception e)
626	{	657	{
Lines 891-899 Link Here
891	else if (selection[i] instanceof ParentChildNode)	922	else if (selection[i] instanceof ParentChildNode)
892	{	923	{
893	Object child = ((ParentChildNode)selection[i]).child;	924	Object child = ((ParentChildNode)selection[i]).child;
894	if (child instanceof AnalysisType)	925	if (child instanceof AnalysisType ){
		926	if (((AnalysisType)child).getId().equals("org.eclipse.tptp.analysisType.jvmti.probe"))
		927	{
		928	isValid=false;
		929	}
895	launchValidator = ((AnalysisType)child).getValidator();	930	launchValidator = ((AnalysisType)child).getValidator();
896		931	}
897	/* For backward compatibility */	932	/* For backward compatibility */
898	else if (child instanceof ProfilingSetType)	933	else if (child instanceof ProfilingSetType)
899	{	934	{

Return to bug 141540

Added Link Here

(-)src/org/eclipse/tptp/platform/jvmti/client/internal/analysistypes/TIProbeInsertionAnalysisConfig.java (+62 lines)
1	/**********************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM - Initial API and implementation
10	* @author ldancy
11	**********************************************************************/
12
13	package org.eclipse.tptp.platform.jvmti.client.internal.analysistypes;
14
15	import org.eclipse.debug.core.ILaunchConfiguration;
16	import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
17	import org.eclipse.swt.widgets.Composite;
18	import org.eclipse.tptp.platform.jvmti.client.internal.analysistypes.TIProbeInsertionConfPage.ProbeInsertionConfigurationPage;
19	import org.eclipse.tptp.trace.ui.internal.launcher.application.AbstractConfiguration;
20	public class TIProbeInsertionAnalysisConfig extends AbstractConfiguration
21	{
22
23	public TIProbeInsertionAnalysisConfig()
24	{
25	super(new Class[] { TIProbeInsertionAnalysisOpt.class });
26	}
27
28	public static class TIProbeInsertionAnalysisOpt extends ProbeInsertionConfigurationPage
29	{
30	private TIProbeInsertionAnalysisUI probeUI ;
31	private ILaunchConfiguration launchConfiguration;
32
33
34	public TIProbeInsertionAnalysisOpt()
35	{
36	probeUI = new TIProbeInsertionAnalysisUI();
37	}
38	public void reset(ILaunchConfiguration launchConfiguration)
39	{
40	this.launchConfiguration = launchConfiguration;
41
42	}
43
44	public void createControl(Composite parent)
45	{
46	try{
47	probeUI.createControl(parent);
48
49	}
50	catch(Exception e)
51	{
52	//TODO:Handle Exception
53	}
54	}
55
56
57
58	}
59
60	}
61
62

Lines 66-72 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/application/AbstractConfiguration.java (-1 / +4 lines)
66	confPage = null;	66	confPage = null;
67	}	67	}
68		68
69	if (confPage != null && confPage instanceof IExtendedConfigurationPage)	69	if (confPage != null && confPage instanceof IExtendedConfigurationPage )
70	confPageVec.add(confPage);	70	confPageVec.add(confPage);
71	}	71	}
72	confPageContainer = new IExtendedConfigurationPage[confPageVec.size()];	72	confPageContainer = new IExtendedConfigurationPage[confPageVec.size()];
Lines 99-108 Link Here
99	*/	99	*/
100	public boolean finishConfiguration(ILaunchConfigurationWorkingCopy workingCopy)	100	public boolean finishConfiguration(ILaunchConfigurationWorkingCopy workingCopy)
101	{	101	{
		102
102	/* Give all pages the chance of storing their own attributes */	103	/* Give all pages the chance of storing their own attributes */
103	boolean status = true;	104	boolean status = true;
104	for (int i = 0; i < confPageContainer.length; i++)	105	for (int i = 0; i < confPageContainer.length; i++)
		106	{
105	status = status && confPageContainer[i].storeAttributes(workingCopy);	107	status = status && confPageContainer[i].storeAttributes(workingCopy);
		108	}
106		109
107	return status;	110	return status;
108	}	111	}