Attachment #50897 for bug #158580

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

View | Details | Raw Unified | Return to bug 158580
Collapse All | Expand All

Lines 29-35 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileEquinoxLauncherTabGroup.java (-1 / +1 lines)
29	ILaunchConfigurationTab[] tabs =	29	ILaunchConfigurationTab[] tabs =
30	tabs = new ILaunchConfigurationTab[]{	30	tabs = new ILaunchConfigurationTab[]{
31	new EquinoxPluginsTab(),	31	new EquinoxPluginsTab(),
32	new ProfileTab(false, false),	32	new ProfileExtendedTab(false, false),
33	new DestinationTab(),	33	new DestinationTab(),
34	new JavaArgumentsTab(),	34	new JavaArgumentsTab(),
35	new EquinoxSettingsTab(),	35	new EquinoxSettingsTab(),

Lines 37-43 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitPluginTabGroup.java (-1 / +1 lines)
37	ILaunchConfigurationTab[] tabs = null;	37	ILaunchConfigurationTab[] tabs = null;
38	tabs = new ILaunchConfigurationTab[]{	38	tabs = new ILaunchConfigurationTab[]{
39	new JUnitMainTab(),	39	new JUnitMainTab(),
40	new ProfileTab(false, false),	40	new ProfileExtendedTab(false, false),
41	new DestinationTab(),	41	new DestinationTab(),
42	new PluginJUnitMainTab(),	42	new PluginJUnitMainTab(),
43	new JavaArgumentsTab(),	43	new JavaArgumentsTab(),

Lines 30-36 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileRuntimeWorkbenchTabGroup.java (-1 / +1 lines)
30	ILaunchConfigurationTab[] tabs = null;	30	ILaunchConfigurationTab[] tabs = null;
31	tabs = new ILaunchConfigurationTab[]{	31	tabs = new ILaunchConfigurationTab[]{
32	new MainTab(),	32	new MainTab(),
33	new ProfileTab(false, false),	33	new ProfileExtendedTab(false, false),
34	new DestinationTab(),	34	new DestinationTab(),
35	new JavaArgumentsTab(),	35	new JavaArgumentsTab(),
36	new PluginsTab(),	36	new PluginsTab(),

Lines 30-36 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitTabGroup.java (-1 / +1 lines)
30	ArrayList tabs = new ArrayList(10);	30	ArrayList tabs = new ArrayList(10);
31	tabs.add(new JUnitMainTab());	31	tabs.add(new JUnitMainTab());
32	tabs.add(new JavaArgumentsTab());	32	tabs.add(new JavaArgumentsTab());
33	tabs.add(new ProfileTab(false, false));	33	tabs.add(new ProfileExtendedTab(false, false));
34	tabs.add(new DestinationTab());	34	tabs.add(new DestinationTab());
35	tabs.add(new JavaClasspathTab());	35	tabs.add(new JavaClasspathTab());
36	tabs.add(new SourceLookupTab());	36	tabs.add(new SourceLookupTab());

Lines 102-111 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileTab.java (-3 / +1 lines)
102		102
103	// Overview sub-tab defaults	103	// Overview sub-tab defaults
104	ProfilingSetsManager manager = ProfilingSetsManager.instance();	104	ProfilingSetsManager manager = ProfilingSetsManager.instance();
105	boolean autoFilteringCriteria = store.getBoolean(TraceConstants.AUTO_FILTER_CRITERIA_OPTION);
106	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, autoFilteringCriteria);
107	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_PROFILING_SET, manager.getDefaultSet() == null ? null : manager.getDefaultSet().getId());	105	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_PROFILING_SET, manager.getDefaultSet() == null ? null : manager.getDefaultSet().getId());
108	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_FILTER_SET, autoFilteringCriteria ? TraceConstants.AUTO_GENERATED_FILTER_SET : LauncherConstants.DEFAULT_FILTER_ID);	106	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_FILTER_SET, LauncherConstants.DEFAULT_FILTER_ID);
109	}	107	}
110		108
111	public void activated(ILaunchConfigurationWorkingCopy conf)	109	public void activated(ILaunchConfigurationWorkingCopy conf)

Lines 28-34 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileSWTLauncherTabGroup.java (-1 / +1 lines)
28	{	28	{
29	ArrayList tabs = new ArrayList(10);	29	ArrayList tabs = new ArrayList(10);
30	tabs.add(new JavaMainTab());	30	tabs.add(new JavaMainTab());
31	tabs.add(new ProfileTab(false, false));	31	tabs.add(new ProfileExtendedTab(false, false));
32	tabs.add(new DestinationTab());	32	tabs.add(new DestinationTab());
33	tabs.add(new JavaArgumentsTab());	33	tabs.add(new JavaArgumentsTab());
34	tabs.add(new JavaClasspathTab());	34	tabs.add(new JavaClasspathTab());

Lines 31-37 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaApplicationTabGroup.java (-1 / +1 lines)
31	tabs.add(new JavaMainTab());	31	tabs.add(new JavaMainTab());
32	tabs.add(new JavaArgumentsTab());	32	tabs.add(new JavaArgumentsTab());
33	tabs.add(new JavaClasspathTab());	33	tabs.add(new JavaClasspathTab());
34	tabs.add(new ProfileTab(false, false));	34	tabs.add(new ProfileExtendedTab(false, false));
35	tabs.add(new DestinationTab());	35	tabs.add(new DestinationTab());
36	tabs.add(new SourceLookupTab());	36	tabs.add(new SourceLookupTab());
37	tabs.add(new ProfileEnvironmentTab());	37	tabs.add(new ProfileEnvironmentTab());

Lines 32-38 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaAppletTabGroup.java (-1 / +1 lines)
32	tabs.add(new AppletMainTab());	32	tabs.add(new AppletMainTab());
33	tabs.add(new AppletParametersTab());	33	tabs.add(new AppletParametersTab());
34	tabs.add(new AppletArgumentsTab());	34	tabs.add(new AppletArgumentsTab());
35	tabs.add(new ProfileTab(false, false));	35	tabs.add(new ProfileExtendedTab(false, false));
36	tabs.add(new DestinationTab());	36	tabs.add(new DestinationTab());
37	tabs.add(new JavaClasspathTab());	37	tabs.add(new JavaClasspathTab());
38	tabs.add(new SourceLookupTab());	38	tabs.add(new SourceLookupTab());

Lines 1211-1218 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java (-4 / +5 lines)
1211	filtersSetList.add(generatedFilterSet);	1211	filtersSetList.add(generatedFilterSet);
1212	}	1212	}
1213		1213
1214	FilterTableElement excludingFilter = new FilterTableElement("", "", TraceMessages.EXCLUDE);	1214	String finalFilterType = !filters.isEmpty() ? TraceMessages.EXCLUDE : TraceMessages.INCLUDE;
1215	filters.add(excludingFilter);	1215	FilterTableElement finalFilter = new FilterTableElement("", "", finalFilterType);
		1216	filters.add(finalFilter);
		1217
1216	generatedFilterSet.setChildren(filters);	1218	generatedFilterSet.setChildren(filters);
1217	TraceFilterManager.getInstance().storeFilterSetList(filtersSetList);	1219	TraceFilterManager.getInstance().storeFilterSetList(filtersSetList);
1218	}	1220	}
Lines 1230-1237 Link Here
1230	}	1232	}
1231		1233
1232	public static boolean isAutoFilteringCriteria(final ILaunchConfiguration config) throws CoreException {	1234	public static boolean isAutoFilteringCriteria(final ILaunchConfiguration config) throws CoreException {
1233	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();	1235	return config.getAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, false);
1234	return config.getAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, store.getBoolean(TraceConstants.AUTO_FILTER_CRITERIA_OPTION));
1235	}	1236	}
1236		1237
1237	/* ----------------------------------------------------------------------------------------------------------------------------------------- */	1238	/* ----------------------------------------------------------------------------------------------------------------------------------------- */




package org.eclipse.hyades.trace.ui.internal.launcher;

import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.hyades.trace.internal.ui.TraceConstants;
import org.eclipse.hyades.trace.ui.UIPlugin;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.tptp.trace.ui.internal.launcher.core.LauncherConstants;

public class ProfileExtendedTab extends ProfileTab {

	public ProfileExtendedTab(final boolean attach,
			final boolean includeDestinationTab) {
		super(attach, includeDestinationTab);
	}

	public void setDefaults(final ILaunchConfigurationWorkingCopy wc) {
		super.setDefaults(wc);
		ProfilingSetsManager manager = ProfilingSetsManager.instance();
		IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();
		boolean autoFilteringCriteria = store.getBoolean(TraceConstants.AUTO_FILTER_CRITERIA_OPTION);
		wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, autoFilteringCriteria);
		wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_PROFILING_SET, manager.getDefaultSet() == null ? null : manager.getDefaultSet().getId());
		wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_FILTER_SET, autoFilteringCriteria ? TraceConstants.AUTO_GENERATED_FILTER_SET : LauncherConstants.DEFAULT_FILTER_ID);
	}
}

Return to bug 158580

Added Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileExtendedTab.java (+25 lines)
1	package org.eclipse.hyades.trace.ui.internal.launcher;
2
3	import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
4	import org.eclipse.hyades.trace.internal.ui.TraceConstants;
5	import org.eclipse.hyades.trace.ui.UIPlugin;
6	import org.eclipse.jface.preference.IPreferenceStore;
7	import org.eclipse.tptp.trace.ui.internal.launcher.core.LauncherConstants;
8
9	public class ProfileExtendedTab extends ProfileTab {
10
11	public ProfileExtendedTab(final boolean attach,
12	final boolean includeDestinationTab) {
13	super(attach, includeDestinationTab);
14	}
15
16	public void setDefaults(final ILaunchConfigurationWorkingCopy wc) {
17	super.setDefaults(wc);
18	ProfilingSetsManager manager = ProfilingSetsManager.instance();
19	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();
20	boolean autoFilteringCriteria = store.getBoolean(TraceConstants.AUTO_FILTER_CRITERIA_OPTION);
21	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, autoFilteringCriteria);
22	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_PROFILING_SET, manager.getDefaultSet() == null ? null : manager.getDefaultSet().getId());
23	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_FILTER_SET, autoFilteringCriteria ? TraceConstants.AUTO_GENERATED_FILTER_SET : LauncherConstants.DEFAULT_FILTER_ID);
24	}
25	}