Skip to content

Commit bc09a54

Browse files
committed
Making ordering of relevances more explicit
Currently the suggestions are not always totally ordered (e.g. there are some with default of 0), even though Eclipse then fall back to comparing strings, it would be much better to have an explicit ordering. This now: - make creating a commented compatibility filter "more recommended" - make removing an unused filter "more recommended" - make configure the problem category "less recommended"
1 parent 9ddefdb commit bc09a54

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/FilterProblemResolution.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
3131
import org.eclipse.pde.api.tools.ui.internal.IApiToolsConstants;
3232
import org.eclipse.swt.graphics.Image;
33+
import org.eclipse.ui.IMarkerResolutionRelevance;
3334
import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
3435

3536
/**
@@ -38,7 +39,7 @@
3839
*
3940
* @since 1.0.0
4041
*/
41-
public class FilterProblemResolution extends WorkbenchMarkerResolution {
42+
public class FilterProblemResolution extends WorkbenchMarkerResolution implements IMarkerResolutionRelevance {
4243

4344
protected IMarker fBackingMarker = null;
4445
protected IJavaElement fResolvedElement = null;

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/FilterProblemWithCommentResolution.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,10 @@ public void run(IMarker[] markers, IProgressMonitor monitor) {
8181
op.setSystem(true);
8282
op.schedule();
8383
}
84+
85+
@Override
86+
public int getRelevanceForResolution() {
87+
return IApiToolProposalRelevance.FILTER_PROBLEM_WITH_COMMENT;
88+
}
89+
8490
}

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/IApiToolProposalRelevance.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
public interface IApiToolProposalRelevance {
2121

2222

23-
public static final int CONFIGURE_PROBLEM_SEVERITY = -1;
23+
public static final int CONFIGURE_PROBLEM_SEVERITY = -10;
24+
public static final int REMOVE_UNUSED_FILTER = 10;
25+
public static final int FILTER_PROBLEM_WITH_COMMENT = 5;
2426

2527
}

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/RemoveFilterProblemResolution.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
4040
import org.eclipse.pde.api.tools.ui.internal.IApiToolsConstants;
4141
import org.eclipse.swt.graphics.Image;
42+
import org.eclipse.ui.IMarkerResolutionRelevance;
4243
import org.eclipse.ui.texteditor.MarkerUtilities;
4344
import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
4445

@@ -48,7 +49,7 @@
4849
*
4950
* @since 1.0.0
5051
*/
51-
public class RemoveFilterProblemResolution extends WorkbenchMarkerResolution {
52+
public class RemoveFilterProblemResolution extends WorkbenchMarkerResolution implements IMarkerResolutionRelevance {
5253

5354
/**
5455
* The {@link IApiProblemFilter} to remove
@@ -166,4 +167,9 @@ public IMarker[] findOtherMarkers(IMarker[] markers) {
166167
plural = size > 0;
167168
return mset.toArray(new IMarker[size]);
168169
}
170+
171+
@Override
172+
public int getRelevanceForResolution() {
173+
return IApiToolProposalRelevance.REMOVE_UNUSED_FILTER;
174+
}
169175
}

0 commit comments

Comments
 (0)