From 064d4429bad0721450cfe6bcab3ace020e67edaf Mon Sep 17 00:00:00 2001 From: John Cortell Date: Tue, 25 Mar 2008 22:08:03 +0000 Subject: [PATCH] Some cleanup leading up to some functional improvements (this commit doesn't alter behavior). --- .../ui/views/memory/AddMemoryBlockDialog.java | 15 ++++++++++----- .../internal/ui/views/memory/AddMemoryBlocks.java | 7 +++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java index 8934148ed84..60b5888e76b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import java.util.ArrayList; +import java.util.List; import org.eclipse.cdt.debug.internal.core.CMemoryBlockRetrievalExtension; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; @@ -57,8 +58,8 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, private boolean fEnteredExpression; // basically, which of the two radio buttons was selected when OK was hit private CMemoryBlockRetrievalExtension fMemRetrieval; - private static ArrayList sAddressHistory = new ArrayList(); - private static ArrayList sExpressionHistory = new ArrayList(); + private static List sAddressHistory = new ArrayList(); + private static List sExpressionHistory = new ArrayList(); public AddMemoryBlockDialog(Shell parentShell, IMemoryBlockRetrieval memRetrieval) { @@ -74,6 +75,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, @@ -170,6 +172,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -180,6 +183,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fExpression = fExpressionInput.getText(); fAddress = fAddressInput.getText(); @@ -212,6 +216,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TrayDialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar(Composite parent) { return super.createButtonBar(parent); } @@ -232,7 +237,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, return fEnteredExpression; } - private static void addHistory(ArrayList list, String item) { + private static void addHistory(List list, String item) { if (!list.contains(item)) list.add(0, item); @@ -240,8 +245,8 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, list.remove(list.size()-1); } - private static String[] getHistory(ArrayList list) { - return (String[])list.toArray(new String[list.size()]); + private static String[] getHistory(List list) { + return list.toArray(new String[list.size()]); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java index 852fbd88040..c30488230d8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import java.util.ArrayList; +import java.util.List; import java.util.StringTokenizer; import org.eclipse.cdt.debug.internal.core.CMemoryBlockRetrievalExtension; @@ -91,7 +92,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { String input = dialog.enteredExpression() ? dialog.getExpression() : dialog.getAddress(); - ArrayList list = new ArrayList(); + List list = new ArrayList(); if (input.length() == 0) list.add(""); //$NON-NLS-1$ @@ -101,7 +102,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { list.add(tokenizer.nextToken()); } - final String[] addrsOrExprs = (String[]) list.toArray(new String[list.size()]); + final String[] addrsOrExprs = list.toArray(new String[list.size()]); ParamHolder params; if (dialog.enteredExpression()) @@ -114,6 +115,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { final ParamHolder params_f = params; final IMemoryRenderingSite memRendSite = (IMemoryRenderingSite) part; Job job = new Job("Add Memory Block") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { addMemoryBlocks(debugViewElement_f, retrieval_f, params_f, memRendSite); @@ -273,6 +275,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { { UIJob uiJob = new UIJob("open error"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { // open error for the exception String detail = ""; //$NON-NLS-1$