From 9a7cab8b8e64b804dfa91536f8d23b67ccb1f38e Mon Sep 17 00:00:00 2001 From: Enda O Brien Date: Wed, 25 Sep 2024 11:33:49 +0100 Subject: [PATCH] #2323 'Restore Defaults' button uses a different value when USE_MARKER_LIMITS pref is false. --- .../org/eclipse/ui/internal/ide/IDEInternalPreferences.java | 5 +++++ .../eclipse/ui/internal/ide/IDEPreferenceInitializer.java | 2 +- .../internal/views/markers/FiltersConfigurationDialog.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java index 1e6e940802c..955ee4aba3c 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java @@ -179,4 +179,9 @@ public interface IDEInternalPreferences { */ String HELP_CONTEXT_AVAILABILITY_CHECK = "helpContextAvailabilityCheck"; //$NON-NLS-1$ + /** + * The default value to use for 'items per group' when using limits in the + * problem view. + */ + int MARKER_LIMITS_VALUE_DEFAULT = 100; } diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java index 7978720f57e..9c01f2326e4 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java @@ -71,7 +71,7 @@ public void initializeDefaultPreferences() { node.putInt(IDEInternalPreferences.PROBLEMS_LIMIT, 100); node.putBoolean(IDEInternalPreferences.USE_MARKER_LIMITS, true); - node.putInt(IDEInternalPreferences.MARKER_LIMITS_VALUE, 100); + node.putInt(IDEInternalPreferences.MARKER_LIMITS_VALUE, IDEInternalPreferences.MARKER_LIMITS_VALUE_DEFAULT); node.put(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_TYPE, ""); //$NON-NLS-1$ node.putBoolean(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_RELATIVE, true); diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java index 2c1bf5baf65..5d765f283fb 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java @@ -707,7 +707,8 @@ protected void performDefaults() { IPreferenceStore preferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore(); boolean useMarkerLimits = preferenceStore.getBoolean(IDEInternalPreferences.USE_MARKER_LIMITS); - int markerLimits = useMarkerLimits ? preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE) : 1000; + int markerLimits = useMarkerLimits ? preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE) + : IDEInternalPreferences.MARKER_LIMITS_VALUE_DEFAULT; limitButton.setSelection(useMarkerLimits); updateLimitTextEnablement();