Skip to content

Commit 071bcc2

Browse files
committed
Fix enabling/disabling checkboxes properly based on the 'collapse..' and 'colorize...' checkbox
1 parent 659d71e commit 071bcc2

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ private void createStepFilterPreferences(Composite parent) {
210210
fCollapseStackFrames.widgetSelected(this::updateCheckboxes);
211211
initializeDialogUnits(container);
212212

213-
this.fEnableCustomButton = new PreferenceButton(container, DebugUIMessages.JavaStackFramesPreferencePage_Filter_custom, store, IJDIPreferencesConstants.PREF_COLORIZE_CUSTOM_METHODS).widgetSelected(selected -> fCustomStackFilterTable.setEnabled(selected
214-
&& fColorizeStackFrames.isSelected()));
213+
this.fEnableCustomButton = new PreferenceButton(container, DebugUIMessages.JavaStackFramesPreferencePage_Filter_custom, store, IJDIPreferencesConstants.PREF_COLORIZE_CUSTOM_METHODS) //
214+
.widgetSelected(selected -> fCustomStackFilterTable.setEnabled(selected && isCategoryHandlingEnabled()));
215215
categoryButtons.add(this.fEnableCustomButton);
216216

217217
fCustomStackFilterTable = new JavaFilterTable(this, CUSTOM_STACK_FRAMES,
@@ -230,8 +230,8 @@ private void createStepFilterPreferences(Composite parent) {
230230

231231
categoryButtons.add(new PreferenceButton(container, DebugUIMessages.JavaStackFramesPreferencePage_Filter_synthetic, store, IJDIPreferencesConstants.PREF_COLORIZE_SYNTHETIC_METHODS));
232232

233-
this.fEnablePlatformButton = new PreferenceButton(container, DebugUIMessages.JavaStackFramesPreferencePage_Filter_platform, store, IJDIPreferencesConstants.PREF_COLORIZE_PLATFORM_METHODS).widgetSelected(selected -> fPlatformStackFilterTable.setEnabled(selected
234-
&& fColorizeStackFrames.isSelected()));
233+
this.fEnablePlatformButton = new PreferenceButton(container, DebugUIMessages.JavaStackFramesPreferencePage_Filter_platform, store, IJDIPreferencesConstants.PREF_COLORIZE_PLATFORM_METHODS) //
234+
.widgetSelected(selected -> fPlatformStackFilterTable.setEnabled(selected && isCategoryHandlingEnabled()));
235235
categoryButtons.add(fEnablePlatformButton);
236236

237237
fPlatformStackFilterTable = new JavaFilterTable(this, PLATFORM_STACK_FRAMES,
@@ -257,7 +257,7 @@ private void createStepFilterPreferences(Composite parent) {
257257

258258
createAppearanceList(container);
259259

260-
setPageEnablement(fColorizeStackFrames.isSelected());
260+
setPageEnablement(isCategoryHandlingEnabled());
261261
initList();
262262
}
263263

@@ -366,7 +366,11 @@ private void initList() {
366366
}
367367

368368
protected void updateCheckboxes(@SuppressWarnings("unused") boolean flag) {
369-
setPageEnablement(fCollapseStackFrames.isSelected() || fColorizeStackFrames.isSelected());
369+
setPageEnablement(isCategoryHandlingEnabled());
370+
}
371+
372+
private boolean isCategoryHandlingEnabled() {
373+
return fCollapseStackFrames.isSelected() || fColorizeStackFrames.isSelected();
370374
}
371375

372376
/**

0 commit comments

Comments
 (0)