Bug 498056 - [problems view] Show errors/warnings based on project by

default, increase overall limit

Also resorts the entries in the opposite direction, now that on project
is the default it should be on the top

Change-Id: Ie8eb0f2728e996b3b2183a36fc39cc8dd8637136
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

3 files changed, 27 insertions, 23 deletions

diff --git a/bundles/org.eclipse.ui.ide/plugin.xml b/bundles/org.eclipse.ui.ide/plugin.xml
index a16a51b4d6f..bdbe3a11bcf 100644
--- a/bundles/org.eclipse.ui.ide/plugin.xml
+++ b/bundles/org.eclipse.ui.ide/plugin.xml
@@ -1393,12 +1393,20 @@
          <markerTypeReference
                id="org.eclipse.core.resources.problemmarker">
          </markerTypeReference>
+          <markerFieldConfiguration
+               enabled="true"
+               id="org.eclipse.ui.ide.projectErrorsWarningsGrouping"
+               name="%MarkerFilterGrouping.ProjectErrorsWarnings"
+               scope="ON_ANY_IN_SAME_CONTAINER"
+               values="org.eclipse.ui.internal.views.markers.ErrorsWarningsParameters">
+         </markerFieldConfiguration>
+
          <markerFieldConfiguration
                enabled="false"
-               id="org.eclipse.ui.ide.errorsFilter"
-               name="%MarkerFilterGrouping.AllErrors"
-               scope="ON_ANY"
-               values="org.eclipse.ui.internal.views.markers.AllErrorsParameters">
+               id="org.eclipse.ui.ide.selectedErrorsWarningsGrouping"
+               name="%MarkerFilterGrouping.SelectedErrorsWarnings"
+               scope="ON_SELECTED_AND_CHILDREN"
+               values="org.eclipse.ui.internal.views.markers.ErrorsWarningsParameters">
          </markerFieldConfiguration>
 
          <markerFieldConfiguration
@@ -1408,20 +1416,12 @@
                scope="ON_SELECTED_AND_CHILDREN"
                values="org.eclipse.ui.internal.views.markers.SelectedWarningsParameters">
          </markerFieldConfiguration>
-
          <markerFieldConfiguration
                enabled="false"
-               id="org.eclipse.ui.ide.selectedErrorsWarningsGrouping"
-               name="%MarkerFilterGrouping.SelectedErrorsWarnings"
-               scope="ON_SELECTED_AND_CHILDREN"
-               values="org.eclipse.ui.internal.views.markers.ErrorsWarningsParameters">
-         </markerFieldConfiguration>
-          <markerFieldConfiguration
-               enabled="false"
-               id="org.eclipse.ui.ide.projectErrorsWarningsGrouping"
-               name="%MarkerFilterGrouping.ProjectErrorsWarnings"
-               scope="ON_ANY_IN_SAME_CONTAINER"
-               values="org.eclipse.ui.internal.views.markers.ErrorsWarningsParameters">
+               id="org.eclipse.ui.ide.errorsFilter"
+               name="%MarkerFilterGrouping.AllErrors"
+               scope="ON_ANY"
+               values="org.eclipse.ui.internal.views.markers.AllErrorsParameters">
          </markerFieldConfiguration>
 
          <markerFieldReference
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 8671fe13380..861187c486c 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
@@ -73,7 +73,7 @@ public class IDEPreferenceInitializer extends AbstractPreferenceInitializer {
 		node.putInt(IDEInternalPreferences.TASKS_LIMIT, 100);
 
 		node.putBoolean(IDEInternalPreferences.USE_MARKER_LIMITS, true);
-		node.putInt(IDEInternalPreferences.MARKER_LIMITS_VALUE, 100);
+		node.putInt(IDEInternalPreferences.MARKER_LIMITS_VALUE, 1000);
 
 		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 5db61b999dc..76bb1aeeaf3 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
@@ -11,6 +11,7 @@
  * 			- Fix for Bug 214443 Problem view filter created even if I hit Cancel
  *     Robert Roth <robert.roth.off@gmail.com>
  *          - Fix for Bug 364736 Setting limit to 0 has no effect
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 498056
  ******************************************************************************/
 
 package org.eclipse.ui.internal.views.markers;
@@ -708,21 +709,24 @@ public class FiltersConfigurationDialog extends ViewSettingsDialog {
 		orButton.setSelection(!andFilters);
 
 		filterGroups.clear();
-		filterGroups.addAll(generator.getDeclaredFilters());
+		List<MarkerFieldFilterGroup> declaredFilters = new ArrayList<>(generator.getDeclaredFilters());
+		filterGroups.addAll(declaredFilters);
 		configsTable.refresh();
-		configsTable.setSelection(new StructuredSelection(
-				filterGroups.size() > 1 ? filterGroups.iterator().next()
-						: new Object[0]));
+
+		for (MarkerFieldFilterGroup marker : declaredFilters) {
+			if (marker.isEnabled()) {
+				configsTable.setChecked(marker, true);
+			}
+		}
 
 		IPreferenceStore preferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
 		boolean useMarkerLimits = preferenceStore.getBoolean(IDEInternalPreferences.USE_MARKER_LIMITS);
-		int markerLimits = useMarkerLimits ? preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE) : 100;
+		int markerLimits = useMarkerLimits ? preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE) : 1000;
 
 		limitButton.setSelection(useMarkerLimits);
 		limitsLabel.setEnabled(useMarkerLimits);
 		limitText.setEnabled(useMarkerLimits);
 		limitText.setText(Integer.toString(markerLimits));
-
 		updateRadioButtonsFromTable();
 	}