Skip to content

Honor breakpoint sorting order in EmbeddedBreakpointViewer #2957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SougandhS wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −10
Open

Honor breakpoint sorting order in EmbeddedBreakpointViewer #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...g.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -23,6 +23,8 @@
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.ILineBreakpoint;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsComparator;
import org.eclipse.debug.tests.DebugTestExtension;
import org.eclipse.debug.ui.IDebugModelPresentation;
Expand Down Expand Up @@ -283,6 +285,8 @@ public void testBreakpointOrdering3() throws CoreException {
* Expecting the same ordering as in which the BP's are returned by createTestBreakpoints.
*/
void executeTest(TestBreakpoint[] testBps) throws CoreException {
int origSort = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IInternalDebugUIConstants.PREF_BREAKPOINT_SORTING_ORDER);
DebugUIPlugin.getDefault().getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_BREAKPOINT_SORTING_ORDER, IInternalDebugUIConstants.BREAKPOINT_SORTING_ORDER_NAME);
BreakpointsComparator bpCompare = new BreakpointsComparator();
try {
boolean failed = false;
Expand All @@ -305,6 +309,7 @@ void executeTest(TestBreakpoint[] testBps) throws CoreException {
}
assertFalse(failed);
} finally {
DebugUIPlugin.getDefault().getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_BREAKPOINT_SORTING_ORDER, origSort);
for (TestBreakpoint testBp : testBps) {
testBp.delete();
}
Expand Down
32 changes: 23 additions & 9 deletions ...se.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2012 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -24,6 +24,7 @@
import org.eclipse.debug.core.model.ILineBreakpoint;
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
import org.eclipse.jface.viewers.IBasicPropertyConstants;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.StructuredViewer;
Expand Down Expand Up @@ -64,6 +65,27 @@ public int compare(Viewer viewer, Object e1, Object e2) {
}

IBreakpoint b2= (IBreakpoint)e2;
IMarker marker1= b1.getMarker();
IMarker marker2= b2.getMarker();
if (!marker1.exists() || !marker2.exists()) {
return 0;
}

int sortingOrder= DebugUIPlugin.getDefault().getPreferenceStore().getInt(IInternalDebugUIConstants.PREF_BREAKPOINT_SORTING_ORDER);
if (sortingOrder == IInternalDebugUIConstants.BREAKPOINT_SORTING_ORDER_CREATION_TIME) {
try {
long b1CreationTime = marker1.getCreationTime();
long b2CreationTime = marker2.getCreationTime();
if (b1CreationTime > b2CreationTime) {
return -1;
} else if (b1CreationTime < b2CreationTime) {
return 1;
}
} catch (CoreException e) {
DebugUIPlugin.log(e);
}
}

String modelId1= b1.getModelIdentifier();
String modelId2= b2.getModelIdentifier();
int result= modelId1.compareTo(modelId2);
Expand All @@ -72,20 +94,12 @@ public int compare(Viewer viewer, Object e1, Object e2) {
}
String type1= IInternalDebugCoreConstants.EMPTY_STRING;
String type2= IInternalDebugCoreConstants.EMPTY_STRING;
IMarker marker1= b1.getMarker();
if (!marker1.exists()) {
return 0;
}
try {
type1= marker1.getType();
} catch (CoreException ce) {
DebugUIPlugin.log(ce);
}
try {
IMarker marker2= b2.getMarker();
if (!marker2.exists()) {
return 0;
}
type2= marker2.getType();
} catch (CoreException e) {
DebugUIPlugin.log(e);
Expand Down
Loading