Attachment 50897 Details for Bug 158580 – Here's the proposed fix

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

[patch] Here's the proposed fix

auto-filters-ext-java-patch.txt (text/plain), 11.28 KB, created by Alexander Simbirtsev

on 2006-09-26 06:14:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Simbirtsev

Created: 2006-09-26 06:14:03 EDT

Size: 11.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.trace.ui
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileEquinoxLauncherTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileEquinoxLauncherTabGroup.java,v
>retrieving revision 1.3
>diff -u -r1.3 ProfileEquinoxLauncherTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileEquinoxLauncherTabGroup.java	8 Mar 2006 18:58:21 -0000	1.3
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileEquinoxLauncherTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -29,7 +29,7 @@
> 		ILaunchConfigurationTab[] tabs =
> 			tabs = new ILaunchConfigurationTab[]{
> 					new EquinoxPluginsTab(),
>-					new ProfileTab(false, false),
>+					new ProfileExtendedTab(false, false),
> 					new DestinationTab(),
> 					new JavaArgumentsTab(),
> 					new EquinoxSettingsTab(),
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitPluginTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitPluginTabGroup.java,v
>retrieving revision 1.6
>diff -u -r1.6 ProfileJUnitPluginTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitPluginTabGroup.java	8 Mar 2006 18:58:21 -0000	1.6
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitPluginTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -37,7 +37,7 @@
> 		ILaunchConfigurationTab[] tabs = null;
> 		tabs = new ILaunchConfigurationTab[]{
> 				new JUnitMainTab(),
>-				new ProfileTab(false, false),
>+				new ProfileExtendedTab(false, false),
> 				new DestinationTab(),
> 				new PluginJUnitMainTab(), 
> 				new JavaArgumentsTab(),
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileRuntimeWorkbenchTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileRuntimeWorkbenchTabGroup.java,v
>retrieving revision 1.6
>diff -u -r1.6 ProfileRuntimeWorkbenchTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileRuntimeWorkbenchTabGroup.java	8 Mar 2006 18:58:21 -0000	1.6
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileRuntimeWorkbenchTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -30,7 +30,7 @@
> 		ILaunchConfigurationTab[] tabs = null;
> 		tabs = new ILaunchConfigurationTab[]{
> 				new MainTab(),
>-				new ProfileTab(false, false),
>+				new ProfileExtendedTab(false, false),
> 				new DestinationTab(),
> 				new JavaArgumentsTab(),
> 				new PluginsTab(), 
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitTabGroup.java,v
>retrieving revision 1.5
>diff -u -r1.5 ProfileJUnitTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitTabGroup.java	11 May 2006 15:06:43 -0000	1.5
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJUnitTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -30,7 +30,7 @@
> 		ArrayList tabs = new ArrayList(10);
> 		tabs.add(new JUnitMainTab());
> 		tabs.add(new JavaArgumentsTab());
>-		tabs.add(new ProfileTab(false, false));
>+		tabs.add(new ProfileExtendedTab(false, false));
> 		tabs.add(new DestinationTab());
> 		tabs.add(new JavaClasspathTab());
> 		tabs.add(new SourceLookupTab());
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileTab.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileTab.java,v
>retrieving revision 1.13
>diff -u -r1.13 ProfileTab.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileTab.java	21 Sep 2006 19:19:40 -0000	1.13
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileTab.java	26 Sep 2006 10:16:46 -0000
>@@ -102,10 +102,8 @@
> 		
> 		// Overview sub-tab defaults
> 		ProfilingSetsManager manager = ProfilingSetsManager.instance();
>-		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);
>+		wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_FILTER_SET, LauncherConstants.DEFAULT_FILTER_ID);
> 	}
> 	
> 	public void activated(ILaunchConfigurationWorkingCopy conf)
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileSWTLauncherTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileSWTLauncherTabGroup.java,v
>retrieving revision 1.4
>diff -u -r1.4 ProfileSWTLauncherTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileSWTLauncherTabGroup.java	11 May 2006 14:57:57 -0000	1.4
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileSWTLauncherTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -28,7 +28,7 @@
>     {
> 		ArrayList tabs = new ArrayList(10);
> 		tabs.add(new JavaMainTab());
>-		tabs.add(new ProfileTab(false, false));
>+		tabs.add(new ProfileExtendedTab(false, false));
> 		tabs.add(new DestinationTab());
> 		tabs.add(new JavaArgumentsTab());
> 		tabs.add(new JavaClasspathTab());
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaApplicationTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaApplicationTabGroup.java,v
>retrieving revision 1.5
>diff -u -r1.5 ProfileJavaApplicationTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaApplicationTabGroup.java	11 May 2006 15:06:43 -0000	1.5
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaApplicationTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -31,7 +31,7 @@
> 		tabs.add(new JavaMainTab());
> 		tabs.add(new JavaArgumentsTab());
> 		tabs.add(new JavaClasspathTab());
>-		tabs.add(new ProfileTab(false, false));
>+		tabs.add(new ProfileExtendedTab(false, false));
> 		tabs.add(new DestinationTab());
> 		tabs.add(new SourceLookupTab());
> 		tabs.add(new ProfileEnvironmentTab());
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaAppletTabGroup.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaAppletTabGroup.java,v
>retrieving revision 1.5
>diff -u -r1.5 ProfileJavaAppletTabGroup.java
>--- src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaAppletTabGroup.java	11 May 2006 15:06:43 -0000	1.5
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileJavaAppletTabGroup.java	26 Sep 2006 10:16:45 -0000
>@@ -32,7 +32,7 @@
> 		tabs.add(new AppletMainTab());
> 		tabs.add(new AppletParametersTab());
> 		tabs.add(new AppletArgumentsTab());
>-		tabs.add(new ProfileTab(false, false));
>+		tabs.add(new ProfileExtendedTab(false, false));
> 		tabs.add(new DestinationTab());		
> 		tabs.add(new JavaClasspathTab());
> 		tabs.add(new SourceLookupTab());
>Index: src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java,v
>retrieving revision 1.11
>diff -u -r1.11 LauncherUtility.java
>--- src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java	21 Sep 2006 19:19:41 -0000	1.11
>+++ src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java	26 Sep 2006 10:16:46 -0000
>@@ -1211,8 +1211,10 @@
> 			filtersSetList.add(generatedFilterSet);
> 		}
> 		
>-		FilterTableElement excludingFilter = new FilterTableElement("*", "*", TraceMessages.EXCLUDE);
>-		filters.add(excludingFilter);
>+		String finalFilterType = !filters.isEmpty() ? TraceMessages.EXCLUDE : TraceMessages.INCLUDE;
>+		FilterTableElement finalFilter = new FilterTableElement("*", "*", finalFilterType);
>+		filters.add(finalFilter);
>+		
> 		generatedFilterSet.setChildren(filters);
> 		TraceFilterManager.getInstance().storeFilterSetList(filtersSetList);
> 	}
>@@ -1230,8 +1232,7 @@
> 	}
> 
> 	public static boolean isAutoFilteringCriteria(final ILaunchConfiguration config) throws CoreException {
>-		IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();
>-		return config.getAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, store.getBoolean(TraceConstants.AUTO_FILTER_CRITERIA_OPTION));
>+		return config.getAttribute(IProfileLaunchConfigurationConstants.ATTR_AUTO_FILTER_CRITERIA, false);
> 	}
> 	
> 	/* ----------------------------------------------------------------------------------------------------------------------------------------- */
>Index: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileExtendedTab.java
>===================================================================
>RCS file: src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileExtendedTab.java
>diff -N src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileExtendedTab.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/hyades/trace/ui/internal/launcher/ProfileExtendedTab.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+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);
>+	}
>+}

Actions: View | Diff

Attachments on bug 158580: 50897