From 56d196d558dafc2aeee8dbe28d8a735107b64ce4 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 13 Jun 2003 19:16:34 +0000 Subject: [PATCH] Fix for PR 38788: Ctrl-X, Ctrl-C, Ctrl-V, Ctrl-A, Ctrl-Z and Ctrl-Y keys don't work in the address field of the Memory view. Note: Ctrl-Z still doesn't work because there is no support of it in the Text widget. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 8 +++ .../ui/views/memory/MemoryControlArea.java | 51 +++++++++++++++---- .../internal/ui/views/memory/MemoryView.java | 1 - .../memory}/MemoryViewAction.java | 2 +- 4 files changed, 51 insertions(+), 11 deletions(-) rename debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/{actions => views/memory}/MemoryViewAction.java (97%) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index ad4a260115f..04146d93c84 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,11 @@ +2003-06-13 Mikhail Khodjaiants + Fix for PR 38788: Ctrl-X, Ctrl-C, Ctrl-V, Ctrl-A, Ctrl-Z and Ctrl-Y keys don't work + in the address field of the Memory view. + Note: Ctrl-Z still doesn't work because there is no support of it in the Text widget. + * MemoryViewAction.java: moved to the org.eclipse.cdt.debug.internal.ui.views.memory package. + * MemoryControlArea.java + * MemoryView.java + 2003-06-12 Mikhail Khodjaiants Fixing "trivial" PR 38788: Ctrl-X, Ctrl-C, Ctrl-V, Ctrl-A, Ctrl-Z and Ctrl-Y keys don't work in the address field of the Memory view. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java index fb600c09d33..35b8ff8059f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java @@ -21,8 +21,12 @@ import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.TraverseEvent; @@ -134,7 +138,44 @@ public class MemoryControlArea extends Composite implements ITextOperationTarget { fMemoryView.updateObjects(); } + } ); + text.addModifyListener( new ModifyListener() + { + public void modifyText( ModifyEvent e ) + { + handleAddressModification(); + } } ); + text.addKeyListener( new KeyListener() + { + public void keyPressed( KeyEvent e ) + { + fMemoryView.updateObjects(); + } + + public void keyReleased( KeyEvent e ) + { + fMemoryView.updateObjects(); + } + } ); + text.addMouseListener( new MouseListener() + { + public void mouseDoubleClick( MouseEvent e ) + { + fMemoryView.updateObjects(); + } + + public void mouseDown( MouseEvent e ) + { + fMemoryView.updateObjects(); + } + + public void mouseUp( MouseEvent e ) + { + fMemoryView.updateObjects(); + } + } ); + fEvaluateButton = new Button( composite, SWT.PUSH ); fEvaluateButton.setText( "Evaluate" ); fEvaluateButton.setToolTipText( "Evaluate expression to address" ); @@ -145,14 +186,6 @@ public class MemoryControlArea extends Composite implements ITextOperationTarget evaluateAddressExpression(); } } ); - - text.addModifyListener( new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - handleAddressModification(); - } - } ); return text; } @@ -527,7 +560,7 @@ public class MemoryControlArea extends Composite implements ITextOperationTarget fAddressText.paste(); break; case SELECT_ALL: - fAddressText.setSelection( 0, fAddressText.getCharCount() ); + fAddressText.selectAll(); break; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java index 20b3e88cd69..8ee8c55185f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java @@ -14,7 +14,6 @@ import org.eclipse.cdt.debug.internal.ui.actions.MemoryActionSelectionGroup; import org.eclipse.cdt.debug.internal.ui.actions.MemoryFormatAction; import org.eclipse.cdt.debug.internal.ui.actions.MemoryNumberOfColumnAction; import org.eclipse.cdt.debug.internal.ui.actions.MemorySizeAction; -import org.eclipse.cdt.debug.internal.ui.actions.MemoryViewAction; import org.eclipse.cdt.debug.internal.ui.actions.RefreshMemoryAction; import org.eclipse.cdt.debug.internal.ui.actions.ShowAsciiAction; import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryViewAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewAction.java similarity index 97% rename from debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryViewAction.java rename to debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewAction.java index 8d35dd8171d..1ed415f6f1a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryViewAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewAction.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.internal.ui.actions; +package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.action.Action;