From 4fb1274ec5914c38e47bd3649507726fda26150b Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 11 Feb 2015 11:12:46 -0500 Subject: [PATCH] Bug 459688 - Label in breakpoint thread filter dialog should match debug view Change-Id: I3d74c3316f5acbf2b6aadc0b6e99e7081384f401 Signed-off-by: Marc Khouzam (cherry picked from commit 0e041e8e862bf111ab3083caa34b392b50c494a6) --- .../ui/breakpoints/GdbThreadFilterEditor.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java index 6bd823b9f10..36dd1a398b7 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java @@ -515,18 +515,21 @@ public class GdbThreadFilterEditor { @Override protected void handleSuccess() { final StringBuilder builder = new StringBuilder(Messages.GdbThreadFilterEditor_Thread); - builder.append("["); //$NON-NLS-1$ + builder.append(" #"); //$NON-NLS-1$ builder.append(((IMIExecutionDMContext)thread).getThreadId()); - builder.append("] "); //$NON-NLS-1$ + + String threadName = getData().getName(); + if (threadName != null) { + builder.append(" ["); //$NON-NLS-1$ + builder.append(threadName); + builder.append("] "); //$NON-NLS-1$ + } + String threadId = getData().getId(); if (threadId != null) { builder.append(threadId); } - String threadName = getData().getName(); - if (threadName != null) { - builder.append(threadName); - } - + rm.setData(builder.toString()); rm.done(); }