Skip to content

Commit 860bb30

Browse files
committed
Enable Step Filter by Default
Enable Step filter and few filter options enabled by default Fixes : #914
1 parent da7bd86 commit 860bb30

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ public void testFindConflicting2() throws Exception {
8484
}
8585

8686
public void testSimpleVisibility() throws Exception {
87+
boolean stepFilterPref = DebugUITools.isUseStepFilters();
88+
if (stepFilterPref) {
89+
DebugUITools.setUseStepFilters(false);
90+
}
8791
String typeName = "LocalVariablesTests";
8892

8993
ILineBreakpoint bp = createLineBreakpoint(21, typeName);
@@ -116,6 +120,9 @@ public void testSimpleVisibility() throws Exception {
116120
assertEquals("Visible var 2 should be 'i2'", "i2", vars[1].getName());
117121

118122
} finally {
123+
if (!stepFilterPref) {
124+
DebugUITools.setUseStepFilters(false);
125+
}
119126
terminateAndRemove(thread);
120127
removeAllBreakpoints();
121128
}

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.eclipse.debug.core.model.IStackFrame;
2828
import org.eclipse.debug.core.model.IValue;
2929
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
30+
import org.eclipse.debug.ui.DebugUITools;
3031
import org.eclipse.jdt.core.IJavaProject;
3132
import org.eclipse.jdt.debug.core.IJavaStackFrame;
3233
import org.eclipse.jdt.debug.core.IJavaThread;
@@ -186,6 +187,10 @@ public void testTranslateContainers() throws Exception {
186187
* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=346116
187188
*/
188189
public void testInspectClassFileFromJar() throws Exception {
190+
boolean stepFilterPref = DebugUITools.isUseStepFilters();
191+
if (stepFilterPref) {
192+
DebugUITools.setUseStepFilters(false);
193+
}
189194
createLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
190195
createLineBreakpoint(21, A_RUN_JAR);
191196
ILaunchConfiguration config = getLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
@@ -201,6 +206,9 @@ public void testInspectClassFileFromJar() throws Exception {
201206
assertEquals("the name of the type being inspected must be a.JarClass", "a.JarClass", value.getReferenceTypeName());
202207
}
203208
finally {
209+
if (!stepFilterPref) {
210+
DebugUITools.setUseStepFilters(false);
211+
}
204212
terminateAndRemove(thread);
205213
}
206214
}
@@ -211,6 +219,10 @@ public void testInspectClassFileFromJar() throws Exception {
211219
* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=346116
212220
*/
213221
public void testShowClassFileFromJar() throws Exception {
222+
boolean stepFilterPref = DebugUITools.isUseStepFilters();
223+
if (stepFilterPref) {
224+
DebugUITools.setUseStepFilters(false);
225+
}
214226
createLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
215227
createLineBreakpoint(21, A_RUN_JAR);
216228
ILaunchConfiguration config = getLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
@@ -235,6 +247,9 @@ public void testShowClassFileFromJar() throws Exception {
235247
assertEquals("we should have found a file named a.JarClass.class", "JarClass.class", ((ClassFile) source).getElementName());
236248
}
237249
finally {
250+
if (!stepFilterPref) {
251+
DebugUITools.setUseStepFilters(false);
252+
}
238253
terminateAndRemove(thread);
239254
}
240255
}

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPreferenceInitializer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.eclipse.jdt.internal.debug.ui;
1717

1818
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
19+
import org.eclipse.debug.ui.DebugUITools;
1920
import org.eclipse.debug.ui.IDebugUIConstants;
2021
import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
2122
import org.eclipse.jface.preference.IPreferenceStore;
@@ -38,7 +39,14 @@ public void initializeDefaultPreferences() {
3839
store.setDefault(IJDIPreferencesConstants.PREF_ALERT_UNABLE_TO_INSTALL_BREAKPOINT, true);
3940
store.setDefault(IJDIPreferencesConstants.PREF_PROMPT_BEFORE_MODIFYING_FINAL_FIELDS, true);
4041
store.setDefault(IJDIPreferencesConstants.PREF_PROMPT_DELETE_CONDITIONAL_BREAKPOINT, true);
42+
43+
44+
DebugUITools.setUseStepFilters(true);
4145
store.setDefault(IJDIPreferencesConstants.PREF_STATEMENT_LEVEL_STEPPING, true);
46+
store.setDefault(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS, true);
47+
store.setDefault(IJDIPreferencesConstants.PREF_STEP_THRU_FILTERS, true);
48+
store.setDefault(IJDIPreferencesConstants.PREF_FILTER_GETTERS, true);
49+
store.setDefault(IJDIPreferencesConstants.PREF_FILTER_SETTERS, true);
4250

4351
store.setDefault(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES, false);
4452

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void init(IWorkbench workbench) {}
8787
*/
8888
private void createStepFilterPreferences(Composite parent) {
8989
Composite container = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_BOTH, 0, 0);
90-
fUseStepFiltersButton = SWTFactory.createCheckButton(container, DebugUIMessages.JavaStepFilterPreferencePage__Use_step_filters, null, DebugUITools.isUseStepFilters(), 2);
90+
fUseStepFiltersButton = SWTFactory.createCheckButton(container, DebugUIMessages.JavaStepFilterPreferencePage__Use_step_filters, null, DebugUITools.isUseStepFilters(), 2);
9191
fUseStepFiltersButton.addSelectionListener(new SelectionListener() {
9292
@Override
9393
public void widgetSelected(SelectionEvent e) {
@@ -189,8 +189,8 @@ public boolean performOk() {
189189
@Override
190190
protected void performDefaults() {
191191
// Cannot use DebugUITools.isUseStepFilters() as this not give the default value, no API from Platform to get the default value
192-
fUseStepFiltersButton.setSelection(false);
193-
setPageEnablement(false);
192+
fUseStepFiltersButton.setSelection(true);
193+
setPageEnablement(true);
194194
fFilterSyntheticButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS));
195195
fFilterStaticButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS));
196196
fFilterConstructorButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS));

0 commit comments

Comments
 (0)