diff options
| author | Curtis Windatt | 2007-09-05 20:58:01 +0000 |
|---|---|---|
| committer | Curtis Windatt | 2007-09-05 20:58:01 +0000 |
| commit | 9081d1ebbe7529d7830292607811b3f4a8e1db8c (patch) | |
| tree | a52be049acd3d974ff22590505297e075211df21 /org.eclipse.debug.ui | |
| parent | 0d1c42114357c9c48fe4ea85036df51ef709c0af (diff) | |
| download | eclipse.platform.debug-9081d1ebbe7529d7830292607811b3f4a8e1db8c.tar.gz eclipse.platform.debug-9081d1ebbe7529d7830292607811b3f4a8e1db8c.tar.xz eclipse.platform.debug-9081d1ebbe7529d7830292607811b3f4a8e1db8c.zip | |
Bug 188339 - [scrapbook] Expressions from scrapbook does not convert to watch expression correctly
Diffstat (limited to 'org.eclipse.debug.ui')
3 files changed, 19 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java index 5b7754816..e6a428bdc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java @@ -30,6 +30,8 @@ public class DebugUIMessages extends NLS { public static String DebugUIPlugin_Run_Debug_1; public static String DefaultLabelProvider__disconnected__1; + + public static String DefaultLabelProvider_0; public static String DefaultLabelProvider_1; public static String DefaultLabelProvider__unknown__1; public static String DefaultLabelProvider_Breakpoint_1; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties index c3e9d373a..029393e6b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties @@ -18,6 +18,7 @@ DebugUIPlugin_Run_Debug_1=Run/Debug DefaultLabelProvider__disconnected__1=<disconnected> DefaultLabelProvider_1=<terminated> +DefaultLabelProvider_0=... DefaultLabelProvider__unknown__1=<unknown> DefaultLabelProvider_Breakpoint_1=Breakpoint DefaultLabelProvider_12=\ (pending) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java index 501d66e0c..06d1cec78 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java @@ -322,7 +322,22 @@ public class DefaultLabelProvider implements ILabelProvider { */ protected String getWatchExpressionText(IWatchExpression expression) { StringBuffer result= new StringBuffer(); - result.append('"').append(expression.getExpressionText()).append('"'); + + String snippet = expression.getExpressionText().trim(); + StringBuffer snippetBuffer = new StringBuffer(); + if (snippet.length() > 30){ + snippetBuffer.append(snippet.substring(0, 15)); + snippetBuffer.append(DebugUIMessages.DefaultLabelProvider_0); + snippetBuffer.append(snippet.substring(snippet.length() - 15)); + } else { + snippetBuffer.append(snippet); + } + snippet = snippetBuffer.toString().replaceAll("[\n\r\t]+", " "); //$NON-NLS-1$//$NON-NLS-2$ + + result.append('"'); + result.append(snippet); + result.append('"'); + if (expression.isPending()) { result.append(DebugUIMessages.DefaultLabelProvider_12); } else if (expression.hasErrors()) { |